nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #303034 from vbgl/ocaml-result-dune-3

Browse Source 
ocamlPackages.result: use Dune 3
This commit is contained in:
Weijia Wang 2024-04-14 03:31:31 +02:00 committed by GitHub
commit 3b0adbab6a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 14 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
pkgs/development/ocaml-modules/janestreet/0.12.nix
View File

@ -24,7 +24,7 @@ with self;
hash = "0gl89zpgsf3n30nb6v5cns27g2bfg4rf3s2427gqvwbkr5gcf7ri";
meta.description = "Full standard library replacement for OCaml";
propagatedBuildInputs = [ sexplib0 ];
buildInputs = [ dune_1 ];
buildInputs = [ dune-configurator ];
};
stdio = janePackage {
@ -106,7 +106,6 @@ with self;
};
ppx_expect = janePackage {
duneVersion = "3";
pname = "ppx_expect";
hash = "1wawsbjfkri4sw52n8xqrzihxc3xfpdicv3ahz83a1rsn4lb8j5q";
meta.description = "Cram like framework for OCaml";
@ -170,8 +169,9 @@ with self;
};
base_quickcheck = janePackage {
version = "0.12.1";
pname = "base_quickcheck";
hash = "1la6qgq1zwmfyq1hqy6i337w435ym5yqgx2ygk86qip6nws0s6r3";
hash = "sha256-ABfUtOzdtGrYR6EgtVYkmxRvsH48jJwSVVOwf4Od12Y=";
meta.description = "Randomized testing framework, designed for compatibility with Base";
propagatedBuildInputs = [ ppx_base ppx_fields_conv ppx_let splittable_random ];
};
@ -209,7 +209,7 @@ with self;
pname = "jst-config";
hash = "0yxcz13vda1mdh9ah7qqxwfxpcqang5sgdssd8721rszbwqqaw93";
meta.description = "Compile-time configuration for Jane Street libraries";
buildInputs = [ dune_1 ppx_assert ];
buildInputs = [ dune-configurator ppx_assert ];
};
ppx_optcomp = janePackage {
@ -276,7 +276,6 @@ with self;
};
ppx_jane = janePackage {
duneVersion = "3";
pname = "ppx_jane";
hash = "1a2602isqzsh640q20qbmarx0sc316mlsqc3i25ysv2kdyhh0kyw";
meta.description = "Standard Jane Street ppx rewriters";
@ -284,7 +283,6 @@ with self;
};
base_bigstring = janePackage {
duneVersion = "3";
pname = "base_bigstring";
hash = "0rbgyg511847fbnxad40prz2dyp4da6sffzyzl88j18cxqxbh1by";
meta.description = "String type based on [Bigarray], for use in I/O and C-bindings";
@ -306,7 +304,6 @@ with self;
};
core_kernel = janePackage {
duneVersion = "3";
pname = "core_kernel";
version = "0.12.3";
hash = "sha256-bDgxuOILAs4FYB8o92ysPHDdEzflZMsU/jk5hB9xfuc=";
@ -316,7 +313,6 @@ with self;
};
spawn = janePackage {
duneVersion = "3";
pname = "spawn";
version = "0.13.0";
hash = "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf";
@ -325,7 +321,6 @@ with self;
};
core = janePackage {
duneVersion = "3";
pname = "core";
version = "0.12.3";
hash = "1vmjqiafkg45hqfvahx6jnlaww1q4a4215k8znbgprf0qn3zymnj";
@ -335,7 +330,6 @@ with self;
};
async_kernel = janePackage {
duneVersion = "3";
pname = "async_kernel";
hash = "1d9illx7vvpblj1i2r9y0f2yff2fbhy3rp4hhvamq1n9n3lvxmh2";
meta.description = "Monadic concurrency library";
@ -343,7 +337,6 @@ with self;
};
protocol_version_header = janePackage {
duneVersion = "3";
pname = "protocol_version_header";
hash = "14vqhx3r84rlfhcjq52gxdqksckiaswlck9s47g7y2z1lsc17v7r";
meta.description = "Protocol versioning";
@ -351,7 +344,6 @@ with self;
};
async_rpc_kernel = janePackage {
duneVersion = "3";
pname = "async_rpc_kernel";
hash = "1znhqbzx4fp58i7dbcgyv5rx7difbhb5d8cbqzv96yqvbn67lsjk";
meta.description = "Platform-independent core of Async RPC library";
@ -359,7 +351,6 @@ with self;
};
async_unix = janePackage {
duneVersion = "3";
pname = "async_unix";
hash = "09h10rdyykbm88n6r9nb5a22mlb6vcxa04q6hvrcr0kys6qhhqmb";
meta.description = "Monadic concurrency library";
@ -367,7 +358,6 @@ with self;
};
async_extra = janePackage {
duneVersion = "3";
pname = "async_extra";
hash = "10j4mwlyqvf67yrp5dwd857llqjinpnnykmlzw2gpmks9azxk6mh";
meta.description = "Monadic concurrency library";
@ -375,7 +365,6 @@ with self;
};
textutils = janePackage {
duneVersion = "3";
pname = "textutils";
hash = "0302awqihf3abib9mvzvn4g8m364hm6jxry1r3kc01hzybhy9acq";
meta.description = "Text output utilities";
@ -383,7 +372,6 @@ with self;
};
async = janePackage {
duneVersion = "3";
pname = "async";
hash = "0pk7z3h2gi21nfchvmjz2wx516bynf9vgwf84zf5qhvlvqqsmyrx";
meta.description = "Monadic concurrency library";
@ -391,7 +379,6 @@ with self;
};
async_find = janePackage {
duneVersion = "3";
pname = "async_find";
hash = "0qsz9f15s5rlk6za10s810v6nlkdxg2g9p1827lcpa7nhjcpi673";
meta.description = "Directory traversal with Async";
@ -399,7 +386,6 @@ with self;
};
re2 = janePackage {
duneVersion = "3";
pname = "re2";
version = "0.12.1";
hash = "sha256-NPQKKUSwckZx4GN4wX2sc0Mn7bes6p79oZrN6xouc6o=";
@ -412,7 +398,6 @@ with self;
};
shell = janePackage {
duneVersion = "3";
pname = "shell";
hash = "158857rdr6qgglc5iksg0l54jgf51b5lmsw7nlazpxwdwc9fcn5n";
meta.description = "Yet another implementation of fork&exec and related functionality";
@ -421,7 +406,6 @@ with self;
};
async_shell = janePackage {
duneVersion = "3";
pname = "async_shell";
hash = "0cxln9hkc3cy522la9yi9p23qjwl69kqmadsq4lnjh5bxdad06sv";
meta.description = "Shell helpers for Async";
@ -429,7 +413,6 @@ with self;
};
core_bench = janePackage {
duneVersion = "3";
pname = "core_bench";
hash = "00hyzbbj19dkcw0vhfnc8w0ca3zkjriwwvl00ssa0a2g9mygijdm";
meta.description = "Benchmarking library";
@ -437,7 +420,6 @@ with self;
};
core_extended = janePackage {
duneVersion = "3";
pname = "core_extended";
hash = "1gwx66235irpf5krb1r25a3c7w52qhmass8hp7rdv89il9jn49w4";
meta.description = "Extra components that are not as closely vetted or as stable as Core";
@ -445,7 +427,6 @@ with self;
};
sexp_pretty = janePackage {
duneVersion = "3";
pname = "sexp_pretty";
hash = "06hdsaszc5cd7fphiblbn4r1sh36xgjwf2igzr2rvlzqs7jiv2v4";
meta.description = "S-expression pretty-printer";
@ -453,7 +434,6 @@ with self;
};
expect_test_helpers_kernel = janePackage {
duneVersion = "3";
pname = "expect_test_helpers_kernel";
hash = "18ya187y2i2hfxr771sd9vy5jdsa30vhs56yjdhwk06v01b2fzbq";
meta.description = "Helpers for writing expectation tests";
@ -462,7 +442,6 @@ with self;
};
expect_test_helpers = janePackage {
duneVersion = "3";
pname = "expect_test_helpers";
hash = "0ixqck2lnsmz107yw0q2sr8va80skjpldx7lz4ymjiq2vsghk0rb";
meta.description = "Async helpers for writing expectation tests";
@ -470,7 +449,6 @@ with self;
};
patience_diff = janePackage {
duneVersion = "3";
pname = "patience_diff";
hash = "055kd3piadjnplip8c8q99ssh79d4irmhg2wng7aida5pbqp2p9f";
meta.description = "Diff library using Bram Cohen's patience diff algorithm";
@ -478,45 +456,10 @@ with self;
};
ecaml = janePackage {
duneVersion = "3";
pname = "ecaml";
hash = "0n9xi6agc3lgyj2nsi10cbif0xwn57xyaranad9r285rmbxrgjh7";
meta.description = "Library for writing Emacs plugin in OCaml";
propagatedBuildInputs = [ async expect_test_helpers_kernel ];
};
### Packages at version 0.11, with dependencies at version 0.12
configurator = janePackage {
pname = "configurator";
version = "0.11.0";
hash = "0h686630cscav7pil8c3w0gbh6rj4b41dvbnwmicmlkc746q5bfk";
propagatedBuildInputs = [ stdio ];
meta.description = "Helper library for gathering system configuration";
};
ppx_core = janePackage {
pname = "ppx_core";
version = "0.11.0";
hash = "11hgm9mxig4cm3c827f6dns9mjv3pf8g6skf10x0gw9xnp1dmzmx";
propagatedBuildInputs = [ ppxlib ];
meta.description = "Deprecated (see ppxlib)";
};
ppx_driver = janePackage {
pname = "ppx_driver";
version = "0.11.0";
hash = "00kfx6js2kxk57k4v7hiqvwk7h35whgjihnxf75m82rnaf4yzvfi";
propagatedBuildInputs = [ ppxlib ];
meta.description = "Deprecated (see ppxlib)";
};
ppx_type_conv = janePackage {
pname = "ppx_type_conv";
version = "0.11.0";
hash = "04dbrglqqhkas25cpjz8xhjcbpk141c35qggzw66bn69izczfmaf";
propagatedBuildInputs = [ ppxlib ];
meta.description = "Deprecated (see ppxlib)";
};
}

