Fix Nanos6 build from git

The src.rev attribute is not available as it comes from source before
the recursive operator. Instead, simply get it from the function inputs.

Cc: Aleix Boné <aleix.boneribo@bsc.es>
Reviewed-by: Aleix Roca Nonell <aleix.rocanonell@bsc.es>

flake.lock

@@ -2,10 +2,10 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1700390070,
-        "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=",
-        "path": "/nix/store/z7y28qzhk7driiwcw78k0mb24laknm0f-source",
-        "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb",
+        "lastModified": 1736867362,
+        "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=",
+        "path": "/nix/store/2csx2kkb2hxyxhhmg2xs9jfyypikwwk6-source",
+        "rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc",
         "type": "path"
       },
       "original": {

pkgs/gpi-2/default.nix

@@ -17,6 +17,10 @@ let
     name ="rdma-core-all";
     paths = [ rdma-core.dev rdma-core.out ];
   };
+  mpiAll = symlinkJoin {
+    name = "mpi-all";
+    paths = [ mpi.all ];
+  };
 in
 
 stdenv.mkDerivation rec {
@@ -37,13 +41,13 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-infiniband=${rdma-core-all}"
-    "--with-mpi=${mpi}"
+    "--with-mpi=${mpiAll}"
     "--with-slurm"
     "CFLAGS=-fPIC"
     "CXXFLAGS=-fPIC"
   ];
 
-  buildInputs = [ slurm mpi rdma-core-all autoconf automake libtool rsync gfortran ];
+  buildInputs = [ slurm mpiAll rdma-core-all autoconf automake libtool rsync gfortran ];
 
   hardeningDisable = [ "all" ];
 }

pkgs/intel-oneapi/2023.nix

@@ -198,6 +198,7 @@ let
       libffi_3_3
       libelf
       libxml2
+      zlib
       hwloc
       stdenv.cc.cc.lib
     ];

pkgs/llvm-ompss2/openmp.nix

@@ -10,6 +10,7 @@
 , version
 , nosv
 , ovni
+, python3
 , enableNosv ? false
 , enableDebug ? false
 , enableOvni ? false
@@ -37,6 +38,7 @@ stdenv.mkDerivation rec {
     ninja
     perl
     pkg-config
+    python3
   ] ++ lib.optionals enableNosv [
     nosv
   ] ++ lib.optionals enableOvni [

pkgs/nanos6/default.nix

@@ -48,7 +48,7 @@ let
 
   source = if (useGit) then git else release;
 in
-  stdenv.mkDerivation (source // rec {
+  stdenv.mkDerivation (source // {
     pname = "nanos6";
 
     prePatch = ''
@@ -62,7 +62,7 @@ in
       export CACHELINE_WIDTH=${toString cachelineBytes}
       ./autogen.sh
     '' + lib.optionalString (useGit) ''
-      export NANOS6_GIT_VERSION=${src.rev}
+      export NANOS6_GIT_VERSION=${gitCommit}
       export NANOS6_GIT_BRANCH=${gitBranch}
     '';
 

pkgs/nodes/default.nix

@@ -1,15 +1,11 @@
 {
   stdenv
 , lib
-, automake
-, autoconf
-, libtool
 , fetchFromGitHub
 , pkg-config
 , perl
 , numactl
 , hwloc
-, papi
 , boost
 , autoreconfHook
 , ovni
@@ -69,16 +65,15 @@ in
     # disable all by default, which includes bindnow.
     hardeningDisable = [ "all" ];
 
-    buildInputs = [
+    nativeBuildInputs = [
       autoreconfHook
-      autoconf
-      automake
-      libtool
       pkg-config
+    ];
+
+    buildInputs = [
       boost
       numactl
       hwloc
-      papi
       nosv
       ovni
     ];

pkgs/nosv/default.nix

@@ -6,6 +6,7 @@
 , pkg-config
 , numactl
 , hwloc
+, cacheline ? 64 # bits
 , ovni ? null
 , useGit ? false
 , gitUrl ? "git@gitlab-internal.bsc.es:nos-v/nos-v.git"
@@ -43,7 +44,10 @@ in
     hardeningDisable = [ "all" ];
     dontStrip = true;
     separateDebugInfo = true;
-    configureFlags = [ "--with-ovni=${ovni}" ];
+    configureFlags = [
+      "--with-ovni=${ovni}"
+      "CACHELINE_WIDTH=${toString cacheline}"
+    ];
     nativeBuildInputs = [
       autoreconfHook
       pkg-config

pkgs/osu/default.nix

@@ -3,8 +3,16 @@
 , fetchurl
 , mpi
 , lib
+, symlinkJoin
 }:
 
+let
+  mpiAll = symlinkJoin {
+    name = "mpi-all";
+    paths = [ mpi.all ];
+  };
+in
+
 stdenv.mkDerivation rec {
   version = "7.1-1";
   name = "osu-micro-benchmarks-${version}";
@@ -16,11 +24,11 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
   enableParallelBuilding = true;
-  buildInputs = [ mpi ];
+  buildInputs = [ mpiAll ];
   hardeningDisable = [ "all" ];
   configureFlags = [ 
-      "CC=${mpi}/bin/mpicc"
-      "CXX=${mpi}/bin/mpicxx"
+      "CC=mpicc"
+      "CXX=mpicxx"
   ];
 
   postInstall = ''

pkgs/paraver/kernel.nix

@@ -4,14 +4,15 @@
 , boost
 , libxml2
 , xml2
-, wxGTK30
+, wxGTK32
 , autoconf
 , automake
 , pkg-config
+, zlib
 }:
 
 let
-  wx = wxGTK30;
+  wx = wxGTK32;
 in
 stdenv.mkDerivation rec {
   pname = "paraver-kernel";
@@ -51,5 +52,6 @@ stdenv.mkDerivation rec {
     autoconf
     automake
     pkg-config
+    zlib
   ];
 }

pkgs/tagaspi/default.nix

@@ -11,8 +11,16 @@
 , numactl
 , rdma-core
 , gfortran
+, symlinkJoin
 }:
 
+let
+  mpiAll = symlinkJoin {
+    name = "mpi-all";
+    paths = [ mpi.all ];
+  };
+in
+
 stdenv.mkDerivation rec {
   pname = "tagaspi";
   enableParallelBuilding = true;
@@ -32,10 +40,10 @@ stdenv.mkDerivation rec {
     autoconf
     libtool
     boost
-    mpi
     numactl
     rdma-core
     gfortran
+    mpiAll
   ];
 
   dontDisableStatic = true;