Merge pull request #76559 from bcdarwin/update-parany

ocamlPackages.parany: 7.0.0 -> 8.0.0
NixOS · Dec 27, 2019 · 38b41d8 · 38b41d8
2 parents ffa023d + d255365
commit 38b41d8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/...lopment/ocaml-modules/setcore/default.nix → ...development/ocaml-modules/cpu/default.nix b/...lopment/ocaml-modules/setcore/default.nix → ...development/ocaml-modules/cpu/default.nix
@@ -1,14 +1,14 @@
 { stdenv, buildDunePackage, fetchFromGitHub, autoconf }:
 
 buildDunePackage rec {
-  pname = "setcore";
-  version = "1.0.1";
+  pname = "cpu";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "UnixJunkie";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "1yn660gxk2ccp7lbdq9v6pjz1c3pm08s9dl9k9l5492ld6bx8fxc";
+    sha256 = "1vir6gh1bhvxgj2fcn69c38yhw3jgk7dyikmw789m5ld2csnyjiv";
   };
 
   preConfigure = ''
@@ -22,7 +22,7 @@ buildDunePackage rec {
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
-    description = "Generalized map/reduce for multicore computing";
+    description = "Core pinning library";
     maintainers = [ maintainers.bcdarwin ];
     license = licenses.lgpl2;
   };

diff --git a/pkgs/development/ocaml-modules/parany/default.nix b/pkgs/development/ocaml-modules/parany/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, buildDunePackage, fetchFromGitHub, ocamlnet, setcore }:
+{ stdenv, buildDunePackage, fetchFromGitHub, ocamlnet, cpu }:
 
 buildDunePackage rec {
   pname = "parany";
-  version = "7.0.0";
+  version = "8.0.0";
 
   src = fetchFromGitHub {
     owner = "UnixJunkie";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "0kylhgi1d4gj68x40ifli7pnrxkdc6ks5mgfvlcsigqg8i8nvc7q";
+    sha256 = "19yz1yqyqx6gawy93jlh3x6vji2p9qsy6nsbj65q5pii8p1fjlsm";
   };
 
-  propagatedBuildInputs = [ ocamlnet setcore ];
+  propagatedBuildInputs = [ ocamlnet cpu ];
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
@@ -191,6 +191,8 @@ let
 
     cppo = callPackage ../development/tools/ocaml/cppo { };
 
+    cpu = callPackage ../development/ocaml-modules/cpu { };
+
     cpuid = callPackage ../development/ocaml-modules/cpuid { };
 
     crunch = callPackage ../development/tools/ocaml/crunch { };
@@ -833,8 +835,6 @@ 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 { };