2
pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix
View File

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.12.0" }:
{ pname, version ? defaultVersion, duneVersion ? "1", hash, ...}@args:
{ pname, version ? defaultVersion, duneVersion ? "3", hash, ...}@args:
buildDunePackage (args // {
inherit version duneVersion;

2
pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix
View File

@ -8,8 +8,6 @@ buildDunePackage rec {
pname = "ocaml-migrate-parsetree";
version = "1.8.0";
duneVersion = if lib.versionAtLeast ocaml.version "4.08" then "3" else "1";
src = fetchFromGitHub {
owner = "ocaml-ppx";
repo = pname;

8
pkgs/development/ocaml-modules/ocaml-result/default.nix
View File

@ -1,6 +1,6 @@
{ lib, buildDunePackage, fetchurl, ocaml }:
{ lib, buildDunePackage, fetchurl }:
buildDunePackage (rec {
buildDunePackage rec {
pname = "result";
version = "1.5";
@ -19,6 +19,4 @@ buildDunePackage (rec {
'';
license = lib.licenses.bsd3;
};
} // lib.optionalAttrs (!lib.versionAtLeast ocaml.version "4.08") {
duneVersion = "1";
})
}

8
pkgs/development/ocaml-modules/octavius/default.nix
View File

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml }:
{ lib, fetchFromGitHub, buildDunePackage }:
buildDunePackage (rec {
buildDunePackage rec {
pname = "octavius";
version = "1.2.2";
@ -21,6 +21,4 @@ buildDunePackage (rec {
license = licenses.isc;
maintainers = with maintainers; [ vbgl ];
};
} // lib.optionalAttrs (!lib.versionAtLeast ocaml.version "4.08") {
duneVersion = "1";
})
}

8
pkgs/development/ocaml-modules/ppx_derivers/default.nix
View File

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml }:
{ lib, fetchFromGitHub, buildDunePackage }:
buildDunePackage (rec {
buildDunePackage rec {
pname = "ppx_derivers";
version = "1.2.1";
@ -19,6 +19,4 @@ buildDunePackage (rec {
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
};
} // lib.optionalAttrs (!lib.versionAtLeast ocaml.version "4.08") {
duneVersion = "1";
})
}

4
pkgs/development/ocaml-modules/ppxlib/default.nix
View File

@ -12,14 +12,12 @@ let param = {
"0.8.1" = {
sha256 = "sha256-pct57oO7qAMEtlvEfymFOCvviWaLG0b5/7NzTC8vdSE=";
max_version = "4.10";
useDune2 = false;
OMP = [ ocaml-migrate-parsetree ];
};
"0.13.0" = {
sha256 = "sha256-geHz0whQDg5/YQjVsN2iuHlkClwh7z3Eqb2QOBzuOdk=";
min_version = "4.07";
max_version = "4.11";
useDune2 = false;
OMP = [ ocaml-migrate-parsetree ];
};
"0.15.0" = {
@ -80,8 +78,6 @@ buildDunePackage rec {
pname = "ppxlib";
inherit version;
duneVersion = if param.useDune2 or true then "3" else "1";
src = fetchurl {
url = "https://github.com/ocaml-ppx/ppxlib/releases/download/${version}/ppxlib-${version}.tbz";
inherit (param) sha256;