From 3c5e31ec00a02a35a9ec1f377a9bbbb181745ddf Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 17:39:54 -0400 Subject: js_build_tools: init at 113.33.06 --- .../ocaml-modules/janestreet/js-build-tools.nix | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/js-build-tools.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix new file mode 100644 index 000000000000..d6e67b277cac --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix @@ -0,0 +1,27 @@ +{stdenv, buildOcaml, fetchurl, ocaml_oasis, opam}: + +buildOcaml rec { + name = "js-build-tools"; + version = "113.33.06"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/${name}/archive/${version}.tar.gz"; + sha256 = "1nvgyp4gsnlnpix3li6kr90b12iin5ihichv298p03i6h2809dia"; + }; + + hasSharedObjects = true; + + buildInputs = [ ocaml_oasis opam ]; + + dontAddPrefix = true; + configurePhase = "./configure --prefix $prefix"; + installPhase = "opam-installer -i --prefix $prefix --libdir `ocamlfind printconf destdir` ${name}.install"; + + meta = with stdenv.lib; { + description = "Jane Street Build Tools"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} -- cgit 1.4.1 From 95d9e2b86a0a3fb078f844592c626501d52e09d8 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 17:42:26 -0400 Subject: ppx_core: init at 113.33.03 --- .../ocaml-modules/janestreet/buildOcamlJane.nix | 30 ++++++++++++++++++++++ .../ocaml-modules/janestreet/ppx-core.nix | 14 ++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 3 files changed, 49 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-core.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix new file mode 100644 index 000000000000..33397e35aa6d --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix @@ -0,0 +1,30 @@ +{ buildOcaml, opam, js_build_tools, ocaml_oasis, fetchurl } : + +{ name, version ? "113.33.03", buildInputs ? [], + hash ? "", + minimumSupportedOcamlVersion ? "4.02", ... +}@args: + +buildOcaml (args // { + inherit name version minimumSupportedOcamlVersion; + src = fetchurl { + url = "https://github.com/janestreet/${name}/archive/${version}.tar.gz"; + sha256 = hash; + }; + + hasSharedObjects = true; + + buildInputs = [ ocaml_oasis js_build_tools opam ] ++ buildInputs; + + dontAddPrefix = true; + + configurePhase = "./configure --prefix $out"; + + buildPhase = "OCAML_TOPLEVEL_PATH=`ocamlfind query findlib`/.. make"; + + installPhase = '' + opam-installer -i --prefix $prefix --libdir `ocamlfind printconf destdir` --stubsdir `ocamlfind printconf destdir`/${name} ${name}.install + if [ -d $out/lib/${name} ]; then if [ "$(ls -A $out/lib/${name})" ]; then mv $out/lib/${name}/* `ocamlfind printconf destdir`/${name}; fi; rmdir $out/lib/${name}; fi + ''; + +}) diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-core.nix b/pkgs/development/ocaml-modules/janestreet/ppx-core.nix new file mode 100644 index 000000000000..4f5bb87b7675 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-core.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_core"; + hash = "0df7vyai488lfkyh8szw2hvn22jsyrkfvq1b91j1s0g0y27nnfax"; + propagatedBuildInputs = + [ ppx_tools ]; + + meta = with stdenv.lib; { + description = "PPX standard library"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63642673465d..a12f6c8740f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5504,6 +5504,11 @@ in # Jane Street js_build_tools = callPackage ../development/ocaml-modules/janestreet/js-build-tools.nix {}; + + buildOcamlJane = callPackage ../development/ocaml-modules/janestreet/buildOcamlJane.nix {}; + + ppx_core = callPackage ../development/ocaml-modules/janestreet/ppx-core.nix {}; + }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From 5bdce80515554f05d6d65853ad01d144a5d9b718 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 17:45:18 -0400 Subject: ppx_optcomp: init at 113.33.03 --- pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix new file mode 100644 index 000000000000..5dcfc97bfa37 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix @@ -0,0 +1,15 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_optcomp"; + hash = "09m2x2a5ics4bz1j29n5slhh1rlyhcwdfmf44v1jfxcby3f0riwd"; + propagatedBuildInputs = + [ ppx_core ppx_tools ]; + + meta = with stdenv.lib; { + description = "ppx_optcomp stands for Optional Compilation. It is a tool used to handle optional compilations of pieces of code depending of the word size, the version of the compiler, etc."; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a12f6c8740f4..037b567d0dd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5509,6 +5509,8 @@ in ppx_core = callPackage ../development/ocaml-modules/janestreet/ppx-core.nix {}; + ppx_optcomp = callPackage ../development/ocaml-modules/janestreet/ppx-optcomp.nix {}; + }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From a65e53d768814e18f9c70146347ed22407e02ee4 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 17:47:01 -0400 Subject: ppx_driver: init at 113.33.03 --- pkgs/development/ocaml-modules/janestreet/ppx-driver.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-driver.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix b/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix new file mode 100644 index 000000000000..ca6cc7464da6 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix @@ -0,0 +1,15 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_optcomp}: + +buildOcamlJane rec { + name = "ppx_driver"; + hash = "19cpfdn1n36vl5l9d6h7c61ffn0wmiipprn5by0354i5aywj8gpn"; + propagatedBuildInputs = + [ ppx_core ppx_optcomp ]; + + meta = with stdenv.lib; { + description = "A driver is an executable created from a set of OCaml AST transformers linked together with a command line frontend."; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 037b567d0dd6..73b04319c780 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5511,6 +5511,7 @@ in ppx_optcomp = callPackage ../development/ocaml-modules/janestreet/ppx-optcomp.nix {}; + ppx_driver = callPackage ../development/ocaml-modules/janestreet/ppx-driver.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From 146609fe5909c2f3e25c9fd0c39459bc97130b7f Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 17:50:18 -0400 Subject: ppx_deriving: init at v3.3 --- .../ocaml-modules/ppx_deriving/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ppx_deriving/default.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix new file mode 100644 index 000000000000..4b4056a69d72 --- /dev/null +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -0,0 +1,28 @@ +{stdenv, buildOcaml, fetchurl, + cppo, ppx_tools, result, ounit}: + +buildOcaml rec { + name = "ppx_deriving"; + version = "v3.3"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/whitequark/${name}/archive/${version}.tar.gz"; + sha256 = "1j20c6r2v7h05a4v9m8z5m1yqgwif41yrp63mik14pf3dkrj8x3f"; + }; + + hasSharedObjects = true; + + buildInputs = [ cppo ounit ]; + propagatedBuildInputs = + [ ppx_tools result ]; + + installPhase = "OCAMLPATH=$OCAMLPATH:`ocamlfind printconf destdir` make install"; + + meta = with stdenv.lib; { + description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02."; + maintainers = [ maintainers.maurer ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73b04319c780..f4e9b366d80f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5436,6 +5436,11 @@ in then callPackage ../development/ocaml-modules/ppx_blob {} else null; + ppx_deriving = + if lib.versionAtLeast ocaml_version "4.02" + then callPackage ../development/ocaml-modules/ppx_deriving {} + else null; + ppx_tools = if lib.versionAtLeast ocaml_version "4.02" then callPackage ../development/ocaml-modules/ppx_tools {} -- cgit 1.4.1 From b87abcb3b64d110dbef3f8018eadf609fef36835 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 18:20:16 -0400 Subject: ppx_type_conv: init at 113.33.03 --- .../ocaml-modules/janestreet/ppx-type-conv.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix new file mode 100644 index 000000000000..6a7588e13abc --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix @@ -0,0 +1,15 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_deriving, ppx_driver, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_type_conv"; + hash = "0gv0mqwn97dwrfm6rj442565y8dz7kiq8s8vadnhywrl7j4znqyq"; + propagatedBuildInputs = + [ ppx_core ppx_deriving ppx_driver ppx_tools ]; + + meta = with stdenv.lib; { + description = "The type_conv library factors out functionality needed by different preprocessors that generate code from type specifications."; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4e9b366d80f..65cb900abc92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5517,6 +5517,8 @@ in ppx_optcomp = callPackage ../development/ocaml-modules/janestreet/ppx-optcomp.nix {}; ppx_driver = callPackage ../development/ocaml-modules/janestreet/ppx-driver.nix {}; + + ppx_type_conv = callPackage ../development/ocaml-modules/janestreet/ppx-type-conv.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From d51fcdb7778f1e64ff4b157753d0fee5b4ca4b0e Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 18:21:59 -0400 Subject: ppx_compare: init at 113.33.03 --- pkgs/development/ocaml-modules/janestreet/ppx-compare.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-compare.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix new file mode 100644 index 000000000000..f24c82dd6a76 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix @@ -0,0 +1,15 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver, ppx_tools, ppx_type_conv}: + +buildOcamlJane rec { + name = "ppx_compare"; + hash = "05cnwxfxm8201lpfmcqkcqfy6plh5c2151jbj4qsnxhlvvjli459"; + propagatedBuildInputs = + [ppx_core ppx_driver ppx_tools ppx_type_conv ]; + + meta = with stdenv.lib; { + description = "Generation of fast comparison functions from type expressions and definitions."; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65cb900abc92..b42008eb6acf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5519,6 +5519,8 @@ in ppx_driver = callPackage ../development/ocaml-modules/janestreet/ppx-driver.nix {}; ppx_type_conv = callPackage ../development/ocaml-modules/janestreet/ppx-type-conv.nix {}; + + ppx_compare = callPackage ../development/ocaml-modules/janestreet/ppx-compare.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From 7f861c4add4955eca64858acbe4a0d87fe4c61b5 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 18:23:00 -0400 Subject: ppx_here: init at 113.33.03 --- pkgs/development/ocaml-modules/janestreet/ppx-here.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-here.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix new file mode 100644 index 000000000000..6821a1df35bc --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver}: + +buildOcamlJane rec { + name = "ppx_here"; + hash = "1mzdgn8k171zkwmbizf1a48l525ny0w3363c7gknpnifcinxniiw"; + propagatedBuildInputs = [ ppx_core ppx_driver ]; + + meta = with stdenv.lib; { + description = "A ppx rewriter that defines an extension node whose value is its source position."; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b42008eb6acf..b0e5badf84f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5521,6 +5521,8 @@ in ppx_type_conv = callPackage ../development/ocaml-modules/janestreet/ppx-type-conv.nix {}; ppx_compare = callPackage ../development/ocaml-modules/janestreet/ppx-compare.nix {}; + + ppx_here = callPackage ../development/ocaml-modules/janestreet/ppx-here.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From b86e0ad4986c12d6431e53a542e4b1243b564213 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 18:37:24 -0400 Subject: ppx_sexp_conv: init at 113.33.03 --- .../development/ocaml-modules/janestreet/ppx-sexp-conv.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix new file mode 100644 index 000000000000..a36a80a05596 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_tools, ppx_type_conv, sexplib}: + +buildOcamlJane rec { + name = "ppx_sexp_conv"; + hash = "1kgbmlc11w5jhbhmy5n0f734l44zwyry48342dm5qydi9sfzcgq2"; + propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib]; + + meta = with stdenv.lib; { + description = "A ppx rewriter that defines an extension node whose value is its source position."; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0e5badf84f4..c78348470fc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5523,6 +5523,8 @@ in ppx_compare = callPackage ../development/ocaml-modules/janestreet/ppx-compare.nix {}; ppx_here = callPackage ../development/ocaml-modules/janestreet/ppx-here.nix {}; + + ppx_sexp_conv = callPackage ../development/ocaml-modules/janestreet/ppx-sexp-conv.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From a89dfb2148586b2ece4604d31c377ac4bfab76d0 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 18:38:45 -0400 Subject: ppx_assert: init at 113.33.03 --- pkgs/development/ocaml-modules/janestreet/ppx-assert.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-assert.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix new file mode 100644 index 000000000000..e42bc80e9dd2 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix @@ -0,0 +1,16 @@ +{stdenv, buildOcamlJane, + ppx_compare, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools, ppx_type_conv, sexplib}: + +buildOcamlJane rec { + name = "ppx_assert"; + hash = "0n7fa1j79ykbkhp8xz0ksg5096asri5d0msshsaqhw5fz18chvz4"; + propagatedBuildInputs = + [ ppx_compare ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools + ppx_type_conv sexplib ]; + + meta = with stdenv.lib; { + description = "Assert-like extension nodes that raise useful errors on failure."; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c78348470fc7..c4623c090c22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5525,6 +5525,8 @@ in ppx_here = callPackage ../development/ocaml-modules/janestreet/ppx-here.nix {}; ppx_sexp_conv = callPackage ../development/ocaml-modules/janestreet/ppx-sexp-conv.nix {}; + + ppx_assert = callPackage ../development/ocaml-modules/janestreet/ppx-assert.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From d537a83811d7e3969fac257ad2e0412d91ffb3e8 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 18:40:51 -0400 Subject: ppx_inline_test: init at 113.33.03 --- .../ocaml-modules/janestreet/ppx-inline-test.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix new file mode 100644 index 000000000000..26dd7d70c444 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_inline_test"; + hash = "0ygapa54i0wwcj3jcqwiimrc6z0b7aafgjhbk37h6vvclnm5n7f6"; + propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ]; + + meta = with stdenv.lib; { + description = "Syntax extension for writing in-line tests in ocaml code."; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4623c090c22..73c4555e3106 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5527,6 +5527,8 @@ in ppx_sexp_conv = callPackage ../development/ocaml-modules/janestreet/ppx-sexp-conv.nix {}; ppx_assert = callPackage ../development/ocaml-modules/janestreet/ppx-assert.nix {}; + + ppx_inline_test = callPackage ../development/ocaml-modules/janestreet/ppx-inline-test.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From bb34402719b473d289b24ed556131ac7c62995b9 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 18:43:01 -0400 Subject: ppx_bench: init at 113.33.03 --- .../development/ocaml-modules/janestreet/ppx-bench.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-bench.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix new file mode 100644 index 000000000000..a41773b6f683 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix @@ -0,0 +1,18 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver, ppx_inline_test, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_bench"; + minimumSupportedOcamlVersion = "4.02"; + hash = "1l5jlwy1d1fqz70wa2fkf7izngp6nx3g4s9bmnd6ca4dx1x5bksk"; + + hasSharedObjects = true; + + propagatedBuildInputs = [ ppx_core ppx_driver ppx_inline_test ppx_tools ]; + + meta = with stdenv.lib; { + description = "Syntax extension for writing in-line benchmarks in ocaml code."; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73c4555e3106..09ad32d7bb4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5529,6 +5529,8 @@ in ppx_assert = callPackage ../development/ocaml-modules/janestreet/ppx-assert.nix {}; ppx_inline_test = callPackage ../development/ocaml-modules/janestreet/ppx-inline-test.nix {}; + + ppx_bench = callPackage ../development/ocaml-modules/janestreet/ppx-bench.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From d862e9a6a1dc2039032ef21c08215030a151d991 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 18:46:29 -0400 Subject: ppx_bin_prot: init at 113.33.03 --- pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix new file mode 100644 index 000000000000..9dffbed69600 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_tools, ppx_type_conv, bin_prot}: + +buildOcamlJane rec { + name = "ppx_bin_prot"; + hash = "0kwmrrrybdkmphqczsr3lg3imsxcjb8iy41syvn44s3kcjfyyzbz"; + propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv bin_prot ]; + + meta = with stdenv.lib; { + description = "Generation of bin_prot readers and writers from types"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09ad32d7bb4e..6870665e2247 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5531,6 +5531,8 @@ in ppx_inline_test = callPackage ../development/ocaml-modules/janestreet/ppx-inline-test.nix {}; ppx_bench = callPackage ../development/ocaml-modules/janestreet/ppx-bench.nix {}; + + ppx_bin_prot = callPackage ../development/ocaml-modules/janestreet/ppx-bin-prot.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From bf2299bd48d27459391fdfa2b6fa4220e790fea3 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 18:48:04 -0400 Subject: ppx_custom_printf: init at 113.33.03 --- .../ocaml-modules/janestreet/ppx-custom-printf.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix new file mode 100644 index 000000000000..f96d5bf4ca60 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix @@ -0,0 +1,15 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver, ppx_sexp_conv, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_custom_printf"; + hash = "06y85m6ky376byja4w7gdwd339di5ag0xrf0czkylzjsnylhdr85"; + + propagatedBuildInputs = [ ppx_core ppx_driver ppx_sexp_conv ppx_tools ]; + + meta = with stdenv.lib; { + description = "Extensions to printf-style format-strings for user-defined string conversion."; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6870665e2247..424efc9d0ea9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5533,6 +5533,8 @@ in ppx_bench = callPackage ../development/ocaml-modules/janestreet/ppx-bench.nix {}; ppx_bin_prot = callPackage ../development/ocaml-modules/janestreet/ppx-bin-prot.nix {}; + + ppx_custom_printf = callPackage ../development/ocaml-modules/janestreet/ppx-custom-printf.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From 50f4790f86c796d6026f1c34c2d96fcded5fee76 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 18:49:21 -0400 Subject: ppx_enumerate: init at 113.33.03 --- .../development/ocaml-modules/janestreet/ppx-enumerate.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix new file mode 100644 index 000000000000..874380cf03a5 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_tools, ppx_type_conv}: + +buildOcamlJane rec { + name = "ppx_enumerate"; + hash = "0m11921q2pjzkwckf21fynd2qfy83n9jjsgks23yagdai8a7ym16"; + propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ]; + + meta = with stdenv.lib; { + description = "Generate a list containing all values of a finite type."; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 424efc9d0ea9..68dfdd3c0c21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5535,6 +5535,8 @@ in ppx_bin_prot = callPackage ../development/ocaml-modules/janestreet/ppx-bin-prot.nix {}; ppx_custom_printf = callPackage ../development/ocaml-modules/janestreet/ppx-custom-printf.nix {}; + + ppx_enumerate = callPackage ../development/ocaml-modules/janestreet/ppx-enumerate.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From 1f16ade80f7dd7f1dbcb184442a7de691777a7ad Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 18:50:47 -0400 Subject: ppx_fail: init at 113.33.03 --- pkgs/development/ocaml-modules/janestreet/ppx-fail.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-fail.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix b/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix new file mode 100644 index 000000000000..5ffa12ebdb41 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver, ppx_here, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_fail"; + hash = "1ms5axpc0zg469zj4799nz3wwxi6rmmyvqj52dy03crmpj71s18l"; + propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_tools ]; + + meta = with stdenv.lib; { + description = "Syntax extension that makes failwith include a position."; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68dfdd3c0c21..81c5aa42c9fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5537,6 +5537,8 @@ in ppx_custom_printf = callPackage ../development/ocaml-modules/janestreet/ppx-custom-printf.nix {}; ppx_enumerate = callPackage ../development/ocaml-modules/janestreet/ppx-enumerate.nix {}; + + ppx_fail = callPackage ../development/ocaml-modules/janestreet/ppx-fail.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From f8241a28fbb73b3121e9293b896a9b269293b192 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 18:52:01 -0400 Subject: ppx_fields_conv: init at 113.33.03 --- .../ocaml-modules/janestreet/ppx-fields-conv.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix new file mode 100644 index 000000000000..15a479ab1824 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_tools, ppx_type_conv}: + +buildOcamlJane rec { + name = "ppx_fields_conv"; + hash = "11w9wfjgkv7yxv3rwlwi6m193zan6rhmi45q7n3ddi2s8ls3gra7"; + propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ]; + + meta = with stdenv.lib; { + description = "Generation of accessor and iteration functions for ocaml records."; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81c5aa42c9fc..6f7a05618656 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5539,6 +5539,8 @@ in ppx_enumerate = callPackage ../development/ocaml-modules/janestreet/ppx-enumerate.nix {}; ppx_fail = callPackage ../development/ocaml-modules/janestreet/ppx-fail.nix {}; + + ppx_fields_conv = callPackage ../development/ocaml-modules/janestreet/ppx-fields-conv.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From 68aa85cf99b8536fe285781fa612ab611469933e Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 18:53:23 -0400 Subject: ppx_let: init at 113.33.03 --- pkgs/development/ocaml-modules/janestreet/ppx-let.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-let.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix new file mode 100644 index 000000000000..3498affeb090 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver}: + +buildOcamlJane rec { + name = "ppx_let"; + hash = "0whnfq4rgkq4apfqnvc100wlk25pmqdyvy6s21dsn3fcm9hff467"; + propagatedBuildInputs = [ ppx_core ppx_driver ]; + + meta = with stdenv.lib; { + description = "A ppx rewriter for monadic and applicative let bindings and match statements"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f7a05618656..80607f5c5637 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5541,6 +5541,8 @@ in ppx_fail = callPackage ../development/ocaml-modules/janestreet/ppx-fail.nix {}; ppx_fields_conv = callPackage ../development/ocaml-modules/janestreet/ppx-fields-conv.nix {}; + + ppx_let = callPackage ../development/ocaml-modules/janestreet/ppx-let.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From 7f3e5783bf6422162e944df4c95dce5b543d1170 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 18:57:09 -0400 Subject: ppx_pipebang: init at 113.33.03 --- pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix new file mode 100644 index 000000000000..f3f4bcdead59 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_pipebang"; + hash = "0k25bhj9ziiw89xvs4svz7cgazbbmprba9wbic2llffg55fp7acc"; + propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ]; + + meta = with stdenv.lib; { + description = "A ppx rewriter that inlines reverse application operators |> and |!"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80607f5c5637..cbc099f7b744 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5543,6 +5543,8 @@ in ppx_fields_conv = callPackage ../development/ocaml-modules/janestreet/ppx-fields-conv.nix {}; ppx_let = callPackage ../development/ocaml-modules/janestreet/ppx-let.nix {}; + + ppx_pipebang = callPackage ../development/ocaml-modules/janestreet/ppx-pipebang.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From 246fd021bde497a098c8d7528cf0e63a7f33de52 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 19:00:53 -0400 Subject: ppx_sexp_message: init at 113.33.03 --- .../ocaml-modules/janestreet/ppx-sexp-message.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix new file mode 100644 index 000000000000..e83aaa2c2723 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_sexp_message"; + hash = "0inbff25qii868p141jb1y8n3vjfyz66jpnsl9nma6nkkyjkp05j"; + propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ]; + + meta = with stdenv.lib; { + description = "Easy construction of S-Expressions"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cbc099f7b744..eccdf888f4e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5545,6 +5545,8 @@ in ppx_let = callPackage ../development/ocaml-modules/janestreet/ppx-let.nix {}; ppx_pipebang = callPackage ../development/ocaml-modules/janestreet/ppx-pipebang.nix {}; + + ppx_sexp_message = callPackage ../development/ocaml-modules/janestreet/ppx-sexp-message.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From 4de0724e8c0d06d7c94b75e5ba7f436c60a2f223 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 19:01:51 -0400 Subject: ppx_sexp_value: init at 113.33.03 --- .../ocaml-modules/janestreet/ppx-sexp-value.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix new file mode 100644 index 000000000000..fc7f043f8a1a --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_sexp_value"; + hash = "04602ppqfwx33ghjywam00hlqqzsz4d99r60k9q0v1mynk9pjhj0"; + propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ]; + + meta = with stdenv.lib; { + description = "A ppx rewriter that simplifies building S-Expression from OCaml Values."; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eccdf888f4e6..0b11b07b8ed4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5547,6 +5547,8 @@ in ppx_pipebang = callPackage ../development/ocaml-modules/janestreet/ppx-pipebang.nix {}; ppx_sexp_message = callPackage ../development/ocaml-modules/janestreet/ppx-sexp-message.nix {}; + + ppx_sexp_value = callPackage ../development/ocaml-modules/janestreet/ppx-sexp-value.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From 753edce0218eea1760f9d27d99bfead413326bf3 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 19:03:20 -0400 Subject: ppx_typerep_conv: init at 113.33.03 --- .../ocaml-modules/janestreet/ppx-typerep-conv.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix new file mode 100644 index 000000000000..e6d23e0dbdd0 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_tools, ppx_type_conv, typerep}: + +buildOcamlJane rec { + name = "ppx_typerep_conv"; + hash = "0dldlx73r07j6w0i7h4hxly0v678naa79na5rafsk2974gs5ih9g"; + propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv typerep ]; + + meta = with stdenv.lib; { + description = "Automatic generation of runtime types from type definitions"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b11b07b8ed4..316052942a43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5549,6 +5549,8 @@ in ppx_sexp_message = callPackage ../development/ocaml-modules/janestreet/ppx-sexp-message.nix {}; ppx_sexp_value = callPackage ../development/ocaml-modules/janestreet/ppx-sexp-value.nix {}; + + ppx_typerep_conv = callPackage ../development/ocaml-modules/janestreet/ppx-typerep-conv.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From e485e9b6d3932f0fbfa4b51bd15d5164ce96c7bc Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 19:07:19 -0400 Subject: ppx_variants_conv: init at 113.33.03 --- .../ocaml-modules/janestreet/ppx-variants-conv.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix new file mode 100644 index 000000000000..d707df93a16d --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_tools, ppx_type_conv, sexplib}: + +buildOcamlJane rec { + name = "ppx_variants_conv"; + hash = "0kgal8b9yh7wrd75hllb9fyl6zbksfnr9k7pykpzdm3js98dirhn"; + propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib]; + + meta = with stdenv.lib; { + description = "Generation of accessor and iteration functions for ocaml variant types."; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 316052942a43..bb6185cb3ca5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5551,6 +5551,8 @@ in ppx_sexp_value = callPackage ../development/ocaml-modules/janestreet/ppx-sexp-value.nix {}; ppx_typerep_conv = callPackage ../development/ocaml-modules/janestreet/ppx-typerep-conv.nix {}; + + ppx_variants_conv = callPackage ../development/ocaml-modules/janestreet/ppx-variants-conv.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From 794b4fbfb9e0e8c866f266facefb7dcde4a7fefd Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 19:08:28 -0400 Subject: ppx_expect: init at 113.33.03 --- .../ocaml-modules/janestreet/ppx-expect.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-expect.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix new file mode 100644 index 000000000000..7e688a1dc1c8 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix @@ -0,0 +1,19 @@ +{stdenv, buildOcamlJane, + ppx_assert, ppx_compare, ppx_core, ppx_custom_printf, ppx_driver, + ppx_fields_conv, ppx_here, ppx_inline_test, ppx_sexp_conv, ppx_tools, + ppx_variants_conv, re, sexplib, variantslib, fieldslib}: + +buildOcamlJane rec { + name = "ppx_expect"; + hash = "0cwagb4cj3x1vsr19kyfa9pxlvaz9a5v863cahi5glinsh4mzgdx"; + propagatedBuildInputs = + [ ppx_assert ppx_compare ppx_core ppx_custom_printf ppx_driver + ppx_fields_conv ppx_here ppx_inline_test ppx_sexp_conv ppx_tools + ppx_variants_conv re sexplib variantslib fieldslib ]; + + meta = with stdenv.lib; { + description = "Cram-like framework for OCaml"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb6185cb3ca5..a672693d8c4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5553,6 +5553,8 @@ in ppx_typerep_conv = callPackage ../development/ocaml-modules/janestreet/ppx-typerep-conv.nix {}; ppx_variants_conv = callPackage ../development/ocaml-modules/janestreet/ppx-variants-conv.nix {}; + + ppx_expect = callPackage ../development/ocaml-modules/janestreet/ppx-expect.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From d97392c39ad9f6dbd37325e55fa53d3f647a8a78 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 19:21:04 -0400 Subject: ocaml-typerep: 112.24.00 -> 112.24.00/113.33.03 Split typerep into ppx supporting (modern) and p4 supporting (legacy) --- pkgs/development/ocaml-modules/core/default.nix | 4 ++-- .../ocaml-modules/core_kernel/default.nix | 4 ++-- .../development/ocaml-modules/janestreet/typerep.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 4 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/ocaml-modules/janestreet/typerep.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix index 96fd80087d66..8110711a9345 100644 --- a/pkgs/development/ocaml-modules/core/default.nix +++ b/pkgs/development/ocaml-modules/core/default.nix @@ -1,7 +1,7 @@ {stdenv, buildOcaml, fetchurl, type_conv, core_kernel, bin_prot, comparelib, custom_printf, enumerate, fieldslib, herelib, pa_bench, pa_test, pa_ounit, - pipebang, sexplib, typerep, variantslib}: + pipebang, sexplib, typerep_p4, variantslib}: buildOcaml rec { name = "core"; @@ -19,7 +19,7 @@ buildOcaml rec { buildInputs = [ pa_bench pa_test pa_ounit ]; propagatedBuildInputs = [ type_conv core_kernel bin_prot comparelib custom_printf enumerate fieldslib herelib - pipebang sexplib typerep variantslib ]; + pipebang sexplib typerep_p4 variantslib ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/core; diff --git a/pkgs/development/ocaml-modules/core_kernel/default.nix b/pkgs/development/ocaml-modules/core_kernel/default.nix index 0fed12b195d6..9be55061b006 100644 --- a/pkgs/development/ocaml-modules/core_kernel/default.nix +++ b/pkgs/development/ocaml-modules/core_kernel/default.nix @@ -1,7 +1,7 @@ {stdenv, buildOcaml, fetchurl, type_conv, bin_prot, comparelib, custom_printf, enumerate, fieldslib, herelib, pa_bench, pa_test, pa_ounit, - pipebang, sexplib, typerep, variantslib}: + pipebang, sexplib, typerep_p4, variantslib}: buildOcaml rec { name = "core_kernel"; @@ -19,7 +19,7 @@ buildOcaml rec { buildInputs = [ pa_test pa_ounit ]; propagatedBuildInputs = [ type_conv pa_bench bin_prot comparelib custom_printf enumerate fieldslib herelib pipebang sexplib - typerep variantslib ]; + typerep_p4 variantslib ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/core_kernel; diff --git a/pkgs/development/ocaml-modules/janestreet/typerep.nix b/pkgs/development/ocaml-modules/janestreet/typerep.nix new file mode 100644 index 000000000000..81e6c4be9cbc --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/typerep.nix @@ -0,0 +1,20 @@ +{stdenv, buildOcamlJane, type_conv}: + +buildOcamlJane rec { + name = "typerep"; + version = "113.33.03"; + + minimumSupportedOcamlVersion = "4.00"; + + hash = "1ss34nq20vfgx8hwi5sswpmn3my9lvrpdy5dkng746xchwi33ar7"; + + propagatedBuildInputs = [ type_conv ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/typerep; + description = "Runtime types for OCaml (beta version)"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a672693d8c4e..d752d4289ba2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5470,7 +5470,7 @@ in twt = callPackage ../development/ocaml-modules/twt { }; - typerep = callPackage ../development/ocaml-modules/typerep { }; + typerep_p4 = callPackage ../development/ocaml-modules/typerep { }; utop = callPackage ../development/tools/ocaml/utop { }; @@ -5555,6 +5555,8 @@ in ppx_variants_conv = callPackage ../development/ocaml-modules/janestreet/ppx-variants-conv.nix {}; ppx_expect = callPackage ../development/ocaml-modules/janestreet/ppx-expect.nix {}; + + typerep = callPackage ../development/ocaml-modules/janestreet/typerep.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From b0c76ca173e9a1d8daf7778df3097afc0164aebb Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 19:22:25 -0400 Subject: ppx_jane: init at 113.33.03 --- .../ocaml-modules/janestreet/ppx-jane.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx-jane.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix new file mode 100644 index 000000000000..d138ef0b24e2 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix @@ -0,0 +1,22 @@ +{stdenv, buildOcamlJane, + ppx_assert, + ppx_bench, ppx_bin_prot, ppx_compare, ppx_custom_printf, ppx_driver, + ppx_enumerate, ppx_expect, ppx_fail, ppx_fields_conv, ppx_here, + ppx_inline_test, ppx_let, ppx_pipebang, ppx_sexp_conv, ppx_sexp_message, + ppx_sexp_value, ppx_typerep_conv, ppx_variants_conv}: + +buildOcamlJane rec { + name = "ppx_jane"; + hash = "1la0rp8fhzfglwb15gqh1pl1ld8ls4cnidaw9mjc5q1hb0yj1qd9"; + propagatedBuildInputs = + [ ppx_assert ppx_bench ppx_bin_prot ppx_compare ppx_custom_printf + ppx_driver ppx_enumerate ppx_expect ppx_fail ppx_fields_conv + ppx_here ppx_inline_test ppx_let ppx_pipebang ppx_sexp_conv + ppx_sexp_message ppx_sexp_value ppx_typerep_conv ppx_variants_conv ]; + + meta = with stdenv.lib; { + description = "ppx_jane is a ppx_driver including all standard ppx rewriters."; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d752d4289ba2..7bb001767705 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5556,6 +5556,8 @@ in ppx_expect = callPackage ../development/ocaml-modules/janestreet/ppx-expect.nix {}; + ppx_jane = callPackage ../development/ocaml-modules/janestreet/ppx-jane.nix {}; + typerep = callPackage ../development/ocaml-modules/janestreet/typerep.nix {}; }; -- cgit 1.4.1 From 3eb02d9f386576790ba6d8544779aa3b980e972f Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 19:58:42 -0400 Subject: fieldslib: 109.20.03 -> 109.20.03/113.33.03 PPX/P4 legacy split --- .../development/ocaml-modules/async_extra/default.nix | 4 ++-- .../ocaml-modules/async_kernel/default.nix | 4 ++-- pkgs/development/ocaml-modules/async_ssl/default.nix | 4 ++-- pkgs/development/ocaml-modules/async_unix/default.nix | 4 ++-- pkgs/development/ocaml-modules/cohttp/default.nix | 4 ++-- pkgs/development/ocaml-modules/core/default.nix | 4 ++-- .../ocaml-modules/core_extended/default.nix | 4 ++-- .../development/ocaml-modules/core_kernel/default.nix | 4 ++-- .../ocaml-modules/janestreet/fieldslib.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++++- 10 files changed, 40 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/ocaml-modules/janestreet/fieldslib.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/async_extra/default.nix b/pkgs/development/ocaml-modules/async_extra/default.nix index 2d1e1dea69cc..8689c0291c3f 100644 --- a/pkgs/development/ocaml-modules/async_extra/default.nix +++ b/pkgs/development/ocaml-modules/async_extra/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, async_kernel, async_unix, - bin_prot, core, custom_printf, fieldslib, herelib, pa_ounit, + bin_prot, core, custom_printf, fieldslib_p4, herelib, pa_ounit, pipebang, pa_test, sexplib}: buildOcaml rec { @@ -15,7 +15,7 @@ buildOcaml rec { buildInputs = [ pa_test pa_ounit ]; propagatedBuildInputs = [ async_kernel async_unix core bin_prot custom_printf - fieldslib herelib pipebang sexplib ]; + fieldslib_p4 herelib pipebang sexplib ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_extra; diff --git a/pkgs/development/ocaml-modules/async_kernel/default.nix b/pkgs/development/ocaml-modules/async_kernel/default.nix index 8c0d8d7c851e..f850e4612960 100644 --- a/pkgs/development/ocaml-modules/async_kernel/default.nix +++ b/pkgs/development/ocaml-modules/async_kernel/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, core_kernel, - bin_prot, fieldslib, pa_ounit, pa_test, + bin_prot, fieldslib_p4, pa_ounit, pa_test, sexplib, herelib}: buildOcaml rec { @@ -14,7 +14,7 @@ buildOcaml rec { }; buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ]; + propagatedBuildInputs = [ core_kernel bin_prot fieldslib_p4 herelib sexplib ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_kernel; diff --git a/pkgs/development/ocaml-modules/async_ssl/default.nix b/pkgs/development/ocaml-modules/async_ssl/default.nix index 527d56ceaa01..cc4f5ba32c9f 100644 --- a/pkgs/development/ocaml-modules/async_ssl/default.nix +++ b/pkgs/development/ocaml-modules/async_ssl/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, async, comparelib, core, ctypes, openssl, - fieldslib, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib}: + fieldslib_p4, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib}: buildOcaml rec { name = "async_ssl"; @@ -13,7 +13,7 @@ buildOcaml rec { }; buildInputs = [ pa_bench pa_test ]; - propagatedBuildInputs = [ ctypes async comparelib core fieldslib pa_ounit + propagatedBuildInputs = [ ctypes async comparelib core fieldslib_p4 pa_ounit herelib pipebang sexplib openssl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/async_unix/default.nix b/pkgs/development/ocaml-modules/async_unix/default.nix index 81fbd6a99182..11965f3f35ff 100644 --- a/pkgs/development/ocaml-modules/async_unix/default.nix +++ b/pkgs/development/ocaml-modules/async_unix/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, async_kernel, - bin_prot, comparelib, core, fieldslib, herelib, pa_ounit, + bin_prot, comparelib, core, fieldslib_p4, herelib, pa_ounit, pipebang, pa_test, sexplib}: buildOcaml rec { @@ -16,7 +16,7 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_ounit ]; propagatedBuildInputs = [ async_kernel core bin_prot comparelib - fieldslib herelib pipebang pa_test sexplib ]; + fieldslib_p4 herelib pipebang pa_test sexplib ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_unix; diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 9a30a5e4615e..0fa44a2cd7fb 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, cmdliner, re, uri, fieldslib, sexplib, conduit, +{stdenv, buildOcaml, fetchurl, cmdliner, re, uri, fieldslib_p4, sexplib, conduit, stringext, base64, magic-mime, ounit, alcotest, lwt ? null, async ? null, async_ssl ? null}: @@ -14,7 +14,7 @@ buildOcaml rec { }; buildInputs = [ alcotest ]; - propagatedBuildInputs = [ cmdliner re uri fieldslib sexplib sexplib + propagatedBuildInputs = [ cmdliner re uri fieldslib_p4 sexplib sexplib conduit stringext base64 magic-mime ounit async async_ssl lwt ]; diff --git a/pkgs/development/ocaml-modules/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix index 8110711a9345..e52b41526acd 100644 --- a/pkgs/development/ocaml-modules/core/default.nix +++ b/pkgs/development/ocaml-modules/core/default.nix @@ -1,6 +1,6 @@ {stdenv, buildOcaml, fetchurl, type_conv, core_kernel, bin_prot, comparelib, custom_printf, enumerate, - fieldslib, herelib, pa_bench, pa_test, pa_ounit, + fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit, pipebang, sexplib, typerep_p4, variantslib}: buildOcaml rec { @@ -18,7 +18,7 @@ buildOcaml rec { buildInputs = [ pa_bench pa_test pa_ounit ]; propagatedBuildInputs = [ type_conv core_kernel bin_prot comparelib - custom_printf enumerate fieldslib herelib + custom_printf enumerate fieldslib_p4 herelib pipebang sexplib typerep_p4 variantslib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix index f311aae3d304..e263d8d2c1b5 100644 --- a/pkgs/development/ocaml-modules/core_extended/default.nix +++ b/pkgs/development/ocaml-modules/core_extended/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, bin_prot, comparelib, core, custom_printf, - fieldslib, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib}: + fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib}: buildOcaml rec { name = "core_extended"; @@ -14,7 +14,7 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_bench pa_test pa_ounit ]; - propagatedBuildInputs = [bin_prot comparelib core custom_printf fieldslib + propagatedBuildInputs = [bin_prot comparelib core custom_printf fieldslib_p4 pipebang textutils re2 sexplib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/core_kernel/default.nix b/pkgs/development/ocaml-modules/core_kernel/default.nix index 9be55061b006..9be9f578026c 100644 --- a/pkgs/development/ocaml-modules/core_kernel/default.nix +++ b/pkgs/development/ocaml-modules/core_kernel/default.nix @@ -1,6 +1,6 @@ {stdenv, buildOcaml, fetchurl, type_conv, bin_prot, comparelib, custom_printf, enumerate, - fieldslib, herelib, pa_bench, pa_test, pa_ounit, + fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit, pipebang, sexplib, typerep_p4, variantslib}: buildOcaml rec { @@ -18,7 +18,7 @@ buildOcaml rec { buildInputs = [ pa_test pa_ounit ]; propagatedBuildInputs = [ type_conv pa_bench bin_prot comparelib custom_printf - enumerate fieldslib herelib pipebang sexplib + enumerate fieldslib_p4 herelib pipebang sexplib typerep_p4 variantslib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix new file mode 100644 index 000000000000..8823a0c8054d --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix @@ -0,0 +1,19 @@ +{ stdenv, type_conv, buildOcamlJane }: + +buildOcamlJane rec { + name = "fieldslib"; + version = "113.33.03"; + + minimumSupportedOcamlVersion = "4.02"; + + hash = "0mkbix32f8sq32q81hb10z2q31bw5f431jxv0jafbdrif0vr6xqd"; + + propagatedBuildInputs = [ type_conv ]; + + meta = with stdenv.lib; { + homepage = https://ocaml.janestreet.com/; + description = "OCaml syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bb001767705..87ebf949bd36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5202,7 +5202,7 @@ in faillib = callPackage ../development/ocaml-modules/faillib { }; - fieldslib = callPackage ../development/ocaml-modules/fieldslib { }; + fieldslib_p4 = callPackage ../development/ocaml-modules/fieldslib { }; fileutils = callPackage ../development/ocaml-modules/fileutils { }; @@ -5558,7 +5558,11 @@ in ppx_jane = callPackage ../development/ocaml-modules/janestreet/ppx-jane.nix {}; + + # Core sublibs typerep = callPackage ../development/ocaml-modules/janestreet/typerep.nix {}; + + fieldslib = callPackage ../development/ocaml-modules/janestreet/fieldslib.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From fc4b5786cd185ca255ac41d27dc4bcf292ba6aa7 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 20:21:56 -0400 Subject: sexplib: 112.24.01 -> 112.24.01/113.33.03 PPX/P4 split --- pkgs/development/ocaml-modules/async_extra/default.nix | 4 ++-- pkgs/development/ocaml-modules/async_find/default.nix | 4 ++-- .../development/ocaml-modules/async_kernel/default.nix | 4 ++-- pkgs/development/ocaml-modules/async_ssl/default.nix | 4 ++-- pkgs/development/ocaml-modules/async_unix/default.nix | 4 ++-- pkgs/development/ocaml-modules/cohttp/default.nix | 4 ++-- pkgs/development/ocaml-modules/conduit/default.nix | 4 ++-- pkgs/development/ocaml-modules/core/default.nix | 4 ++-- .../ocaml-modules/core_extended/default.nix | 4 ++-- pkgs/development/ocaml-modules/core_kernel/default.nix | 4 ++-- pkgs/development/ocaml-modules/cstruct/default.nix | 4 ++-- .../ocaml-modules/custom_printf/default.nix | 4 ++-- pkgs/development/ocaml-modules/ezjsonm/default.nix | 4 ++-- pkgs/development/ocaml-modules/ipaddr/default.nix | 4 ++-- pkgs/development/ocaml-modules/janestreet/sexplib.nix | 18 ++++++++++++++++++ pkgs/development/ocaml-modules/pa_test/default.nix | 4 ++-- pkgs/development/ocaml-modules/re2/default.nix | 4 ++-- pkgs/development/ocaml-modules/textutils/default.nix | 4 ++-- pkgs/development/ocaml-modules/uri/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 20 files changed, 57 insertions(+), 37 deletions(-) create mode 100644 pkgs/development/ocaml-modules/janestreet/sexplib.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/async_extra/default.nix b/pkgs/development/ocaml-modules/async_extra/default.nix index 8689c0291c3f..960504f2a51a 100644 --- a/pkgs/development/ocaml-modules/async_extra/default.nix +++ b/pkgs/development/ocaml-modules/async_extra/default.nix @@ -1,6 +1,6 @@ {stdenv, buildOcaml, fetchurl, async_kernel, async_unix, bin_prot, core, custom_printf, fieldslib_p4, herelib, pa_ounit, - pipebang, pa_test, sexplib}: + pipebang, pa_test, sexplib_p4}: buildOcaml rec { name = "async_extra"; @@ -15,7 +15,7 @@ buildOcaml rec { buildInputs = [ pa_test pa_ounit ]; propagatedBuildInputs = [ async_kernel async_unix core bin_prot custom_printf - fieldslib_p4 herelib pipebang sexplib ]; + fieldslib_p4 herelib pipebang sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_extra; diff --git a/pkgs/development/ocaml-modules/async_find/default.nix b/pkgs/development/ocaml-modules/async_find/default.nix index ae10e931ce25..ed07a03753e7 100644 --- a/pkgs/development/ocaml-modules/async_find/default.nix +++ b/pkgs/development/ocaml-modules/async_find/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, async, core, sexplib}: +{stdenv, buildOcaml, fetchurl, async, core, sexplib_p4}: buildOcaml rec { name = "async_find"; @@ -11,7 +11,7 @@ buildOcaml rec { sha256 = "4e3fda72f50174f05d96a5a09323f236c041b1a685890c155822956f3deb8803"; }; - propagatedBuildInputs = [ async core sexplib ]; + propagatedBuildInputs = [ async core sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_find; diff --git a/pkgs/development/ocaml-modules/async_kernel/default.nix b/pkgs/development/ocaml-modules/async_kernel/default.nix index f850e4612960..4bd698b59d98 100644 --- a/pkgs/development/ocaml-modules/async_kernel/default.nix +++ b/pkgs/development/ocaml-modules/async_kernel/default.nix @@ -1,6 +1,6 @@ {stdenv, buildOcaml, fetchurl, core_kernel, bin_prot, fieldslib_p4, pa_ounit, pa_test, - sexplib, herelib}: + sexplib_p4, herelib}: buildOcaml rec { name = "async_kernel"; @@ -14,7 +14,7 @@ buildOcaml rec { }; buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ core_kernel bin_prot fieldslib_p4 herelib sexplib ]; + propagatedBuildInputs = [ core_kernel bin_prot fieldslib_p4 herelib sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_kernel; diff --git a/pkgs/development/ocaml-modules/async_ssl/default.nix b/pkgs/development/ocaml-modules/async_ssl/default.nix index cc4f5ba32c9f..52148c9d707d 100644 --- a/pkgs/development/ocaml-modules/async_ssl/default.nix +++ b/pkgs/development/ocaml-modules/async_ssl/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, async, comparelib, core, ctypes, openssl, - fieldslib_p4, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib}: + fieldslib_p4, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib_p4}: buildOcaml rec { name = "async_ssl"; @@ -14,7 +14,7 @@ buildOcaml rec { buildInputs = [ pa_bench pa_test ]; propagatedBuildInputs = [ ctypes async comparelib core fieldslib_p4 pa_ounit - herelib pipebang sexplib openssl ]; + herelib pipebang sexplib_p4 openssl ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_ssl; diff --git a/pkgs/development/ocaml-modules/async_unix/default.nix b/pkgs/development/ocaml-modules/async_unix/default.nix index 11965f3f35ff..e796870e54c8 100644 --- a/pkgs/development/ocaml-modules/async_unix/default.nix +++ b/pkgs/development/ocaml-modules/async_unix/default.nix @@ -1,6 +1,6 @@ {stdenv, buildOcaml, fetchurl, async_kernel, bin_prot, comparelib, core, fieldslib_p4, herelib, pa_ounit, - pipebang, pa_test, sexplib}: + pipebang, pa_test, sexplib_p4}: buildOcaml rec { name = "async_unix"; @@ -16,7 +16,7 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_ounit ]; propagatedBuildInputs = [ async_kernel core bin_prot comparelib - fieldslib_p4 herelib pipebang pa_test sexplib ]; + fieldslib_p4 herelib pipebang pa_test sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_unix; diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 0fa44a2cd7fb..dcf3c8c13d79 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, cmdliner, re, uri, fieldslib_p4, sexplib, conduit, +{stdenv, buildOcaml, fetchurl, cmdliner, re, uri, fieldslib_p4, sexplib_p4, conduit, stringext, base64, magic-mime, ounit, alcotest, lwt ? null, async ? null, async_ssl ? null}: @@ -14,7 +14,7 @@ buildOcaml rec { }; buildInputs = [ alcotest ]; - propagatedBuildInputs = [ cmdliner re uri fieldslib_p4 sexplib sexplib + propagatedBuildInputs = [ cmdliner re uri fieldslib_p4 sexplib_p4 sexplib_p4 conduit stringext base64 magic-mime ounit async async_ssl lwt ]; diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index dbb83f4c8cf0..26accd99db67 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, sexplib, stringext, uri, cstruct, ipaddr, +{stdenv, buildOcaml, fetchurl, sexplib_p4, stringext, uri, cstruct, ipaddr, async ? null, async_ssl ? null, lwt ? null}: buildOcaml rec { @@ -10,7 +10,7 @@ buildOcaml rec { sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1"; }; - propagatedBuildInputs = ([ sexplib stringext uri cstruct ipaddr ] + propagatedBuildInputs = ([ sexplib_p4 stringext uri cstruct ipaddr ] ++ stdenv.lib.optional (lwt != null) lwt ++ stdenv.lib.optional (async != null) async ++ stdenv.lib.optional (async_ssl != null) async_ssl); diff --git a/pkgs/development/ocaml-modules/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix index e52b41526acd..90b62985d110 100644 --- a/pkgs/development/ocaml-modules/core/default.nix +++ b/pkgs/development/ocaml-modules/core/default.nix @@ -1,7 +1,7 @@ {stdenv, buildOcaml, fetchurl, type_conv, core_kernel, bin_prot, comparelib, custom_printf, enumerate, fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit, - pipebang, sexplib, typerep_p4, variantslib}: + pipebang, sexplib_p4, typerep_p4, variantslib}: buildOcaml rec { name = "core"; @@ -19,7 +19,7 @@ buildOcaml rec { buildInputs = [ pa_bench pa_test pa_ounit ]; propagatedBuildInputs = [ type_conv core_kernel bin_prot comparelib custom_printf enumerate fieldslib_p4 herelib - pipebang sexplib typerep_p4 variantslib ]; + pipebang sexplib_p4 typerep_p4 variantslib ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/core; diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix index e263d8d2c1b5..555c59246615 100644 --- a/pkgs/development/ocaml-modules/core_extended/default.nix +++ b/pkgs/development/ocaml-modules/core_extended/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, bin_prot, comparelib, core, custom_printf, - fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib}: + fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib_p4}: buildOcaml rec { name = "core_extended"; @@ -15,7 +15,7 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_bench pa_test pa_ounit ]; propagatedBuildInputs = [bin_prot comparelib core custom_printf fieldslib_p4 - pipebang textutils re2 sexplib ]; + pipebang textutils re2 sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/core_extended; diff --git a/pkgs/development/ocaml-modules/core_kernel/default.nix b/pkgs/development/ocaml-modules/core_kernel/default.nix index 9be9f578026c..5e36a97aeb6b 100644 --- a/pkgs/development/ocaml-modules/core_kernel/default.nix +++ b/pkgs/development/ocaml-modules/core_kernel/default.nix @@ -1,7 +1,7 @@ {stdenv, buildOcaml, fetchurl, type_conv, bin_prot, comparelib, custom_printf, enumerate, fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit, - pipebang, sexplib, typerep_p4, variantslib}: + pipebang, sexplib_p4, typerep_p4, variantslib}: buildOcaml rec { name = "core_kernel"; @@ -18,7 +18,7 @@ buildOcaml rec { buildInputs = [ pa_test pa_ounit ]; propagatedBuildInputs = [ type_conv pa_bench bin_prot comparelib custom_printf - enumerate fieldslib_p4 herelib pipebang sexplib + enumerate fieldslib_p4 herelib pipebang sexplib_p4 typerep_p4 variantslib ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 57a057e0eaa9..68b202f9ade6 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,4 +1,4 @@ -{stdenv, writeText, fetchurl, ocaml, ocplib-endian, sexplib, findlib, +{stdenv, writeText, fetchurl, ocaml, ocplib-endian, sexplib_p4, findlib, async ? null, lwt ? null, camlp4}: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { configureFlags = stdenv.lib.strings.concatStringsSep " " ((if lwt != null then ["--enable-lwt"] else []) ++ (if async != null then ["--enable-async"] else [])); buildInputs = [ocaml findlib camlp4]; - propagatedBuildInputs = [ocplib-endian sexplib lwt async]; + propagatedBuildInputs = [ocplib-endian sexplib_p4 lwt async]; createFindlibDestdir = true; dontStrip = true; diff --git a/pkgs/development/ocaml-modules/custom_printf/default.nix b/pkgs/development/ocaml-modules/custom_printf/default.nix index 05a8ecfe616b..16c31fc3861a 100644 --- a/pkgs/development/ocaml-modules/custom_printf/default.nix +++ b/pkgs/development/ocaml-modules/custom_printf/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, type_conv, sexplib, pa_ounit}: +{stdenv, buildOcaml, fetchurl, type_conv, sexplib_p4, pa_ounit}: buildOcaml rec { name = "custom_printf"; @@ -12,7 +12,7 @@ buildOcaml rec { }; buildInputs = [ pa_ounit ]; - propagatedBuildInputs = [ type_conv sexplib ]; + propagatedBuildInputs = [ type_conv sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/custom_printf; diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix index fd8ce1c33898..4d63b0c3f95f 100644 --- a/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib, lwt }: +{ stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib_p4, lwt }: let version = "0.4.1"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ jsonm hex sexplib lwt ]; + propagatedBuildInputs = [ jsonm hex sexplib_p4 lwt ]; createFindlibDestdir = true; configureFlags = "--enable-lwt"; diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index 749b6a1d94e3..cdc273d6ecfd 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, sexplib}: +{stdenv, buildOcaml, fetchurl, sexplib_p4}: buildOcaml rec { name = "ipaddr"; @@ -9,7 +9,7 @@ buildOcaml rec { sha256 = "7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0"; }; - propagatedBuildInputs = [ sexplib ]; + propagatedBuildInputs = [ sexplib_p4 ]; configurePhase = '' ocaml setup.ml -configure --prefix $out diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib.nix b/pkgs/development/ocaml-modules/janestreet/sexplib.nix new file mode 100644 index 000000000000..4a785d199c8c --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/sexplib.nix @@ -0,0 +1,18 @@ +{stdenv, buildOcamlJane, type_conv}: + +buildOcamlJane rec { + minimumSupportedOcamlVersion = "4.02"; + name = "sexplib"; + version = "113.33.03"; + + hash = "1klar4qw4s7bj47ig7kxz2m4j1q3c60pfppis4vxrxv15r0kfh22"; + + propagatedBuildInputs = [ type_conv ]; + + meta = with stdenv.lib; { + homepage = https://ocaml.janestreet.com/; + description = "Library for serializing OCaml values to and from S-expressions"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/pa_test/default.nix b/pkgs/development/ocaml-modules/pa_test/default.nix index faf17e20dc1e..5acf931b2eac 100644 --- a/pkgs/development/ocaml-modules/pa_test/default.nix +++ b/pkgs/development/ocaml-modules/pa_test/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit, sexplib, herelib}: +{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit, sexplib_p4, herelib}: buildOcaml rec { name = "pa_test"; @@ -12,7 +12,7 @@ buildOcaml rec { }; buildInputs = [ pa_ounit ]; - propagatedBuildInputs = [ type_conv sexplib herelib ]; + propagatedBuildInputs = [ type_conv sexplib_p4 herelib ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/pa_test; diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/pkgs/development/ocaml-modules/re2/default.nix index e89e28fe1e55..5a1d382afb1a 100644 --- a/pkgs/development/ocaml-modules/re2/default.nix +++ b/pkgs/development/ocaml-modules/re2/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, ocaml, core, pa_ounit, pa_test, - bin_prot, comparelib, sexplib, rsync}: + bin_prot, comparelib, sexplib_p4, rsync}: buildOcaml rec { name = "re2"; @@ -16,7 +16,7 @@ buildOcaml rec { else null; buildInputs = [ pa_ounit pa_test rsync ]; - propagatedBuildInputs = [ core bin_prot comparelib sexplib ]; + propagatedBuildInputs = [ core bin_prot comparelib sexplib_p4 ]; hasSharedObjects = true; diff --git a/pkgs/development/ocaml-modules/textutils/default.nix b/pkgs/development/ocaml-modules/textutils/default.nix index 377b94eff8b8..d3bb995769e9 100644 --- a/pkgs/development/ocaml-modules/textutils/default.nix +++ b/pkgs/development/ocaml-modules/textutils/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, core, pa_ounit, pa_test, sexplib}: +{stdenv, buildOcaml, fetchurl, core, pa_ounit, pa_test, sexplib_p4}: buildOcaml rec { name = "textutils"; @@ -12,7 +12,7 @@ buildOcaml rec { }; buildInputs = [ pa_test ]; - propagatedBuildInputs = [ core pa_ounit sexplib ]; + propagatedBuildInputs = [ core pa_ounit sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/textutils; diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index dca989c88efd..a6335274f737 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, re, sexplib, stringext, ounit }: +{ stdenv, fetchzip, ocaml, findlib, re, sexplib_p4, stringext, ounit }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; buildInputs = [ ocaml findlib ounit ]; - propagatedBuildInputs = [ re sexplib stringext ]; + propagatedBuildInputs = [ re sexplib_p4 stringext ]; configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; buildPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87ebf949bd36..84479b743184 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5405,7 +5405,7 @@ in sexplib_111_25_00 = callPackage ../development/ocaml-modules/sexplib/111.25.00.nix { }; sexplib_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { }; - sexplib = + sexplib_p4 = if lib.versionOlder "4.02" ocaml_version then sexplib_112_24_01 else if lib.versionOlder "4.00" ocaml_version @@ -5563,6 +5563,8 @@ in typerep = callPackage ../development/ocaml-modules/janestreet/typerep.nix {}; fieldslib = callPackage ../development/ocaml-modules/janestreet/fieldslib.nix {}; + + sexplib = callPackage ../development/ocaml-modules/janestreet/sexplib.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From 7ea027862c88c6706be0bc065a0ddd2fd262d4cd Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 20:35:10 -0400 Subject: variantslib: 109.15.03 -> 109.15.03/113.33.03 PPX/P4 split --- pkgs/development/ocaml-modules/core/default.nix | 4 ++-- .../development/ocaml-modules/core_kernel/default.nix | 4 ++-- .../ocaml-modules/janestreet/variantslib.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 4 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/ocaml-modules/janestreet/variantslib.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix index 90b62985d110..e15a2333880e 100644 --- a/pkgs/development/ocaml-modules/core/default.nix +++ b/pkgs/development/ocaml-modules/core/default.nix @@ -1,7 +1,7 @@ {stdenv, buildOcaml, fetchurl, type_conv, core_kernel, bin_prot, comparelib, custom_printf, enumerate, fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit, - pipebang, sexplib_p4, typerep_p4, variantslib}: + pipebang, sexplib_p4, typerep_p4, variantslib_p4}: buildOcaml rec { name = "core"; @@ -19,7 +19,7 @@ buildOcaml rec { buildInputs = [ pa_bench pa_test pa_ounit ]; propagatedBuildInputs = [ type_conv core_kernel bin_prot comparelib custom_printf enumerate fieldslib_p4 herelib - pipebang sexplib_p4 typerep_p4 variantslib ]; + pipebang sexplib_p4 typerep_p4 variantslib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/core; diff --git a/pkgs/development/ocaml-modules/core_kernel/default.nix b/pkgs/development/ocaml-modules/core_kernel/default.nix index 5e36a97aeb6b..75b399b52bd0 100644 --- a/pkgs/development/ocaml-modules/core_kernel/default.nix +++ b/pkgs/development/ocaml-modules/core_kernel/default.nix @@ -1,7 +1,7 @@ {stdenv, buildOcaml, fetchurl, type_conv, bin_prot, comparelib, custom_printf, enumerate, fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit, - pipebang, sexplib_p4, typerep_p4, variantslib}: + pipebang, sexplib_p4, typerep_p4, variantslib_p4}: buildOcaml rec { name = "core_kernel"; @@ -19,7 +19,7 @@ buildOcaml rec { buildInputs = [ pa_test pa_ounit ]; propagatedBuildInputs = [ type_conv pa_bench bin_prot comparelib custom_printf enumerate fieldslib_p4 herelib pipebang sexplib_p4 - typerep_p4 variantslib ]; + typerep_p4 variantslib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/core_kernel; diff --git a/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/pkgs/development/ocaml-modules/janestreet/variantslib.nix new file mode 100644 index 000000000000..d9acadbb6158 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/variantslib.nix @@ -0,0 +1,19 @@ +{stdenv, buildOcamlJane, type_conv}: + +buildOcamlJane rec { + name = "variantslib"; + version = "113.33.03"; + + minimumSupportedOcamlVersion = "4.00"; + + hash = "1hv0f75msrryxsl6wfnbmhc0n8kf7qxs5f82ry3b8ldb44s3wigp"; + + propagatedBuildInputs = [ type_conv ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/variantslib; + description = "OCaml variants as first class values"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84479b743184..3b67f63df699 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5487,7 +5487,7 @@ in uuseg = callPackage ../development/ocaml-modules/uuseg { }; uutf = callPackage ../development/ocaml-modules/uutf { }; - variantslib = callPackage ../development/ocaml-modules/variantslib { }; + variantslib_p4 = callPackage ../development/ocaml-modules/variantslib { }; vg = callPackage ../development/ocaml-modules/vg { }; @@ -5565,6 +5565,8 @@ in fieldslib = callPackage ../development/ocaml-modules/janestreet/fieldslib.nix {}; sexplib = callPackage ../development/ocaml-modules/janestreet/sexplib.nix {}; + + variantslib = callPackage ../development/ocaml-modules/janestreet/variantslib.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From 5ce22cb05e4db1674e8a00e65beaa9ea1069e3fe Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 20:42:40 -0400 Subject: bin_prot: 112.24.00 -> 112.24.00/113.33.03 PPX/P4 split --- pkgs/development/ocaml-modules/async_extra/default.nix | 4 ++-- pkgs/development/ocaml-modules/async_kernel/default.nix | 4 ++-- pkgs/development/ocaml-modules/async_unix/default.nix | 4 ++-- pkgs/development/ocaml-modules/core/default.nix | 4 ++-- .../development/ocaml-modules/core_extended/default.nix | 4 ++-- pkgs/development/ocaml-modules/core_kernel/default.nix | 4 ++-- pkgs/development/ocaml-modules/janestreet/bin_prot.nix | 17 +++++++++++++++++ pkgs/development/ocaml-modules/re2/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 9 files changed, 34 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/ocaml-modules/janestreet/bin_prot.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/async_extra/default.nix b/pkgs/development/ocaml-modules/async_extra/default.nix index 960504f2a51a..af9407cd9c14 100644 --- a/pkgs/development/ocaml-modules/async_extra/default.nix +++ b/pkgs/development/ocaml-modules/async_extra/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, async_kernel, async_unix, - bin_prot, core, custom_printf, fieldslib_p4, herelib, pa_ounit, + bin_prot_p4, core, custom_printf, fieldslib_p4, herelib, pa_ounit, pipebang, pa_test, sexplib_p4}: buildOcaml rec { @@ -14,7 +14,7 @@ buildOcaml rec { }; buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ async_kernel async_unix core bin_prot custom_printf + propagatedBuildInputs = [ async_kernel async_unix core bin_prot_p4 custom_printf fieldslib_p4 herelib pipebang sexplib_p4 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/async_kernel/default.nix b/pkgs/development/ocaml-modules/async_kernel/default.nix index 4bd698b59d98..98089c837b67 100644 --- a/pkgs/development/ocaml-modules/async_kernel/default.nix +++ b/pkgs/development/ocaml-modules/async_kernel/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, core_kernel, - bin_prot, fieldslib_p4, pa_ounit, pa_test, + bin_prot_p4, fieldslib_p4, pa_ounit, pa_test, sexplib_p4, herelib}: buildOcaml rec { @@ -14,7 +14,7 @@ buildOcaml rec { }; buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ core_kernel bin_prot fieldslib_p4 herelib sexplib_p4 ]; + propagatedBuildInputs = [ core_kernel bin_prot_p4 fieldslib_p4 herelib sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_kernel; diff --git a/pkgs/development/ocaml-modules/async_unix/default.nix b/pkgs/development/ocaml-modules/async_unix/default.nix index e796870e54c8..c3c18d560dd8 100644 --- a/pkgs/development/ocaml-modules/async_unix/default.nix +++ b/pkgs/development/ocaml-modules/async_unix/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, async_kernel, - bin_prot, comparelib, core, fieldslib_p4, herelib, pa_ounit, + bin_prot_p4, comparelib, core, fieldslib_p4, herelib, pa_ounit, pipebang, pa_test, sexplib_p4}: buildOcaml rec { @@ -15,7 +15,7 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_ounit ]; - propagatedBuildInputs = [ async_kernel core bin_prot comparelib + propagatedBuildInputs = [ async_kernel core bin_prot_p4 comparelib fieldslib_p4 herelib pipebang pa_test sexplib_p4 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix index e15a2333880e..dc50ae24894d 100644 --- a/pkgs/development/ocaml-modules/core/default.nix +++ b/pkgs/development/ocaml-modules/core/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, type_conv, - core_kernel, bin_prot, comparelib, custom_printf, enumerate, + core_kernel, bin_prot_p4, comparelib, custom_printf, enumerate, fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit, pipebang, sexplib_p4, typerep_p4, variantslib_p4}: @@ -17,7 +17,7 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_bench pa_test pa_ounit ]; - propagatedBuildInputs = [ type_conv core_kernel bin_prot comparelib + propagatedBuildInputs = [ type_conv core_kernel bin_prot_p4 comparelib custom_printf enumerate fieldslib_p4 herelib pipebang sexplib_p4 typerep_p4 variantslib_p4 ]; diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix index 555c59246615..78ac00f81831 100644 --- a/pkgs/development/ocaml-modules/core_extended/default.nix +++ b/pkgs/development/ocaml-modules/core_extended/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, bin_prot, comparelib, core, custom_printf, +{stdenv, buildOcaml, fetchurl, bin_prot_p4, comparelib, core, custom_printf, fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib_p4}: buildOcaml rec { @@ -14,7 +14,7 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_bench pa_test pa_ounit ]; - propagatedBuildInputs = [bin_prot comparelib core custom_printf fieldslib_p4 + propagatedBuildInputs = [bin_prot_p4 comparelib core custom_printf fieldslib_p4 pipebang textutils re2 sexplib_p4 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/core_kernel/default.nix b/pkgs/development/ocaml-modules/core_kernel/default.nix index 75b399b52bd0..75b248a6a5e6 100644 --- a/pkgs/development/ocaml-modules/core_kernel/default.nix +++ b/pkgs/development/ocaml-modules/core_kernel/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, type_conv, - bin_prot, comparelib, custom_printf, enumerate, + bin_prot_p4, comparelib, custom_printf, enumerate, fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit, pipebang, sexplib_p4, typerep_p4, variantslib_p4}: @@ -17,7 +17,7 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ type_conv pa_bench bin_prot comparelib custom_printf + propagatedBuildInputs = [ type_conv pa_bench bin_prot_p4 comparelib custom_printf enumerate fieldslib_p4 herelib pipebang sexplib_p4 typerep_p4 variantslib_p4 ]; diff --git a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix new file mode 100644 index 000000000000..11e6189e6c1e --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix @@ -0,0 +1,17 @@ +{stdenv, buildOcamlJane, type_conv}: + +buildOcamlJane rec { + name = "bin_prot"; + version = "113.33.03"; + minimumSupportedOcamlVersion = "4.02"; + hash = "0jlarpfby755j0kikz6vnl1l6q0ga09b9zrlw6i84r22zchnqdsh"; + + propagatedBuildInputs = [ type_conv ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/bin_prot; + description = "Binary protocol generator "; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/pkgs/development/ocaml-modules/re2/default.nix index 5a1d382afb1a..d802d3fd44c7 100644 --- a/pkgs/development/ocaml-modules/re2/default.nix +++ b/pkgs/development/ocaml-modules/re2/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, ocaml, core, pa_ounit, pa_test, - bin_prot, comparelib, sexplib_p4, rsync}: + bin_prot_p4, comparelib, sexplib_p4, rsync}: buildOcaml rec { name = "re2"; @@ -16,7 +16,7 @@ buildOcaml rec { else null; buildInputs = [ pa_ounit pa_test rsync ]; - propagatedBuildInputs = [ core bin_prot comparelib sexplib_p4 ]; + propagatedBuildInputs = [ core bin_prot_p4 comparelib sexplib_p4 ]; hasSharedObjects = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b67f63df699..d50da6cbfd87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5146,7 +5146,7 @@ in biniou = callPackage ../development/ocaml-modules/biniou { }; - bin_prot = callPackage ../development/ocaml-modules/bin_prot { }; + bin_prot_p4 = callPackage ../development/ocaml-modules/bin_prot { }; ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; @@ -5567,6 +5567,8 @@ in sexplib = callPackage ../development/ocaml-modules/janestreet/sexplib.nix {}; variantslib = callPackage ../development/ocaml-modules/janestreet/variantslib.nix {}; + + bin_prot = callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From a6f8b1f9ff0b22e7cfe1d0eaf31b172b9fca36e8 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 20:47:31 -0400 Subject: core_kernel: 112.24.00 -> 112.24.00/113.33.03 PPX/P4 split --- .../ocaml-modules/async_kernel/default.nix | 4 ++-- pkgs/development/ocaml-modules/core/default.nix | 4 ++-- .../ocaml-modules/janestreet/core_kernel.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 4 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/ocaml-modules/janestreet/core_kernel.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/async_kernel/default.nix b/pkgs/development/ocaml-modules/async_kernel/default.nix index 98089c837b67..43fde1631ac7 100644 --- a/pkgs/development/ocaml-modules/async_kernel/default.nix +++ b/pkgs/development/ocaml-modules/async_kernel/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, core_kernel, +{stdenv, buildOcaml, fetchurl, core_kernel_p4, bin_prot_p4, fieldslib_p4, pa_ounit, pa_test, sexplib_p4, herelib}: @@ -14,7 +14,7 @@ buildOcaml rec { }; buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ core_kernel bin_prot_p4 fieldslib_p4 herelib sexplib_p4 ]; + propagatedBuildInputs = [ core_kernel_p4 bin_prot_p4 fieldslib_p4 herelib sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_kernel; diff --git a/pkgs/development/ocaml-modules/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix index dc50ae24894d..4da4d16df7dd 100644 --- a/pkgs/development/ocaml-modules/core/default.nix +++ b/pkgs/development/ocaml-modules/core/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, type_conv, - core_kernel, bin_prot_p4, comparelib, custom_printf, enumerate, + core_kernel_p4, bin_prot_p4, comparelib, custom_printf, enumerate, fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit, pipebang, sexplib_p4, typerep_p4, variantslib_p4}: @@ -17,7 +17,7 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_bench pa_test pa_ounit ]; - propagatedBuildInputs = [ type_conv core_kernel bin_prot_p4 comparelib + propagatedBuildInputs = [ type_conv core_kernel_p4 bin_prot_p4 comparelib custom_printf enumerate fieldslib_p4 herelib pipebang sexplib_p4 typerep_p4 variantslib_p4 ]; diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix new file mode 100644 index 000000000000..93fcdde5bb38 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix @@ -0,0 +1,19 @@ +{stdenv, buildOcamlJane, fetchurl, + bin_prot, fieldslib, sexplib, typerep, variantslib, + ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, + ocaml_oasis, opam, js_build_tools}: + +buildOcamlJane rec { + name = "core_kernel"; + hash = "13gamj056nlib04l7yh80lqpdx0pnswzlb52fkqa01awwp5nf3z6"; + propagatedBuildInputs = + [ bin_prot fieldslib sexplib typerep variantslib + ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/core_kernel; + description = "Jane Street Capital's standard library overlay (kernel)"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d50da6cbfd87..86b302ca6794 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5303,7 +5303,7 @@ in core_extended = callPackage ../development/ocaml-modules/core_extended { }; - core_kernel = callPackage ../development/ocaml-modules/core_kernel { }; + core_kernel_p4 = callPackage ../development/ocaml-modules/core_kernel { }; core = callPackage ../development/ocaml-modules/core { }; @@ -5569,6 +5569,8 @@ in variantslib = callPackage ../development/ocaml-modules/janestreet/variantslib.nix {}; bin_prot = callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {}; + + core_kernel = callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From 0561329ae514a4bd4ed06cf787c28817ace3e892 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 20:59:22 -0400 Subject: core: 112.24.01 -> 112.24.01/113.33.03 PPX/P4 split --- .../ocaml-modules/async_extra/default.nix | 4 ++-- .../development/ocaml-modules/async_find/default.nix | 4 ++-- .../ocaml-modules/async_shell/default.nix | 4 ++-- pkgs/development/ocaml-modules/async_ssl/default.nix | 4 ++-- .../development/ocaml-modules/async_unix/default.nix | 4 ++-- .../ocaml-modules/core_extended/default.nix | 4 ++-- pkgs/development/ocaml-modules/janestreet/core.nix | 20 ++++++++++++++++++++ pkgs/development/ocaml-modules/re2/default.nix | 4 ++-- pkgs/development/ocaml-modules/textutils/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 10 files changed, 39 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/ocaml-modules/janestreet/core.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/async_extra/default.nix b/pkgs/development/ocaml-modules/async_extra/default.nix index af9407cd9c14..2a6c74f93a78 100644 --- a/pkgs/development/ocaml-modules/async_extra/default.nix +++ b/pkgs/development/ocaml-modules/async_extra/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, async_kernel, async_unix, - bin_prot_p4, core, custom_printf, fieldslib_p4, herelib, pa_ounit, + bin_prot_p4, core_p4, custom_printf, fieldslib_p4, herelib, pa_ounit, pipebang, pa_test, sexplib_p4}: buildOcaml rec { @@ -14,7 +14,7 @@ buildOcaml rec { }; buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ async_kernel async_unix core bin_prot_p4 custom_printf + propagatedBuildInputs = [ async_kernel async_unix core_p4 bin_prot_p4 custom_printf fieldslib_p4 herelib pipebang sexplib_p4 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/async_find/default.nix b/pkgs/development/ocaml-modules/async_find/default.nix index ed07a03753e7..82b9f83317a0 100644 --- a/pkgs/development/ocaml-modules/async_find/default.nix +++ b/pkgs/development/ocaml-modules/async_find/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, async, core, sexplib_p4}: +{stdenv, buildOcaml, fetchurl, async, core_p4, sexplib_p4}: buildOcaml rec { name = "async_find"; @@ -11,7 +11,7 @@ buildOcaml rec { sha256 = "4e3fda72f50174f05d96a5a09323f236c041b1a685890c155822956f3deb8803"; }; - propagatedBuildInputs = [ async core sexplib_p4 ]; + propagatedBuildInputs = [ async core_p4 sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_find; diff --git a/pkgs/development/ocaml-modules/async_shell/default.nix b/pkgs/development/ocaml-modules/async_shell/default.nix index 75755833a5f5..b8ca9097a48e 100644 --- a/pkgs/development/ocaml-modules/async_shell/default.nix +++ b/pkgs/development/ocaml-modules/async_shell/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, async, core, core_extended}: +{stdenv, buildOcaml, fetchurl, async, core_p4, core_extended}: buildOcaml rec { name = "async_shell"; @@ -11,7 +11,7 @@ buildOcaml rec { sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105"; }; - propagatedBuildInputs = [ async core core_extended ]; + propagatedBuildInputs = [ async core_p4 core_extended ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_shell; diff --git a/pkgs/development/ocaml-modules/async_ssl/default.nix b/pkgs/development/ocaml-modules/async_ssl/default.nix index 52148c9d707d..8e0286e725da 100644 --- a/pkgs/development/ocaml-modules/async_ssl/default.nix +++ b/pkgs/development/ocaml-modules/async_ssl/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, async, comparelib, core, ctypes, openssl, +{stdenv, buildOcaml, fetchurl, async, comparelib, core_p4, ctypes, openssl, fieldslib_p4, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib_p4}: buildOcaml rec { @@ -13,7 +13,7 @@ buildOcaml rec { }; buildInputs = [ pa_bench pa_test ]; - propagatedBuildInputs = [ ctypes async comparelib core fieldslib_p4 pa_ounit + propagatedBuildInputs = [ ctypes async comparelib core_p4 fieldslib_p4 pa_ounit herelib pipebang sexplib_p4 openssl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/async_unix/default.nix b/pkgs/development/ocaml-modules/async_unix/default.nix index c3c18d560dd8..545f7efd85a7 100644 --- a/pkgs/development/ocaml-modules/async_unix/default.nix +++ b/pkgs/development/ocaml-modules/async_unix/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, async_kernel, - bin_prot_p4, comparelib, core, fieldslib_p4, herelib, pa_ounit, + bin_prot_p4, comparelib, core_p4, fieldslib_p4, herelib, pa_ounit, pipebang, pa_test, sexplib_p4}: buildOcaml rec { @@ -15,7 +15,7 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_ounit ]; - propagatedBuildInputs = [ async_kernel core bin_prot_p4 comparelib + propagatedBuildInputs = [ async_kernel core_p4 bin_prot_p4 comparelib fieldslib_p4 herelib pipebang pa_test sexplib_p4 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix index 78ac00f81831..e53c46894482 100644 --- a/pkgs/development/ocaml-modules/core_extended/default.nix +++ b/pkgs/development/ocaml-modules/core_extended/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, bin_prot_p4, comparelib, core, custom_printf, +{stdenv, buildOcaml, fetchurl, bin_prot_p4, comparelib, core_p4, custom_printf, fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib_p4}: buildOcaml rec { @@ -14,7 +14,7 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_bench pa_test pa_ounit ]; - propagatedBuildInputs = [bin_prot_p4 comparelib core custom_printf fieldslib_p4 + propagatedBuildInputs = [bin_prot_p4 comparelib core_p4 custom_printf fieldslib_p4 pipebang textutils re2 sexplib_p4 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/janestreet/core.nix b/pkgs/development/ocaml-modules/janestreet/core.nix new file mode 100644 index 000000000000..05ea4d5d566b --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/core.nix @@ -0,0 +1,20 @@ +{stdenv, buildOcamlJane, fetchurl, + core_kernel, + bin_prot, fieldslib, sexplib, typerep, variantslib, + ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, + ocaml_oasis, opam, js_build_tools}: + +buildOcamlJane rec { + name = "core"; + hash = "0nz6d5glgymbpchvcpw77yis9jgi2bll32knzy9vx99wn83zdrmd"; + propagatedBuildInputs = + [ core_kernel bin_prot fieldslib sexplib typerep variantslib + ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/core; + description = "Jane Street Capital's standard library overlay"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/pkgs/development/ocaml-modules/re2/default.nix index d802d3fd44c7..9b26c4040959 100644 --- a/pkgs/development/ocaml-modules/re2/default.nix +++ b/pkgs/development/ocaml-modules/re2/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, ocaml, core, pa_ounit, pa_test, +{stdenv, buildOcaml, fetchurl, ocaml, core_p4, pa_ounit, pa_test, bin_prot_p4, comparelib, sexplib_p4, rsync}: buildOcaml rec { @@ -16,7 +16,7 @@ buildOcaml rec { else null; buildInputs = [ pa_ounit pa_test rsync ]; - propagatedBuildInputs = [ core bin_prot_p4 comparelib sexplib_p4 ]; + propagatedBuildInputs = [ core_p4 bin_prot_p4 comparelib sexplib_p4 ]; hasSharedObjects = true; diff --git a/pkgs/development/ocaml-modules/textutils/default.nix b/pkgs/development/ocaml-modules/textutils/default.nix index d3bb995769e9..6f35b9702280 100644 --- a/pkgs/development/ocaml-modules/textutils/default.nix +++ b/pkgs/development/ocaml-modules/textutils/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, core, pa_ounit, pa_test, sexplib_p4}: +{stdenv, buildOcaml, fetchurl, core_p4, pa_ounit, pa_test, sexplib_p4}: buildOcaml rec { name = "textutils"; @@ -12,7 +12,7 @@ buildOcaml rec { }; buildInputs = [ pa_test ]; - propagatedBuildInputs = [ core pa_ounit sexplib_p4 ]; + propagatedBuildInputs = [ core_p4 pa_ounit sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/textutils; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86b302ca6794..93ccbe122387 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5305,7 +5305,7 @@ in core_kernel_p4 = callPackage ../development/ocaml-modules/core_kernel { }; - core = callPackage ../development/ocaml-modules/core { }; + core_p4 = callPackage ../development/ocaml-modules/core { }; ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { }; @@ -5571,6 +5571,8 @@ in bin_prot = callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {}; core_kernel = callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {}; + + core = callPackage ../development/ocaml-modules/janestreet/core.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From 3062264c3acb5aa69f4595bbcb507bc765112320 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 21:37:22 -0400 Subject: ocaml-re2: 112.06.00 -> 112.06.00/113.33.03 PPX/P4 split --- .../ocaml-modules/core_extended/default.nix | 4 ++-- pkgs/development/ocaml-modules/janestreet/re2.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/ocaml-modules/janestreet/re2.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix index e53c46894482..d25cd81bcd8a 100644 --- a/pkgs/development/ocaml-modules/core_extended/default.nix +++ b/pkgs/development/ocaml-modules/core_extended/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, bin_prot_p4, comparelib, core_p4, custom_printf, - fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib_p4}: + fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2_p4, sexplib_p4}: buildOcaml rec { name = "core_extended"; @@ -15,7 +15,7 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_bench pa_test pa_ounit ]; propagatedBuildInputs = [bin_prot_p4 comparelib core_p4 custom_printf fieldslib_p4 - pipebang textutils re2 sexplib_p4 ]; + pipebang textutils re2_p4 sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/core_extended; diff --git a/pkgs/development/ocaml-modules/janestreet/re2.nix b/pkgs/development/ocaml-modules/janestreet/re2.nix new file mode 100644 index 000000000000..6604a8d012c6 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/re2.nix @@ -0,0 +1,20 @@ +{stdenv, buildOcamlJane, + bin_prot, core_kernel, fieldslib, sexplib, typerep, variantslib, + ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, + rsync}: + +buildOcamlJane rec { + name = "re2"; + hash = "0fw5jscb1i17aw8v4l965zw20kyimhfnmf4w83wqaaxkqy3l6fqw"; + buildInputs = [ rsync ]; + propagatedBuildInputs = + [ bin_prot core_kernel fieldslib sexplib typerep variantslib + ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/re2; + description = "OCaml bindings for RE2"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93ccbe122387..9ed93e0f0aba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5369,7 +5369,7 @@ in piqi = callPackage ../development/ocaml-modules/piqi { }; piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; - re2 = callPackage ../development/ocaml-modules/re2 { }; + re2_p4 = callPackage ../development/ocaml-modules/re2 { }; result = callPackage ../development/ocaml-modules/ocaml-result { }; @@ -5573,6 +5573,8 @@ in core_kernel = callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {}; core = callPackage ../development/ocaml-modules/janestreet/core.nix {}; + + re2 = callPackage ../development/ocaml-modules/janestreet/re2.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From eafda42dc6680d879fecc5365399457453fe6f42 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 21:48:15 -0400 Subject: ocaml-textutils: 112.17.00 -> 112.17.00/113.33.03 PPX/P4 split --- .../ocaml-modules/core_extended/default.nix | 4 ++-- .../development/ocaml-modules/janestreet/textutils.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/ocaml-modules/janestreet/textutils.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix index d25cd81bcd8a..fef4fd81158f 100644 --- a/pkgs/development/ocaml-modules/core_extended/default.nix +++ b/pkgs/development/ocaml-modules/core_extended/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, bin_prot_p4, comparelib, core_p4, custom_printf, - fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2_p4, sexplib_p4}: + fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils_p4, re2_p4, sexplib_p4}: buildOcaml rec { name = "core_extended"; @@ -15,7 +15,7 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_bench pa_test pa_ounit ]; propagatedBuildInputs = [bin_prot_p4 comparelib core_p4 custom_printf fieldslib_p4 - pipebang textutils re2_p4 sexplib_p4 ]; + pipebang textutils_p4 re2_p4 sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/core_extended; diff --git a/pkgs/development/ocaml-modules/janestreet/textutils.nix b/pkgs/development/ocaml-modules/janestreet/textutils.nix new file mode 100644 index 000000000000..459743f055ab --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/textutils.nix @@ -0,0 +1,18 @@ +{stdenv, buildOcamlJane, + bin_prot, core, fieldslib, sexplib, typerep, variantslib, + ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: + +buildOcamlJane rec { + name = "textutils"; + hash = "0mkjm9b3k7db7zzrq4403v8qbkgqgkjlz120vcbqh6z7d7ql65vb"; + propagatedBuildInputs = + [ bin_prot core fieldslib sexplib typerep variantslib + ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/textutils; + description = "Text output utilities"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ed93e0f0aba..a506ab9f61be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5387,7 +5387,7 @@ in camlp5 = camlp5_transitional; }; - textutils = callPackage ../development/ocaml-modules/textutils { }; + textutils_p4 = callPackage ../development/ocaml-modules/textutils { }; type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { }; type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { }; @@ -5575,6 +5575,8 @@ in core = callPackage ../development/ocaml-modules/janestreet/core.nix {}; re2 = callPackage ../development/ocaml-modules/janestreet/re2.nix {}; + + textutils = callPackage ../development/ocaml-modules/janestreet/textutils.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From 2acf031b81358363efed92d021b862492086c38b Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 21:51:24 -0400 Subject: core_extended: 112.24.00 -> 112.24.00/113.33.03 PPX/P4 split --- .../ocaml-modules/async_shell/default.nix | 4 ++-- .../ocaml-modules/janestreet/core-extended.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 11 ++++++++--- 3 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/ocaml-modules/janestreet/core-extended.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/async_shell/default.nix b/pkgs/development/ocaml-modules/async_shell/default.nix index b8ca9097a48e..92a3836ba90f 100644 --- a/pkgs/development/ocaml-modules/async_shell/default.nix +++ b/pkgs/development/ocaml-modules/async_shell/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, async, core_p4, core_extended}: +{stdenv, buildOcaml, fetchurl, async, core_p4, core_extended_p4}: buildOcaml rec { name = "async_shell"; @@ -11,7 +11,7 @@ buildOcaml rec { sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105"; }; - propagatedBuildInputs = [ async core_p4 core_extended ]; + propagatedBuildInputs = [ async core_p4 core_extended_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_shell; diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/pkgs/development/ocaml-modules/janestreet/core-extended.nix new file mode 100644 index 000000000000..df7f6903cd24 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/core-extended.nix @@ -0,0 +1,22 @@ +{stdenv, buildOcamlJane, fetchurl, + core, + bin_prot, fieldslib, sexplib, typerep, variantslib, + ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, + re2, textutils, + ocaml_oasis, opam, js_build_tools}: + +buildOcamlJane rec { + name = "core_extended"; + hash = "1j4ipcn741j8w3h4gpv5sygjzg6b5g6gc2jcrr4n0jyn5dq8b0p5"; + propagatedBuildInputs = + [ core bin_prot fieldslib sexplib typerep variantslib + ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane + re2 textutils ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/core_extended; + description = "Jane Street Capital's standard library overlay"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a506ab9f61be..900a9899948a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5301,7 +5301,7 @@ in comparelib = callPackage ../development/ocaml-modules/comparelib { }; - core_extended = callPackage ../development/ocaml-modules/core_extended { }; + core_extended_p4 = callPackage ../development/ocaml-modules/core_extended { }; core_kernel_p4 = callPackage ../development/ocaml-modules/core_kernel { }; @@ -5577,6 +5577,8 @@ in re2 = callPackage ../development/ocaml-modules/janestreet/re2.nix {}; textutils = callPackage ../development/ocaml-modules/janestreet/textutils.nix {}; + + core_extended = callPackage ../development/ocaml-modules/janestreet/core-extended.nix {}; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; @@ -5704,9 +5706,12 @@ in tinycc = callPackage ../development/compilers/tinycc { }; trv = callPackage ../development/tools/misc/trv { - inherit (ocamlPackages_4_02) findlib camlp4 core async async_unix - async_extra sexplib async_shell core_extended async_find cohttp uri; + inherit (ocamlPackages_4_02) findlib camlp4 async async_unix + async_extra async_shell async_find cohttp uri; ocaml = ocaml_4_02; + core_extended = ocamlPackages_4_02.core_extended_p4; + sexplib = ocamlPackages_4_02.sexplib_p4; + core = ocamlPackages_4_02.core_p4; }; bupc = callPackage ../development/compilers/bupc { }; -- cgit 1.4.1 From 4cc33335a4139b710dacfa291bf852f1a523db99 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 13 Sep 2016 22:25:04 -0400 Subject: Fix descriptions to be CONTRIBUTIONS.md compliant --- pkgs/development/ocaml-modules/janestreet/ppx-assert.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-bench.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-compare.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-driver.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-fail.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-here.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-jane.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix | 2 +- pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix index e42bc80e9dd2..b61874d3a7ea 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix @@ -9,7 +9,7 @@ buildOcamlJane rec { ppx_type_conv sexplib ]; meta = with stdenv.lib; { - description = "Assert-like extension nodes that raise useful errors on failure."; + description = "Assert-like extension nodes that raise useful errors on failure"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; }; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix index a41773b6f683..56a124c5b691 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix @@ -11,7 +11,7 @@ buildOcamlJane rec { propagatedBuildInputs = [ ppx_core ppx_driver ppx_inline_test ppx_tools ]; meta = with stdenv.lib; { - description = "Syntax extension for writing in-line benchmarks in ocaml code."; + description = "Syntax extension for writing in-line benchmarks in ocaml code"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; }; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix index f24c82dd6a76..d70fe6ddd550 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix @@ -8,7 +8,7 @@ buildOcamlJane rec { [ppx_core ppx_driver ppx_tools ppx_type_conv ]; meta = with stdenv.lib; { - description = "Generation of fast comparison functions from type expressions and definitions."; + description = "Generation of fast comparison functions from type expressions and definitions"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; }; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix index f96d5bf4ca60..3fe78e3e7e2e 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix @@ -8,7 +8,7 @@ buildOcamlJane rec { propagatedBuildInputs = [ ppx_core ppx_driver ppx_sexp_conv ppx_tools ]; meta = with stdenv.lib; { - description = "Extensions to printf-style format-strings for user-defined string conversion."; + description = "Extensions to printf-style format-strings for user-defined string conversion"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; }; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix b/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix index ca6cc7464da6..7844756c7bfb 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix @@ -8,7 +8,7 @@ buildOcamlJane rec { [ ppx_core ppx_optcomp ]; meta = with stdenv.lib; { - description = "A driver is an executable created from a set of OCaml AST transformers linked together with a command line frontend."; + description = "A driver is an executable created from a set of OCaml AST transformers linked together with a command line frontend"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; }; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix index 874380cf03a5..8dbf34ed2329 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix @@ -7,7 +7,7 @@ buildOcamlJane rec { propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ]; meta = with stdenv.lib; { - description = "Generate a list containing all values of a finite type."; + description = "Generate a list containing all values of a finite type"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; }; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix b/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix index 5ffa12ebdb41..187d5db19995 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix @@ -7,7 +7,7 @@ buildOcamlJane rec { propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_tools ]; meta = with stdenv.lib; { - description = "Syntax extension that makes failwith include a position."; + description = "Syntax extension that makes failwith include a position"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; }; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix index 15a479ab1824..a05cf149b268 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix @@ -7,7 +7,7 @@ buildOcamlJane rec { propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ]; meta = with stdenv.lib; { - description = "Generation of accessor and iteration functions for ocaml records."; + description = "Generation of accessor and iteration functions for ocaml records"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; }; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix index 6821a1df35bc..3aa157a68c5b 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix @@ -7,7 +7,7 @@ buildOcamlJane rec { propagatedBuildInputs = [ ppx_core ppx_driver ]; meta = with stdenv.lib; { - description = "A ppx rewriter that defines an extension node whose value is its source position."; + description = "A ppx rewriter that defines an extension node whose value is its source position"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; }; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix index 26dd7d70c444..cd16d7c32864 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix @@ -7,7 +7,7 @@ buildOcamlJane rec { propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ]; meta = with stdenv.lib; { - description = "Syntax extension for writing in-line tests in ocaml code."; + description = "Syntax extension for writing in-line tests in ocaml code"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; }; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix index d138ef0b24e2..86394f228e9d 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix @@ -15,7 +15,7 @@ buildOcamlJane rec { ppx_sexp_message ppx_sexp_value ppx_typerep_conv ppx_variants_conv ]; meta = with stdenv.lib; { - description = "ppx_jane is a ppx_driver including all standard ppx rewriters."; + description = "A ppx_driver including all standard ppx rewriters"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; }; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix index a36a80a05596..128a59daec2e 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix @@ -7,7 +7,7 @@ buildOcamlJane rec { propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib]; meta = with stdenv.lib; { - description = "A ppx rewriter that defines an extension node whose value is its source position."; + description = "A ppx rewriter that defines an extension node whose value is its source position"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; }; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix index fc7f043f8a1a..a1a1080d73d7 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix @@ -7,7 +7,7 @@ buildOcamlJane rec { propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ]; meta = with stdenv.lib; { - description = "A ppx rewriter that simplifies building S-Expression from OCaml Values."; + description = "A ppx rewriter that simplifies building S-Expression from OCaml Values"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; }; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix index 6a7588e13abc..fc6d9ca03459 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix @@ -8,7 +8,7 @@ buildOcamlJane rec { [ ppx_core ppx_deriving ppx_driver ppx_tools ]; meta = with stdenv.lib; { - description = "The type_conv library factors out functionality needed by different preprocessors that generate code from type specifications."; + description = "The type_conv library factors out functionality needed by different preprocessors that generate code from type specifications"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; }; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix index d707df93a16d..e5efb786a943 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix @@ -7,7 +7,7 @@ buildOcamlJane rec { propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib]; meta = with stdenv.lib; { - description = "Generation of accessor and iteration functions for ocaml variant types."; + description = "Generation of accessor and iteration functions for ocaml variant types"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; }; -- cgit 1.4.1 From 4fcc1a5a975464dcca0fa1c4c6ce0020df79fe47 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Wed, 14 Sep 2016 11:50:42 -0400 Subject: ppx_sexp_conv: Fix description to match package --- pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix index 128a59daec2e..bf4a7b214dec 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix @@ -7,7 +7,7 @@ buildOcamlJane rec { propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib]; meta = with stdenv.lib; { - description = "A ppx rewriter that defines an extension node whose value is its source position"; + description = "PPX syntax extension that generates code for converting OCaml types to and from s-expressions, as defined in the sexplib library"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; }; -- cgit 1.4.1 From 284c2d8ef55c07c7f87910d0ec1bb2b2bc00fa87 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Wed, 14 Sep 2016 12:00:45 -0400 Subject: buildOcamlJane: Add line breaks --- pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix index 33397e35aa6d..61b2038bfd29 100644 --- a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix +++ b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix @@ -24,7 +24,12 @@ buildOcaml (args // { installPhase = '' opam-installer -i --prefix $prefix --libdir `ocamlfind printconf destdir` --stubsdir `ocamlfind printconf destdir`/${name} ${name}.install - if [ -d $out/lib/${name} ]; then if [ "$(ls -A $out/lib/${name})" ]; then mv $out/lib/${name}/* `ocamlfind printconf destdir`/${name}; fi; rmdir $out/lib/${name}; fi + if [ -d $out/lib/${name} ] + then if [ "$(ls -A $out/lib/${name})" ] + then mv $out/lib/${name}/* `ocamlfind printconf destdir`/${name} + fi + rmdir $out/lib/${name} + fi ''; }) -- cgit 1.4.1 From 6f998593a9937027eee317a80a091a46b80bb9b4 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Wed, 14 Sep 2016 15:52:58 -0400 Subject: async_kernel: 112.24.00 -> 112.24.00/113.33.03 PPX/P4 split --- pkgs/development/ocaml-modules/async/default.nix | 4 ++-- pkgs/development/ocaml-modules/async_extra/default.nix | 4 ++-- pkgs/development/ocaml-modules/async_unix/default.nix | 4 ++-- .../ocaml-modules/janestreet/async-kernel.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 7 ++++++- 5 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/ocaml-modules/janestreet/async-kernel.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/async/default.nix b/pkgs/development/ocaml-modules/async/default.nix index 2b84519036c7..2ddfc40b8f86 100644 --- a/pkgs/development/ocaml-modules/async/default.nix +++ b/pkgs/development/ocaml-modules/async/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, async_kernel, +{stdenv, buildOcaml, fetchurl, async_kernel_p4, async_unix, async_extra, pa_ounit}: buildOcaml rec { @@ -12,7 +12,7 @@ buildOcaml rec { sha256 = "ecc4ca939ab098e689332921b110dbaacd06d9f8d8bf697023dfff3ca37dc1e9"; }; - propagatedBuildInputs = [ async_kernel async_unix async_extra pa_ounit ]; + propagatedBuildInputs = [ async_kernel_p4 async_unix async_extra pa_ounit ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async; diff --git a/pkgs/development/ocaml-modules/async_extra/default.nix b/pkgs/development/ocaml-modules/async_extra/default.nix index 2a6c74f93a78..fbb95a682f4d 100644 --- a/pkgs/development/ocaml-modules/async_extra/default.nix +++ b/pkgs/development/ocaml-modules/async_extra/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, async_kernel, async_unix, +{stdenv, buildOcaml, fetchurl, async_kernel_p4, async_unix, bin_prot_p4, core_p4, custom_printf, fieldslib_p4, herelib, pa_ounit, pipebang, pa_test, sexplib_p4}: @@ -14,7 +14,7 @@ buildOcaml rec { }; buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ async_kernel async_unix core_p4 bin_prot_p4 custom_printf + propagatedBuildInputs = [ async_kernel_p4 async_unix core_p4 bin_prot_p4 custom_printf fieldslib_p4 herelib pipebang sexplib_p4 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/async_unix/default.nix b/pkgs/development/ocaml-modules/async_unix/default.nix index 545f7efd85a7..6119bcac876a 100644 --- a/pkgs/development/ocaml-modules/async_unix/default.nix +++ b/pkgs/development/ocaml-modules/async_unix/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, async_kernel, +{stdenv, buildOcaml, fetchurl, async_kernel_p4, bin_prot_p4, comparelib, core_p4, fieldslib_p4, herelib, pa_ounit, pipebang, pa_test, sexplib_p4}: @@ -15,7 +15,7 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_ounit ]; - propagatedBuildInputs = [ async_kernel core_p4 bin_prot_p4 comparelib + propagatedBuildInputs = [ async_kernel_p4 core_p4 bin_prot_p4 comparelib fieldslib_p4 herelib pipebang pa_test sexplib_p4 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix new file mode 100644 index 000000000000..4d7213a8603e --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix @@ -0,0 +1,16 @@ +{stdenv, buildOcamlJane, fetchurl, core_kernel, + bin_prot, fieldslib, + sexplib, herelib, opam, js_build_tools, ocaml_oasis}: + +buildOcamlJane rec { + name = "async_kernel"; + hash = "1n6ifbrq6q6hq8bxh6b9vhg11mv9r6jgp1b7vfw7mh5s2nrd4b60"; + propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_kernel; + description = "Jane Street Capital's asynchronous execution library (core) "; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcd28fb8a430..dac3e196b233 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5064,7 +5064,7 @@ in async_find = callPackage ../development/ocaml-modules/async_find { }; - async_kernel = callPackage ../development/ocaml-modules/async_kernel { }; + async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { }; async_shell = callPackage ../development/ocaml-modules/async_shell { }; @@ -5609,6 +5609,11 @@ in if lib.versionOlder "4.02" ocaml_version then callPackage ../development/ocaml-modules/janestreet/core-extended.nix {} else core_extended_p4; + + async_kernel = + if lib.versionOlder "4.02" ocaml_version + then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {} + else async_kernel_p4; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From 4e159d70643287c318b10f78b9f0b8cb0e64d903 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Wed, 14 Sep 2016 16:08:02 -0400 Subject: async_unix: 112.24.00 -> 112.24.00/113.33.03 PPX/P4 split --- pkgs/development/ocaml-modules/async/default.nix | 4 ++-- pkgs/development/ocaml-modules/async_extra/default.nix | 4 ++-- .../development/ocaml-modules/janestreet/async-unix.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 11 +++++++++-- 4 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/ocaml-modules/janestreet/async-unix.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/async/default.nix b/pkgs/development/ocaml-modules/async/default.nix index 2ddfc40b8f86..f9d263c40cec 100644 --- a/pkgs/development/ocaml-modules/async/default.nix +++ b/pkgs/development/ocaml-modules/async/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, async_kernel_p4, - async_unix, async_extra, pa_ounit}: + async_unix_p4, async_extra, pa_ounit}: buildOcaml rec { name = "async"; @@ -12,7 +12,7 @@ buildOcaml rec { sha256 = "ecc4ca939ab098e689332921b110dbaacd06d9f8d8bf697023dfff3ca37dc1e9"; }; - propagatedBuildInputs = [ async_kernel_p4 async_unix async_extra pa_ounit ]; + propagatedBuildInputs = [ async_kernel_p4 async_unix_p4 async_extra pa_ounit ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async; diff --git a/pkgs/development/ocaml-modules/async_extra/default.nix b/pkgs/development/ocaml-modules/async_extra/default.nix index fbb95a682f4d..80addcfc3bb4 100644 --- a/pkgs/development/ocaml-modules/async_extra/default.nix +++ b/pkgs/development/ocaml-modules/async_extra/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, async_kernel_p4, async_unix, +{stdenv, buildOcaml, fetchurl, async_kernel_p4, async_unix_p4, bin_prot_p4, core_p4, custom_printf, fieldslib_p4, herelib, pa_ounit, pipebang, pa_test, sexplib_p4}: @@ -14,7 +14,7 @@ buildOcaml rec { }; buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ async_kernel_p4 async_unix core_p4 bin_prot_p4 custom_printf + propagatedBuildInputs = [ async_kernel_p4 async_unix_p4 core_p4 bin_prot_p4 custom_printf fieldslib_p4 herelib pipebang sexplib_p4 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/janestreet/async-unix.nix b/pkgs/development/ocaml-modules/janestreet/async-unix.nix new file mode 100644 index 000000000000..5621d2ec704b --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/async-unix.nix @@ -0,0 +1,17 @@ +{stdenv, buildOcamlJane, fetchurl, async_kernel, + bin_prot, comparelib, core, fieldslib, herelib, + pipebang, sexplib}: + +buildOcamlJane rec { + name = "async_unix"; + hash = "03ng7f0s22wwzspakiqj442vs1a7yf834109jcj9r3g1awwfhcy7"; + propagatedBuildInputs = [ async_kernel core bin_prot comparelib + fieldslib herelib pipebang sexplib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_unix; + description = "Jane Street Capital's asynchronous execution library (unix)"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dac3e196b233..7e6a1b5a3a55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5070,7 +5070,7 @@ in async_ssl = callPackage ../development/ocaml-modules/async_ssl { }; - async_unix = callPackage ../development/ocaml-modules/async_unix { }; + async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { }; async = if lib.versionOlder "4.02" ocaml_version @@ -5614,6 +5614,12 @@ in if lib.versionOlder "4.02" ocaml_version then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {} else async_kernel_p4; + + async_unix = + if lib.versionOlder "4.02" ocaml_version + then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {} + else async_unix_p4; + }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; @@ -5741,9 +5747,10 @@ in tinycc = callPackage ../development/compilers/tinycc { }; trv = callPackage ../development/tools/misc/trv { - inherit (ocamlPackages_4_02) findlib camlp4 async async_unix + inherit (ocamlPackages_4_02) findlib camlp4 async async_extra async_shell async_find cohttp uri; ocaml = ocaml_4_02; + async_unix = ocamlPackages_4_02.async_unix_p4; core_extended = ocamlPackages_4_02.core_extended_p4; sexplib = ocamlPackages_4_02.sexplib_p4; core = ocamlPackages_4_02.core_p4; -- cgit 1.4.1 From 1de9488674a330f61cb6beac300e23564c16d5aa Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Wed, 14 Sep 2016 16:15:07 -0400 Subject: async_rpc_kernel: init at 113.33.03 --- .../ocaml-modules/janestreet/async-rpc-kernel.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix new file mode 100644 index 000000000000..1f5ff6b9646f --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix @@ -0,0 +1,18 @@ +{stdenv, buildOcamlJane, async_kernel, bin_prot, core_kernel, + fieldslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, + ppx_jane, sexplib, typerep, variantslib}: + +buildOcamlJane rec { + name = "async_rpc_kernel"; + hash = "0pvys7giqix1nfidw1f4i3r94cf03ba1mvhadpm2zpdir3av91sw"; + propagatedBuildInputs = [ async_kernel bin_prot core_kernel fieldslib + ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane + sexplib typerep variantslib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_rpc_kernel; + description = "Platform-independent core of Async RPC library"; + license = licenses.asl20; + maintainers = [ maintainers.maurer ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e6a1b5a3a55..c0660da42ba5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5615,6 +5615,8 @@ in then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {} else async_kernel_p4; + async_rpc_kernel = callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {}; + async_unix = if lib.versionOlder "4.02" ocaml_version then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {} -- cgit 1.4.1 From 32367919c4e8dad0983034a1bb716e709267fd75 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Wed, 14 Sep 2016 16:18:43 -0400 Subject: async_extra: 112.24.00 -> 112.24.00/113.33.03 PPX/P4 split --- pkgs/development/ocaml-modules/async/default.nix | 4 ++-- .../ocaml-modules/janestreet/async-extra.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 10 +++++++--- 3 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/ocaml-modules/janestreet/async-extra.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/async/default.nix b/pkgs/development/ocaml-modules/async/default.nix index f9d263c40cec..498315f9cbfd 100644 --- a/pkgs/development/ocaml-modules/async/default.nix +++ b/pkgs/development/ocaml-modules/async/default.nix @@ -1,5 +1,5 @@ {stdenv, buildOcaml, fetchurl, async_kernel_p4, - async_unix_p4, async_extra, pa_ounit}: + async_unix_p4, async_extra_p4, pa_ounit}: buildOcaml rec { name = "async"; @@ -12,7 +12,7 @@ buildOcaml rec { sha256 = "ecc4ca939ab098e689332921b110dbaacd06d9f8d8bf697023dfff3ca37dc1e9"; }; - propagatedBuildInputs = [ async_kernel_p4 async_unix_p4 async_extra pa_ounit ]; + propagatedBuildInputs = [ async_kernel_p4 async_unix_p4 async_extra_p4 pa_ounit ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async; diff --git a/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/pkgs/development/ocaml-modules/janestreet/async-extra.nix new file mode 100644 index 000000000000..4a283cc9910b --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/async-extra.nix @@ -0,0 +1,17 @@ +{stdenv, buildOcamlJane, fetchurl, async_kernel, async_unix, + bin_prot, core, ppx_custom_printf, fieldslib, herelib, + pipebang, sexplib, async_rpc_kernel}: + +buildOcamlJane rec { + name = "async_extra"; + hash = "1xdwab19fycr4cdm3dh9vmx42f8lvf9s4f9pjgdydxfrm7yzyrfh"; + propagatedBuildInputs = [ async_kernel async_unix core bin_prot ppx_custom_printf + fieldslib herelib pipebang sexplib async_rpc_kernel ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_extra; + description = "Jane Street Capital's asynchronous execution library (extra)"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0660da42ba5..c003adbfe4b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5060,7 +5060,7 @@ in asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { }; - async_extra = callPackage ../development/ocaml-modules/async_extra { }; + async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { }; async_find = callPackage ../development/ocaml-modules/async_find { }; @@ -5610,18 +5610,22 @@ in then callPackage ../development/ocaml-modules/janestreet/core-extended.nix {} else core_extended_p4; - async_kernel = + async_kernel = if lib.versionOlder "4.02" ocaml_version then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {} else async_kernel_p4; async_rpc_kernel = callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {}; - async_unix = + async_unix = if lib.versionOlder "4.02" ocaml_version then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {} else async_unix_p4; + async_extra = + if lib.versionOlder "4.02" ocaml_version + then callPackage ../development/ocaml-modules/janestreet/async-extra.nix {} + else async_extra_p4; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- cgit 1.4.1 From 1d0e6ba2df81ad5d9fa42c9181da945a8b1abae3 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Wed, 14 Sep 2016 16:34:33 -0400 Subject: async: 112.24.00 -> 112.24.00/113.33.03 PPX/P4 split --- pkgs/development/ocaml-modules/async_find/default.nix | 4 ++-- pkgs/development/ocaml-modules/async_shell/default.nix | 4 ++-- pkgs/development/ocaml-modules/async_ssl/default.nix | 4 ++-- pkgs/development/ocaml-modules/cstruct/default.nix | 6 +++--- pkgs/development/ocaml-modules/janestreet/async.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 13 ++++++++++--- 6 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/ocaml-modules/janestreet/async.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/async_find/default.nix b/pkgs/development/ocaml-modules/async_find/default.nix index 82b9f83317a0..d0e89940433c 100644 --- a/pkgs/development/ocaml-modules/async_find/default.nix +++ b/pkgs/development/ocaml-modules/async_find/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, async, core_p4, sexplib_p4}: +{stdenv, buildOcaml, fetchurl, async_p4, core_p4, sexplib_p4}: buildOcaml rec { name = "async_find"; @@ -11,7 +11,7 @@ buildOcaml rec { sha256 = "4e3fda72f50174f05d96a5a09323f236c041b1a685890c155822956f3deb8803"; }; - propagatedBuildInputs = [ async core_p4 sexplib_p4 ]; + propagatedBuildInputs = [ async_p4 core_p4 sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_find; diff --git a/pkgs/development/ocaml-modules/async_shell/default.nix b/pkgs/development/ocaml-modules/async_shell/default.nix index 92a3836ba90f..6b1e772bc7d1 100644 --- a/pkgs/development/ocaml-modules/async_shell/default.nix +++ b/pkgs/development/ocaml-modules/async_shell/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, async, core_p4, core_extended_p4}: +{stdenv, buildOcaml, fetchurl, async_p4, core_p4, core_extended_p4}: buildOcaml rec { name = "async_shell"; @@ -11,7 +11,7 @@ buildOcaml rec { sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105"; }; - propagatedBuildInputs = [ async core_p4 core_extended_p4 ]; + propagatedBuildInputs = [ async_p4 core_p4 core_extended_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_shell; diff --git a/pkgs/development/ocaml-modules/async_ssl/default.nix b/pkgs/development/ocaml-modules/async_ssl/default.nix index 8e0286e725da..2bace35aa8b6 100644 --- a/pkgs/development/ocaml-modules/async_ssl/default.nix +++ b/pkgs/development/ocaml-modules/async_ssl/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, async, comparelib, core_p4, ctypes, openssl, +{stdenv, buildOcaml, fetchurl, async_p4, comparelib, core_p4, ctypes, openssl, fieldslib_p4, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib_p4}: buildOcaml rec { @@ -13,7 +13,7 @@ buildOcaml rec { }; buildInputs = [ pa_bench pa_test ]; - propagatedBuildInputs = [ ctypes async comparelib core_p4 fieldslib_p4 pa_ounit + propagatedBuildInputs = [ ctypes async_p4 comparelib core_p4 fieldslib_p4 pa_ounit herelib pipebang sexplib_p4 openssl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 68b202f9ade6..c9f04918d172 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,5 +1,5 @@ {stdenv, writeText, fetchurl, ocaml, ocplib-endian, sexplib_p4, findlib, - async ? null, lwt ? null, camlp4}: + async_p4 ? null, lwt ? null, camlp4}: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; @@ -12,9 +12,9 @@ stdenv.mkDerivation { }; configureFlags = stdenv.lib.strings.concatStringsSep " " ((if lwt != null then ["--enable-lwt"] else []) ++ - (if async != null then ["--enable-async"] else [])); + (if async_p4 != null then ["--enable-async"] else [])); buildInputs = [ocaml findlib camlp4]; - propagatedBuildInputs = [ocplib-endian sexplib_p4 lwt async]; + propagatedBuildInputs = [ocplib-endian sexplib_p4 lwt async_p4]; createFindlibDestdir = true; dontStrip = true; diff --git a/pkgs/development/ocaml-modules/janestreet/async.nix b/pkgs/development/ocaml-modules/janestreet/async.nix new file mode 100644 index 000000000000..2e776e273be1 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/async.nix @@ -0,0 +1,16 @@ +{stdenv, buildOcamlJane, fetchurl, async_kernel, + async_unix, async_extra}: + +buildOcamlJane rec { + name = "async"; + version = "113.33.03"; + hash = "0wyspkp8k833fh03r3h016nbfn6kjfhvb2bg42cly6agcak59fmr"; + propagatedBuildInputs = [ async_kernel async_unix async_extra ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async; + description = "Jane Street Capital's asynchronous execution library"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c003adbfe4b7..d65eaf847c94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5072,7 +5072,7 @@ in async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { }; - async = + async_p4 = if lib.versionOlder "4.02" ocaml_version then callPackage ../development/ocaml-modules/async { } else null; @@ -5626,6 +5626,11 @@ in if lib.versionOlder "4.02" ocaml_version then callPackage ../development/ocaml-modules/janestreet/async-extra.nix {} else async_extra_p4; + + async = + if lib.versionOlder "4.02" ocaml_version + then callPackage ../development/ocaml-modules/janestreet/async.nix {} + else async_p4; }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; @@ -5753,9 +5758,11 @@ in tinycc = callPackage ../development/compilers/tinycc { }; trv = callPackage ../development/tools/misc/trv { - inherit (ocamlPackages_4_02) findlib camlp4 async - async_extra async_shell async_find cohttp uri; + inherit (ocamlPackages_4_02) findlib camlp4 + async_shell async_find cohttp uri; ocaml = ocaml_4_02; + async = ocamlPackages_4_02.async_p4; + async_extra = ocamlPackages_4_02.async_extra_p4; async_unix = ocamlPackages_4_02.async_unix_p4; core_extended = ocamlPackages_4_02.core_extended_p4; sexplib = ocamlPackages_4_02.sexplib_p4; -- cgit 1.4.1 From 65fb52f21045134690bacf5d9c21086db20ab1d1 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Tue, 20 Sep 2016 15:13:19 -0400 Subject: js-build-tools: Fix darwin build On darwin, js-build-tools expects an OSX style userland and stat binary. However, under nix we use the nix version of stat, which speaks linux-style flags. This patch removes js-build-tools special casing so that it speaks to stat in linux style. --- .../ocaml-modules/janestreet/js-build-tools-darwin.patch | 11 +++++++++++ pkgs/development/ocaml-modules/janestreet/js-build-tools.nix | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/ocaml-modules/janestreet/js-build-tools-darwin.patch (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/janestreet/js-build-tools-darwin.patch b/pkgs/development/ocaml-modules/janestreet/js-build-tools-darwin.patch new file mode 100644 index 000000000000..8878b4be68b8 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/js-build-tools-darwin.patch @@ -0,0 +1,11 @@ +--- a/ocamlbuild_goodies/jane_street_ocamlbuild_goodies.ml ++++ b/ocamlbuild_goodies/jane_street_ocamlbuild_goodies.ml +@@ -65,7 +65,7 @@ let track_external_deps = function + + let stat, md5sum = + match run_and_read "uname" |> String.trim with +- | "Darwin" -> ++ | "FreeBSD" | "NetBSD" -> + (S [A "stat"; A "-f"; A "%d:%i:%m"], + A "md5") + | _ -> diff --git a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix index d6e67b277cac..bf697eda8007 100644 --- a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix +++ b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix @@ -19,6 +19,8 @@ buildOcaml rec { configurePhase = "./configure --prefix $prefix"; installPhase = "opam-installer -i --prefix $prefix --libdir `ocamlfind printconf destdir` ${name}.install"; + patches = [ ./js-build-tools-darwin.patch ]; + meta = with stdenv.lib; { description = "Jane Street Build Tools"; maintainers = [ maintainers.maurer ]; -- cgit 1.4.1