diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-30 13:37:39 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-30 13:37:39 +0100 |
| commit | 7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769 (patch) | |
| tree | 38e753812c0ceba947d65ec0555a5a66c1a5aa4e /nixpkgs/pkgs/development/libraries/pmix | |
| parent | 46cf147fc42b72f68ecd52b3b03a8bfd6077f42b (diff) | |
| parent | 63678e9f3d3afecfeafa0acead6239cdb447574c (diff) | |
| download | nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.gz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.bz2 nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.lz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.xz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.zst nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.zip | |
Merge commit '63678e9f3d3afecfeafa0acead6239cdb447574c' into HEAD
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/pmix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/pmix/default.nix | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/pmix/default.nix b/nixpkgs/pkgs/development/libraries/pmix/default.nix index 3f1b2e2cf368..f5fb65f7989b 100644 --- a/nixpkgs/pkgs/development/libraries/pmix/default.nix +++ b/nixpkgs/pkgs/development/libraries/pmix/default.nix @@ -1,16 +1,17 @@ { lib, stdenv, fetchFromGitHub, perl, autoconf, automake -, libtool, flex, libevent, hwloc, munge, zlib, pandoc +, libtool, python3, flex, libevent, hwloc, munge, zlib, pandoc, gitMinimal } : stdenv.mkDerivation rec { pname = "pmix"; - version = "3.2.4"; + version = "5.0.1"; src = fetchFromGitHub { repo = "openpmix"; owner = "openpmix"; rev = "v${version}"; - sha256 = "sha256-79zTZm549VRsqeziCuBT6l4jTJ6D/gZaMAvgHZm7jn4="; + hash = "sha256-ZuuzQ8j5zqQ/9mBFEODAaoX9/doWB9Nt9Sl75JkJyqU="; + fetchSubmodules = true; }; postPatch = '' @@ -18,14 +19,25 @@ stdenv.mkDerivation rec { patchShebangs ./config ''; - nativeBuildInputs = [ pandoc perl autoconf automake libtool flex ]; + nativeBuildInputs = [ + pandoc + perl + autoconf + automake + libtool + flex + gitMinimal + python3 + ]; buildInputs = [ libevent hwloc munge zlib ]; configureFlags = [ "--with-libevent=${lib.getDev libevent}" + "--with-libevent-libdir=${lib.getLib libevent}/lib" "--with-munge=${munge}" "--with-hwloc=${lib.getDev hwloc}" + "--with-hwloc-libdir=${lib.getLib hwloc}/lib" ]; preConfigure = '' |