Clean up paraver derivations

Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Tested-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>

flake.nix

@@ -2,17 +2,23 @@
   inputs.nixpkgs.url = "nixpkgs";
 
   outputs = { self, nixpkgs, ...}:
-  let
+    let
-    pkgs = import nixpkgs {
       # For now we only support x86
       system = "x86_64-linux";
-      overlays = [ self.overlays.default ];
+      pkgs = import nixpkgs {
-    };
+        inherit system;
-  in
+        overlays = [ self.overlays.default ];
+      };
+    in
     {
       bscOverlay = import ./overlay.nix;
       overlays.default = self.bscOverlay;
-      legacyPackages.x86_64-linux = pkgs;
+      # full nixpkgs with our overlay applied
+      legacyPackages.${system} = pkgs;
+
+      hydraJobs = {
+        inherit (self.legacyPackages.${system}.bsc-ci) test pkgs;
+      };
 
       # propagate nixpkgs lib, so we can do bscpkgs.lib
       inherit (nixpkgs) lib;

overlay.nix

@@ -88,7 +88,9 @@ in bscPkgs // {
       };
     };
 
-    pkgs = final.runCommand "ci-pkgs" { }
+    pkgs = filterAttrs (_: isDerivation) bscPkgs;
+
+    pkgsList = final.runCommand "ci-pkgs" { }
       "printf '%s\n' ${toString (collect isDerivation bscPkgs)} > $out";
 
     tests = final.runCommand "ci-tests" { }
@@ -96,7 +98,7 @@ in bscPkgs // {
 
     all = final.runCommand "ci-all" { }
     ''
-      deps="${toString [ final.bsc-ci.pkgs final.bsc-ci.tests ]}"
+      deps="${toString [ final.bsc-ci.pkgsList final.bsc-ci.tests ]}"
       cat $deps
       printf '%s\n' $deps > $out
     '';

pkgs/bench6/default.nix

@@ -27,13 +27,10 @@ stdenv.mkDerivation rec {
     rev = gitCommit;
   };
 
