flake.lock

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

overlay.nix

@@ -46,7 +46,6 @@ let
     stdenvClangOmpss2NodesOmpv = final.stdenv.override { cc = final.clangOmpss2NodesOmpv; allowedRequisites = null; };
     tagaspi = callPackage ./pkgs/tagaspi/default.nix { };
     tampi = callPackage ./pkgs/tampi/default.nix { };
-    vivado = callPackage ./pkgs/vivado/default.nix { };
     wxparaver = callPackage ./pkgs/paraver/default.nix { };
   };
 

pkgs/gpi-2/default.nix

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

pkgs/intel-oneapi/2023.nix

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

pkgs/llvm-ompss2/openmp.nix

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

pkgs/nodes/default.nix

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

pkgs/nosv/default.nix

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

pkgs/osu/default.nix

@@ -3,16 +3,8 @@
 , 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}";
@@ -24,11 +16,11 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
   enableParallelBuilding = true;
-  buildInputs = [ mpiAll ];
+  buildInputs = [ mpi ];
   hardeningDisable = [ "all" ];
   configureFlags = [ 
-      "CC=mpicc"
-      "CXX=mpicxx"
+      "CC=${mpi}/bin/mpicc"
+      "CXX=${mpi}/bin/mpicxx"
   ];
 
   postInstall = ''

pkgs/paraver/kernel.nix

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

pkgs/tagaspi/default.nix

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

pkgs/vivado/default.nix

@@ -1,55 +0,0 @@
-# Thanks to MLabs to made the switch.
-
-{
-  stdenv
-, lib
-, ncurses5
-, libxcrypt-legacy
-, zlib
-, libuuid
-, xorg
-, freetype
-, fontconfig
-, buildFHSEnv
-}:
-
-with lib;
-
-let
-  vivadoDeps = pkgs:
-    let
-      # Apply patch from https://github.com/nix-community/nix-environments/pull/54
-      # to fix ncurses libtinfo.so's soname issue
-      ncurses' = ncurses5.overrideAttrs (old: {
-        configureFlags = old.configureFlags ++ ["--with-termlib"];
-        postFixup = "";
-      });
-    in [
-      libxcrypt-legacy
-      (ncurses'.override {unicodeSupport = false;})
-      zlib
-      libuuid
-      xorg.libSM
-      xorg.libICE
-      xorg.libXrender
-      xorg.libX11
-      xorg.libXext
-      xorg.libXtst
-      xorg.libXi
-      freetype
-      fontconfig
-    ];
-
-  vivadoEnv = buildFHSEnv {
-    name = "vivado-env";
-    targetPkgs = vivadoDeps;
-  };
-
-  vivado = buildFHSEnv {
-    name = "vivado";
-    targetPkgs = vivadoDeps;
-    profile = "set -e; source /opt/Xilinx/Vivado/2024.2/settings64.sh";
-    runScript = "vivado";
-  };
-in
-  vivadoEnv