From eb1efb718c765c6288b80371b71c9657923c65b3 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 25 Nov 2019 15:21:03 -0500 Subject: [PATCH 1/2] ocamlPackages.setcore: init at 1.0.1 --- .../ocaml-modules/setcore/default.nix | 29 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/ocaml-modules/setcore/default.nix diff --git a/pkgs/development/ocaml-modules/setcore/default.nix b/pkgs/development/ocaml-modules/setcore/default.nix new file mode 100644 index 00000000000..c2fd9aab3ba --- /dev/null +++ b/pkgs/development/ocaml-modules/setcore/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildDunePackage, fetchFromGitHub, autoconf }: + +buildDunePackage rec { + pname = "setcore"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "UnixJunkie"; + repo = pname; + rev = "v${version}"; + sha256 = "1yn660gxk2ccp7lbdq9v6pjz1c3pm08s9dl9k9l5492ld6bx8fxc"; + }; + + preConfigure = '' + autoconf + autoheader + ''; + + buildInputs = [ autoconf ]; + + hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Generalized map/reduce for multicore computing"; + maintainers = [ maintainers.bcdarwin ]; + license = licenses.lgpl2; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 20cd2965549..77baf2712c6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -755,6 +755,8 @@ let sedlex = callPackage ../development/ocaml-modules/sedlex { }; + setcore = callPackage ../development/ocaml-modules/setcore { }; + sodium = callPackage ../development/ocaml-modules/sodium { }; spelll = callPackage ../development/ocaml-modules/spelll { }; From 06ddb4a49ffeccf49aac2a2fdb68926d0520e462 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 25 Nov 2019 15:43:05 -0500 Subject: [PATCH 2/2] ocamlPackages.parany: init at 7.0.0 --- .../ocaml-modules/parany/default.nix | 22 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/ocaml-modules/parany/default.nix diff --git a/pkgs/development/ocaml-modules/parany/default.nix b/pkgs/development/ocaml-modules/parany/default.nix new file mode 100644 index 00000000000..5c02e3efea0 --- /dev/null +++ b/pkgs/development/ocaml-modules/parany/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildDunePackage, fetchFromGitHub, ocamlnet, setcore }: + +buildDunePackage rec { + pname = "parany"; + version = "7.0.0"; + + src = fetchFromGitHub { + owner = "UnixJunkie"; + repo = pname; + rev = "v${version}"; + sha256 = "0kylhgi1d4gj68x40ifli7pnrxkdc6ks5mgfvlcsigqg8i8nvc7q"; + }; + + propagatedBuildInputs = [ ocamlnet setcore ]; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Generalized map/reduce for multicore computing"; + maintainers = [ maintainers.bcdarwin ]; + license = licenses.lgpl2; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 77baf2712c6..e7b606cde24 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -688,6 +688,8 @@ let pa_test = callPackage ../development/ocaml-modules/pa_test { }; + parany = callPackage ../development/ocaml-modules/parany { }; + pipebang = callPackage ../development/ocaml-modules/pipebang { }; pprint = callPackage ../development/ocaml-modules/pprint { };