-  nativeBuildInputs = [
-    cmake
-    clangOmpss2
-  ];
-
   buildInputs = [
     bigotes
+    cmake
+    clangOmpss2
     openmp
     openmpv
     nanos6

pkgs/bigotes/default.nix

@@ -4,7 +4,7 @@
 , cmake
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "bigotes";
   version = "9dce13";
   src = fetchFromGitHub {
@@ -13,5 +13,5 @@ stdenv.mkDerivation {
     rev = "9dce13446a8da30bea552d569d260d54e0188518";
     sha256 = "sha256-ktxM3pXiL8YXSK+/IKWYadijhYXqGoLY6adLk36iigE=";
   };
-  nativeBuildInputs = [ cmake ];
+  buildInputs = [ cmake ];
 }

pkgs/intel-oneapi/2023.nix

@@ -78,7 +78,7 @@ let
   uncompressDebs = debs: name: stdenv.mkDerivation {
     name = name;
     srcs = debs;
-    nativeBuildInputs = [ dpkg ];
+    buildInputs = [ dpkg ];
     phases = [ "installPhase" ];
     installPhase = ''
       mkdir -p $out
@@ -108,17 +108,14 @@ let
       "intel-oneapi-mpi-${version}"
     ];
 
-    nativeBuildInputs = [
-      autoPatchelfHook
-      rsync
-    ];
-
     buildInputs = [
+      rsync
       libfabric
       zlib
       stdenv.cc.cc.lib
     ];
 
+    nativeBuildInputs = [ autoPatchelfHook ];
     phases = [ "installPhase" "fixupPhase" ];
     dontStrip = true;
     installPhase = ''
@@ -157,6 +154,7 @@ let
 
     buildInputs = [
       intel-mpi
+      rsync
       libffi_3_3
       libelf
       libxml2
@@ -164,10 +162,7 @@ let
       stdenv.cc.cc.lib
     ];
 
-    nativeBuildInputs = [
+    nativeBuildInputs = [ autoPatchelfHook ];
-      autoPatchelfHook
-      rsync
-    ];
     phases = [ "installPhase" "fixupPhase" ];
     dontStrip = true;
 
@@ -197,6 +192,7 @@ let
     buildInputs = [
       intel-mpi
       intel-tbb
+      rsync
       libffi_3_3
       libelf
       libxml2
@@ -205,10 +201,7 @@ let
       stdenv.cc.cc.lib
     ];
 
-    nativeBuildInputs = [
+    nativeBuildInputs = [ autoPatchelfHook ];
-      autoPatchelfHook
-      rsync
-    ];
     phases = [ "installPhase" "fixupPhase" ];
     dontStrip = true;
 
@@ -261,6 +254,7 @@ let
     buildInputs = [
       intel-mpi
       intel-compiler-shared
+      rsync
       libffi_3_3
       libelf
       libxml2
@@ -268,10 +262,7 @@ let
       stdenv.cc.cc.lib
     ];
 
-    nativeBuildInputs = [
+    nativeBuildInputs = [ autoPatchelfHook ];
-      autoPatchelfHook
-      rsync
-    ];
 
     phases = [ "installPhase" "fixupPhase" ];
 
@@ -346,6 +337,7 @@ let
 
     buildInputs = [
       intel-compiler-shared
+      rsync
       libffi_3_3
       libelf
       libxml2
@@ -353,10 +345,7 @@ let
       stdenv.cc.cc.lib
     ];
 
-    nativeBuildInputs = [
+    nativeBuildInputs = [ autoPatchelfHook ];
-      autoPatchelfHook
-      rsync
-    ];
     autoPatchelfIgnoreMissingDeps = [ "libtbb.so.12" "libtbbmalloc.so.2" "libze_loader.so.1" ];
 
     phases = [ "installPhase" "fixupPhase" ];

pkgs/llvm-ompss2/clang.nix

@@ -57,20 +57,18 @@ in stdenv.mkDerivation rec {
 
   isClangWithOmpss = true;
 
-  nativeBuildInputs = [
+  nativeBuildInputs = [ zlib ];
-    bash
-    cmake
-    elfutils
-    llvmPackages_latest.lld
-    pkg-config
-    python3
-    perl
-    which
-    zlib
-  ];
 
   buildInputs = [
+    which
+    bash
+    python3
+    perl
+    cmake
+    llvmPackages_latest.lld
+    elfutils
     libffi
+    pkg-config
     zlib
     gcc.cc.lib # Required for libstdc++.so.6
   ];

pkgs/mcxx/default.nix

@@ -32,20 +32,17 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [
+  buildInputs = [
     autoreconfHook
-    bison
+    nanos6
-    flex
+    gperf
     python3
     gfortran
     pkg-config
-    gperf
-    gcc
-  ];
-
-  buildInputs = [
-    nanos6
     sqlite.dev
+    bison
+    flex
+    gcc
   ];
 
   patches = [ ./intel.patch ];

pkgs/nanos6/default.nix

@@ -88,19 +88,11 @@ in
     dontStrip = enableDebug;
     separateDebugInfo = true;
 
-    nativeBuildInputs = [
+    buildInputs = [
       autoconf
       automake
       libtool
       pkg-config
-
-      # TODO: papi_version is needed for configure:
-      # ./configure: line 27378: papi_version: command not found
-      # This probably breaks cross-compilation
-      papi
-    ];
-
-    buildInputs = [
       boost
       numactl
       hwloc
@@ -112,7 +104,7 @@ in
     postInstall = ''
       mkdir -p $out/nix-support
       echo "export NANOS6_HOME=$out" >> $out/nix-support/setup-hook
-    '';
+    ''; 
 
     meta = with lib; {
       homepage = "https://github.com/bsc-pm/nanos6";

pkgs/osu/default.nix

@@ -24,10 +24,9 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
   enableParallelBuilding = true;
-  nativeBuildInputs = [ mpiAll ];
   buildInputs = [ mpiAll ];
   hardeningDisable = [ "all" ];
-  configureFlags = [
+  configureFlags = [ 
       "CC=mpicc"
       "CXX=mpicxx"
   ];
@@ -41,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "OSU Micro-Benchmarks";
-    homepage = "http://mvapich.cse.ohio-state.edu/benchmarks/";
+    homepage = http://mvapich.cse.ohio-state.edu/benchmarks/;
     maintainers = [ ];
     platforms = lib.platforms.all;
   };

pkgs/ovni/default.nix

@@ -13,6 +13,8 @@
 , useMpi ? (stdenv.buildPlatform.canExecute stdenv.hostPlatform)
 }:
 
+with lib;
+
 let
   release = rec {
     version = "1.12.0";
@@ -43,7 +45,7 @@ in
     postPatch = ''
       patchShebangs --build test/
     '';
-    nativeBuildInputs = [ cmake ] ++ lib.optionals (useMpi) [ mpi ];
+    nativeBuildInputs = [ cmake ];
     buildInputs = lib.optionals (useMpi) [ mpi ];
     cmakeBuildType = if (enableDebug) then "Debug" else "Release";
     cmakeFlags = [

pkgs/paraver/default.nix

@@ -1,5 +1,4 @@
-{
+{ stdenv
-  stdenv
 , fetchFromGitHub
 , autoreconfHook
 , boost
@@ -12,14 +11,17 @@
 , openssl
 , glibcLocales
 , wrapGAppsHook
+
+, enableDebug ? false
 }:
 
 let
   wx = wxGTK32;
-in
-stdenv.mkDerivation rec {
-  pname = "wxparaver";
   version = "4.12.0";
+in
+stdenv.mkDerivation {
+  pname = "wxparaver";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "bsc-performance-tools";
@@ -36,21 +38,26 @@ stdenv.mkDerivation rec {
     ./fix-boost-87.patch
   ];
 
-  hardeningDisable = [ "all" ];
-
   # Fix the PARAVER_HOME variable
   postPatch = ''
     sed -i 's@^PARAVER_HOME=.*$@PARAVER_HOME='$out'@g' docs/wxparaver
     sed -i '1aexport LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"' docs/wxparaver
   '';
 
-  dontStrip = true;
   enableParallelBuilding = true;
 
-  preConfigure = ''
+  hardeningDisable = [ "all" ];
-    export CFLAGS="-O3"
+
-    export CXXFLAGS="-O3"
+  dontStrip = true;
-  '';
+
+  env =
+    let
+      flags = if enableDebug then "-ggdb -Og" else "-O3";
+    in
+    {
+      CFLAGS = flags;
+      CXXFLAGS = flags;
+    };
 
   configureFlags = [
     "--with-boost=${boost}"
@@ -68,11 +75,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     boost
-    libxml2.dev
+    libxml2
     xml2
     wx
     paraverKernel
-    openssl.dev
+    openssl
   ];
 
   postInstall = ''

pkgs/paraver/kernel.nix

@@ -1,5 +1,4 @@
-{
+{ stdenv
-  stdenv
 , fetchFromGitHub
 , autoreconfHook
 , boost
@@ -9,11 +8,16 @@
 , automake
 , pkg-config
 , zlib
+
+, enableDebug ? false
 }:
 
-stdenv.mkDerivation rec {
+let
-  pname = "paraver-kernel";
   version = "4.12.0";
+in
+stdenv.mkDerivation {
+  pname = "paraver-kernel";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "bsc-performance-tools";
@@ -34,10 +38,14 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
 
-  preConfigure = ''
+  env =
-    export CFLAGS="-O3 -DPARALLEL_ENABLED"
+    let
-    export CXXFLAGS="-O3 -DPARALLEL_ENABLED"
+      flags = "-DPARALLEL_ENABLED " + (if enableDebug then "-ggdb -Og" else "-O3");
-  '';
+    in
+    {
+      CFLAGS = flags;
+      CXXFLAGS = flags;
+    };
 
   configureFlags = [
     "--with-boost=${boost}"

pkgs/sonar/default.nix

@@ -18,12 +18,8 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "all" ];
   dontStrip = true;
   configureFlags = [ "--with-ovni=${ovni}" ];
-
-  nativeBuildInputs = [
-    autoreconfHook
-  ];
-
   buildInputs = [
+    autoreconfHook
     ovni
     mpi
   ];

pkgs/tampi/default.nix

@@ -8,6 +8,7 @@
 , gnumake
 , boost
 , mpi
+, gcc
 , autoreconfHook
 , enableOvni ? true
 , ovni ? null
@@ -40,23 +41,20 @@ let
     };
   };
   source = if (useGit) then git else release;
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
   pname = "tampi";
   inherit (source) src version;
   enableParallelBuilding = true;
   separateDebugInfo = true;
-
-  nativeBuildInputs = [
-    autoconf
-    automake
-    autoreconfHook
-    gnumake
-    libtool
-  ];
-
   buildInputs = [
+    autoreconfHook
+    automake
+    autoconf
+    libtool
+    gnumake
     boost
     mpi
+    gcc
   ] ++ optional (enableOvni) ovni;
   configureFlags = optional (enableOvni) "--with-ovni=${ovni}";
   dontDisableStatic = true;