From f1958523e313174e25345c69b2f127b086ffafd1 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 26 Dec 2019 17:30:49 -0500 Subject: [PATCH 1/2] ocamlPackages.cpu: setcore 1.0.1 -> cpu 2.0.0 --- .../ocaml-modules/{setcore => cpu}/default.nix | 8 ++++---- pkgs/top-level/ocaml-packages.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/ocaml-modules/{setcore => cpu}/default.nix (73%) diff --git a/pkgs/development/ocaml-modules/setcore/default.nix b/pkgs/development/ocaml-modules/cpu/default.nix similarity index 73% rename from pkgs/development/ocaml-modules/setcore/default.nix rename to pkgs/development/ocaml-modules/cpu/default.nix index c2fd9aab3ba..716e40e16e9 100644 --- a/pkgs/development/ocaml-modules/setcore/default.nix +++ b/pkgs/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/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 475119e37f0..20bf3e89f2d 100644 --- 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 { }; @@ -831,8 +833,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 { }; From d255365342f84650f03174582e9edc487dba86bb Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 26 Dec 2019 17:31:16 -0500 Subject: [PATCH 2/2] ocamlPackages.parany: 7.0.0 -> 8.0.0 --- pkgs/development/ocaml-modules/parany/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/parany/default.nix b/pkgs/development/ocaml-modules/parany/default.nix index 5c02e3efea0..0a4fc9ecea4 100644 --- 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;