Use standard gcc for intel packages

See: dc2e7bea50

.gitea/workflows/ci.yaml

@@ -12,4 +12,9 @@ jobs:
     runs-on: native
     steps:
       - uses: https://gitea.com/ScMi1/checkout@v1.4
-      - run: nix build -L --no-link --print-out-paths .#bsc-ci.all
+      - run: nix build -L --no-link --print-out-paths .#bsc.ci.all
+  build:cross:
+    runs-on: native
+    steps:
+      - uses: https://gitea.com/ScMi1/checkout@v1.4
+      - run: nix build -L --no-link --print-out-paths .#bsc.ci.cross

doc/maintainers.md

@@ -0,0 +1,30 @@
+# Maintainers
+
+## Role of a maintainer
+The responsibilities of maintainers are quite lax, and similar in spirit to
+[nixpkgs' maintainers][1]:
+
+    The main responsibility of a maintainer is to keep the packages they
+    maintain in a functioning state, and keep up with updates. In order to do
+    that, they are empowered to make decisions over the packages they maintain.
+
+    That being said, the maintainer is not alone in proposing changes to the
+    packages. Anybody (both bots and humans) can send PRs to bump or tweak the
+    package.
+
+In practice, this means that when updating or proposing changes to a package,
+we will notify maintainers by mentioning them in Gitea so they can test changes
+and give feedback.
+
+Since we do bi-yearly release cycles, there is no expectation from maintainers
+to update packages at each upstream release. Nevertheless, on each release cycle
+we may request help from maintainers when updating or testing their packages.
+
+## Becoming a maintainer
+
+
+You'll have to add yourself in the `maintainers.nix` list; your username should
+match your `bsc.es` email. Then you can add yourself to the `meta.maintainers`
+of any package you are interested in maintaining.
+
+[1]: [https://github.com/NixOS/nixpkgs/tree/nixos-25.05/maintainers]

flake.lock

@@ -68,11 +68,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1752436162,
-        "narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=",
+        "lastModified": 1760139962,
+        "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8",
+        "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4",
         "type": "github"
       },
       "original": {

flake.nix

@@ -42,13 +42,13 @@ in
     # full nixpkgs with our overlay applied
     legacyPackages.${system} = pkgs;
 
-    hydraJobs = {
-      inherit (self.legacyPackages.${system}.bsc-ci) tests pkgs cross;
-    };
+    hydraJobs = self.legacyPackages.${system}.bsc.hydraJobs;
 
     # propagate nixpkgs lib, so we can do bscpkgs.lib
     lib = nixpkgs.lib // {
-      bsc.maintainers = import ./maintainers/maintainer-list.nix;
+      maintainers = nixpkgs.lib.maintainers // {
+        bsc = import ./pkgs/maintainers.nix;
+      };
     };
   };
 }

overlay.nix

@@ -7,33 +7,6 @@ let
   callPackage = final.callPackage;
 
   bscPkgs = {
-
-    # override stdenv to add a sentinel to know if a derivation comes
-    # from unfree sources.
-    stdenv = prev.stdenv // {
-      mkDerivation =
-        args:
-        let
-          originalDrv = prev.stdenv.mkDerivation args;
-          checkLicense = l: if builtins.isAttrs l then !(l.free or true) else false;
-
-          licenses = if builtins.isList args.meta.license then args.meta.license else [ args.meta.license ];
-
-          hasUnfreeLicense =
-            if args ? meta && args.meta ? license then builtins.any checkLicense licenses else false;
-        in
-        if hasUnfreeLicense then
-          builtins.traceVerbose "adding nix-support/private to ${originalDrv.name or originalDrv.pname}" (
-          originalDrv.overrideAttrs (old: {
-            postInstall = (old.postInstall or "") + ''
-              mkdir -p $out/nix-support
-              touch $out/nix-support/private
-            '';
-          }))
-        else
-          originalDrv;
-    };
-
     amd-uprof = prev.callPackage ./pkgs/amd-uprof/default.nix { };
     bench6 = callPackage ./pkgs/bench6/default.nix { };
     bigotes = callPackage ./pkgs/bigotes/default.nix { };
@@ -121,12 +94,18 @@ let
     };
   };
 
-  pkgs = filterAttrs (_: isDerivation) bscPkgs;
+  # For now, only build toplevel packages in CI/Hydra
+  pkgsTopLevel = filterAttrs (_: isDerivation) bscPkgs;
 
-  crossTargets = [ "riscv64" ];
-  cross = prev.lib.genAttrs crossTargets (target:
-    final.pkgsCross.${target}.bsc-ci.pkgs
-  );
+  # Native build in that platform doesn't imply cross build works
+  canCrossCompile = platform: pkg:
+    (isDerivation pkg) &&
+    # Must be defined explicitly
+    (pkg.meta.cross or false) &&
+    (meta.availableOn platform pkg);
+
+  # For now only RISC-V
+  crossSet = { riscv64 = final.pkgsCross.riscv64.bsc.pkgsTopLevel; };
 
   buildList = name: paths:
     final.runCommandLocal name { } ''
@@ -140,27 +119,38 @@ let
       printf '%s\n' $deps >$out
     '';
 
-  crossList = builtins.mapAttrs (t: v: buildList t (builtins.attrValues v)) cross;
-
-  pkgsList = buildList "ci-pkgs" (builtins.attrValues pkgs);
-  testList = buildList "ci-tests" (collect isDerivation tests);
-
-  all = buildList' "ci-all" [ pkgsList testList ];
+  pkgsList = buildList "ci-pkgs" (builtins.attrValues pkgsTopLevel);
+  testsList = buildList "ci-tests" (collect isDerivation tests);
+  allList = buildList' "ci-all" [ pkgsList testsList ];
+  # For now only RISC-V
+  crossList = buildList "ci-cross"
+    (filter
+      (canCrossCompile final.pkgsCross.riscv64.stdenv.hostPlatform)
+        (builtins.attrValues crossSet.riscv64));
 
 in bscPkgs // {
 
- lib = prev.lib // {
-   bsc.maintainers = import ./maintainers/maintainer-list.nix;
- };
+  lib = prev.lib // {
+    maintainers = prev.lib.maintainers // {
+      bsc = import ./pkgs/maintainers.nix;
+    };
+  };
 
-  # Prevent accidental usage of bsc attribute
-  bsc = throw "the bsc attribute is deprecated, packages are now in the root";
+  # Prevent accidental usage of bsc-ci attribute
+  bsc-ci = throw "the bsc-ci attribute is deprecated, use bsc.ci";
 
   # Internal for our CI tests
-  bsc-ci = {
-    inherit pkgs pkgsList;
-    inherit tests testList;
-    inherit cross crossList;
-    inherit all;
+  bsc = {
+    # CI targets for nix build
+    ci = { pkgs = pkgsList; tests = testsList; all = allList; cross = crossList; };
+
+    # Direct access to package sets
+    tests = tests;
+    pkgs = bscPkgs;
+    pkgsTopLevel = pkgsTopLevel;
+    cross = crossSet;
+
+    # Hydra uses attribute sets of pkgs
+    hydraJobs = { tests = tests; pkgs = pkgsTopLevel; cross = crossSet; };
   };
 }

pkgs/amd-uprof/default.nix

@@ -86,4 +86,13 @@ in
       patchelf --add-needed libnuma.so $out/bin/AMDuProfPcm
       set +x
     '';
+
+    meta = {
+      description = "Performance analysis tool-suite for x86 based applications";
+      homepage = "https://www.amd.com/es/developer/uprof.html";
+      platforms = lib.platforms.linux;
+      license = lib.licenses.unfree;
+      maintainers = with lib.maintainers.bsc; [ rarias varcila ];
+    };
+
   }

pkgs/amd-uprof/driver.nix

@@ -29,5 +29,7 @@ in stdenv.mkDerivation {
     description = "AMD Power Profiler Driver";
     homepage = "https://www.amd.com/es/developer/uprof.html";
     platforms = lib.platforms.linux;
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers.bsc; [ rarias varcila ];
   };
 }

pkgs/bench6/default.nix

@@ -60,11 +60,11 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "all" ];
   dontStrip = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.pm.bsc.es/rarias/bench6";
     description = "Set of micro-benchmarks for OmpSs-2 and several mini-apps";
-    maintainers = with maintainers.bsc; [ rarias ];
-    platforms = platforms.linux;
-    license = licenses.gpl3;
+    maintainers = with lib.maintainers.bsc; [ rarias ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Plus;
   };
 }

pkgs/bigotes/default.nix

@@ -16,11 +16,11 @@ stdenv.mkDerivation {
   };
   nativeBuildInputs = [ cmake ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/rodarima/bigotes";
     description = "Versatile benchmark tool";
-    maintainers = with maintainers.bsc; [ rarias ];
-    platforms = platforms.linux;
-    license = licenses.gpl3;
+    maintainers = with lib.maintainers.bsc; [ rarias ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Plus;
   };
 }

pkgs/extrae/default.nix

@@ -112,11 +112,12 @@ stdenv.mkDerivation rec {
 #    else []
 #  );
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/bsc-performance-tools/extrae";
     description = "Instrumentation framework to generate execution traces of the most used parallel runtimes";
-    maintainers = with maintainers.bsc; [ rarias ];
-    platforms = platforms.linux;
-    license = licenses.lgpl21Plus;
+    maintainers = [ ];
+    broken = true;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.lgpl21Plus;
   };
 }

pkgs/gpi-2/default.nix

@@ -54,11 +54,11 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "all" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://pm.bsc.es/gitlab/interoperability/extern/GPI-2";
     description = "GPI-2 extended for supporting Task-Aware GASPI (TAGASPI) library";
-    maintainers = with maintainers.bsc; [ rarias ];
-    platforms = platforms.linux;
-    license = licenses.gpl3;
+    maintainers = with lib.maintainers.bsc; [ rarias ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Plus;
   };
 }

pkgs/intel-compiler/icc2020.nix

@@ -61,11 +61,11 @@ stdenv.mkDerivation rec {
     popd
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.intel.com/content/www/us/en/developer/tools/overview.html";
     description = "Intel compiler";
-    maintainers = with maintainers.bsc; [ rarias ];
-    platforms = platforms.linux;
-    license = licenses.unfree;
+    maintainers = with lib.maintainers.bsc; [ rarias ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.unfree;
   };
 }

pkgs/intel-compiler/icc2021.nix

@@ -145,12 +145,12 @@ in
       popd
     '';
 
-    meta = with lib; {
+    meta = {
       homepage = "https://www.intel.com/content/www/us/en/developer/tools/overview.html";
       description = "Intel compiler";
-      maintainers = with maintainers.bsc; [ rarias ];
-      platforms = platforms.linux;
-      license = licenses.unfree;
+      maintainers = with lib.maintainers.bsc; [ rarias ];
+      platforms = lib.platforms.linux;
+      license = lib.licenses.unfree;
     };
 
   }

pkgs/intel-mpi/default.nix

@@ -103,11 +103,11 @@ stdenv.mkDerivation rec {
     echo "Patched RPATH in libfabric.so to: $(patchelf --print-rpath $out/lib/libfabric.so)"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.intel.com/content/www/us/en/developer/tools/overview.html";
-    description = "Intel compiler";
-    maintainers = with maintainers.bsc; [ rarias ];
-    platforms = platforms.linux;
-    license = licenses.unfree;
+    description = "Intel MPI";
+    maintainers = with lib.maintainers.bsc; [ rarias ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.unfree;
   };
 }

pkgs/intel-oneapi/2023.nix

@@ -10,7 +10,7 @@
 , zlib
 , autoPatchelfHook
 , libfabric
-, gcc13
+, gcc
 , wrapCCWith
 }:
 
@@ -26,7 +26,12 @@
 
 let
 
-  gcc = gcc13;
+  meta = {
+    description = "Intel oneapi hpckit package component";
+    homepage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/hpc-toolkit-download.html";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers.bsc; [ abonerib ];
+  };
 
   v = {
     hpckit   = "2023.1.0";
@@ -43,15 +48,11 @@ let
     ];
     phases = [ "installPhase" ];
     installPhase = ''
-      runHook preInstall
-
       awk -F': ' '\
         BEGIN   { print "[ {" } \
         NR>1 && /^Package: / { print "} {"; } \
         /: /    { printf "%s = \"%s\";\n", $1, $2 } \
         END     { print "} ]" }' $srcs > $out
-
-      runHook postInstall
     '';
   };
 
@@ -85,23 +86,14 @@ let
     nativeBuildInputs = [ dpkg ];
     phases = [ "installPhase" ];
     installPhase = ''
-      runHook preInstall
-
       mkdir -p $out
       for src in $srcs; do
         echo "unpacking $src"
         dpkg -x $src $out
       done
-
-      runHook postInstall
     '';
 
-    meta = {
-      description = "";
-      homepage = "";
-      license = lib.licenses.unfree;
-      maintainers = with lib.maintainers; [  ];
-    };
+    inherit meta;
   };
 
   joinDebs = name: names:
@@ -137,8 +129,6 @@ let
     phases = [ "installPhase" "fixupPhase" ];
     dontStrip = true;
     installPhase = ''
-      runHook preInstall
-
       mkdir -p $out/{bin,etc,lib,include}
       mkdir -p $out/share/man
 
@@ -155,8 +145,6 @@ let
         # Broken due missing libze_loader.so.1
         rsync -a --exclude IMB-MPI1-GPU bin/ $out/bin/
       popd
-
-      runHook postInstall
     '';
     preFixup = ''
       for i in $out/bin/mpi* ; do
@@ -165,12 +153,7 @@ let
       done
     '';
 
-    meta = {
-      description = "";
-      homepage = "";
-      license = lib.licenses.unfree;
-      maintainers = with lib.maintainers; [  ];
-    };
+    inherit meta;
   };
 
   intel-tbb = stdenv.mkDerivation rec {
@@ -200,8 +183,6 @@ let
     autoPatchelfIgnoreMissingDeps = [ "libhwloc.so.5" ];
 
     installPhase = ''
-      runHook preInstall
-
       mkdir -p $out/lib
 
       cd $src
@@ -210,16 +191,9 @@ let
         # Libraries
         rsync -a lib/intel64/gcc4.8/ $out/lib/
       popd
-
-      runHook postInstall
     '';
 
-    meta = {
-      description = "";
-      homepage = "";
-      license = lib.licenses.unfree;
-      maintainers = with lib.maintainers; [  ];
-    };
+    inherit meta;
   };
 
   intel-compiler-shared = stdenv.mkDerivation rec {
@@ -252,8 +226,6 @@ let
     autoPatchelfIgnoreMissingDeps = [ "libsycl.so.6" ];
 
     installPhase = ''
-      runHook preInstall
-
       mkdir -p $out/{bin,lib,include}
       mkdir -p $out/share/man
 
@@ -278,16 +250,9 @@ let
           rsync -a compiler/include/ $out/include/
         popd
       popd
-
-      runHook postInstall
     '';
 
-    meta = {
-      description = "";
-      homepage = "";
-      license = lib.licenses.unfree;
-      maintainers = with lib.maintainers; [  ];
-    };
+    inherit meta;
   };
 
 
@@ -326,8 +291,6 @@ let
     dontStrip = true;
 
     installPhase = ''
-      runHook preInstall
-
       mkdir -p $out/{bin,lib,include}
       mkdir -p $out/share/man
 
@@ -353,18 +316,10 @@ let
 
         # Fix lib_lin
         ln -s $out/lib $out/lib_lin
-
       popd
-
-      runHook postInstall
     '';
 
-    meta = {
-      description = "";
-      homepage = "";
-      license = lib.licenses.unfree;
-      maintainers = with lib.maintainers; [  ];
-    };
+    inherit meta;
   };
 
   intel-compiler = stdenv.mkDerivation rec {
@@ -424,8 +379,6 @@ let
     dontStrip = true;
 
     installPhase = ''
-      runHook preInstall
-
       mkdir -p $out/{bin,lib}
       mkdir -p $out/share/man
 
@@ -453,16 +406,9 @@ let
         # Manuals
         rsync -a documentation/en/man/common/ $out/share/man/
       popd
-
-      runHook postInstall
     '';
 
-    meta = {
-      description = "";
-      homepage = "";
-      license = lib.licenses.unfree;
-      maintainers = with lib.maintainers; [  ];
-    };
+    inherit meta;
   };
 
   wrapIntel = { cc, mygcc, extraBuild ? "", extraInstall ? "" }:

pkgs/llvm-ompss2/clang.nix

@@ -126,4 +126,12 @@ in stdenv.mkDerivation {
 # nanos6 installation, but this is would require a recompilation of clang each
 # time nanos6 is changed. Better to use the environment variable NANOS6_HOME,
 # and specify nanos6 at run time.
+
+  meta = {
+    homepage = "https://gitlab.pm.bsc.es/llvm-ompss/llvm-mono";
+    description = "C language family frontend for LLVM (for OmpSs-2)";
+    maintainers = with lib.maintainers.bsc; [ rpenacob ];
+    platforms = lib.platforms.linux;
+    license = [ lib.licenses.asl20 lib.licenses.llvm-exception ];
+  };
 }

pkgs/llvm-ompss2/openmp.nix

@@ -74,5 +74,13 @@ stdenv.mkDerivation rec {
   passthru = {
     inherit nosv;
   };
+
+  meta = {
+    homepage = "https://gitlab.pm.bsc.es/llvm-ompss/llvm-mono";
+    description = "Support for the OpenMP language (with nOS-V)";
+    maintainers = with lib.maintainers.bsc; [ rpenacob ];
+    platforms = lib.platforms.linux;
+    license = [ lib.licenses.asl20 lib.licenses.llvm-exception ];
+  };
 }
 

pkgs/lmbench/default.nix

@@ -42,8 +42,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "lmbench";
-    homepage = "http://www.bitmover.com/lmbench/";
-    maintainers = [ ];
+    homepage = "https://github.com/intel/lmbench";
+    maintainers = with lib.maintainers.bsc; [ rarias ];
     platforms = lib.platforms.all;
+    license = lib.licenses.gpl2Plus;
   };
 }

pkgs/maintainers.nix

@@ -3,4 +3,5 @@ builtins.mapAttrs (name: value: { email = name + "@bsc.es"; } // value) {
   arocanon.name = "Aleix Roca";
   rarias.name = "Rodrigo Arias";
   rpenacob.name = "Raúl Peñacoba";
+  varcila.name = "Vincent Arcila";
 }

pkgs/mcxx/default.nix

@@ -64,11 +64,11 @@ stdenv.mkDerivation rec {
 #    "--enable-bison-regeneration"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/bsc-pm/mcxx";
     description = "C/C++/Fortran source-to-source compilation infrastructure aimed at fast prototyping";
-    maintainers = with maintainers.bsc; [ rpenacob ];
-    platforms = platforms.linux;
-    license = licenses.gpl3Plus;
+    maintainers = with lib.maintainers.bsc; [ rpenacob ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Plus;
   };
 }

pkgs/mcxx/git.nix

@@ -59,11 +59,11 @@ stdenv.mkDerivation rec {
 #    "--enable-bison-regeneration"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/bsc-pm/mcxx";
     description = "C/C++/Fortran source-to-source compilation infrastructure aimed at fast prototyping";
-    maintainers = with maintainers.bsc; [ rpenacob ];
-    platforms = platforms.linux;
-    license = licenses.gpl3Plus;
+    maintainers = with lib.maintainers.bsc; [ rpenacob ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Plus;
   };
 }

pkgs/mcxx/rarias.nix

@@ -58,11 +58,11 @@ stdenv.mkDerivation rec {
   #  make generate_builtins_ia32 GXX_X86_BUILTINS=${gcc}/bin/g++
   #'';
   #
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/bsc-pm/mcxx";
     description = "C/C++/Fortran source-to-source compilation infrastructure aimed at fast prototyping";
-    maintainers = with maintainers.bsc; [ rarias ];
-    platforms = platforms.linux;
-    license = licenses.gpl3Plus;
+    maintainers = with lib.maintainers.bsc; [ rarias ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Plus;
   };
 }

pkgs/nanos6/default.nix

@@ -119,12 +119,12 @@ in
       echo "export NANOS6_HOME=$out" >> $out/nix-support/setup-hook
     '';
 
-    meta = with lib; {
+    meta = {
       homepage = "https://github.com/bsc-pm/nanos6";
       description = "Nanos6 runtime for OmpSs-2" +
         optionalString (enableDebug) " (with debug symbols)";
-      maintainers = with maintainers.bsc; [ rarias ];
-      platforms = platforms.linux;
-      license = licenses.gpl3;
+      maintainers = with lib.maintainers.bsc; [ rarias ];
+      platforms = lib.platforms.linux;
+      license = lib.licenses.gpl3Plus;
     };
   })

pkgs/nix-wrap/default.nix

@@ -88,12 +88,13 @@ stdenv.mkDerivation rec {
     cp ${nix_conf} $out/share/nix.conf
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = null;
     description = "nix bubblewrap wrapper";
-    maintainers = with maintainers.bsc; [ rarias ];
-    platforms = platforms.linux;
-    license = licenses.gpl3Plus; # TODO: license?
+    maintainers = [ ];
+    broken = true;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
   };
 }
 

pkgs/nixtools/default.nix

@@ -17,11 +17,10 @@ stdenv.mkDerivation rec {
   preBuild = "env";
   dontPatchShebangs = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.pm.bsc.es/rarias/nixtools";
     description = "nix bubblewrap wrapper";
-    maintainers = with maintainers.bsc; [ rarias ];
-    platforms = platforms.linux;
-    license = licenses.gpl3Plus; # TODO: license?
+    maintainers = with lib.maintainers.bsc; [ rarias ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/nodes/default.nix

@@ -82,11 +82,11 @@ in
       inherit nosv;
     };
 
-    meta = with lib; {
+    meta = {
       homepage = "https://gitlab.bsc.es/nos-v/nodes";
       description = "Runtime library designed to work on top of the nOS-V runtime";
-      maintainers = with maintainers.bsc; [ rarias ];
-      platforms = platforms.linux;
-      license = licenses.gpl3Plus;
+      maintainers = with lib.maintainers.bsc; [ abonerib rarias ];
+      platforms = lib.platforms.linux;
+      license = lib.licenses.gpl3Plus;
     };
   }

pkgs/nosv/default.nix

@@ -60,11 +60,11 @@ in
       ovni
     ] ++ lib.optionals enablePapi [ papi ];
 
-    meta = with lib; {
+    meta = {
       homepage = "https://gitlab.bsc.es/nos-v/nos-v";
       description = "Tasking library enables the co-execution of multiple applications with system-wide scheduling and a centralized management of resources";
-      maintainers = with maintainers.bsc; [ abonerib ];
-      platforms = platforms.linux;
-      license = licenses.gpl3Plus;
+      maintainers = with lib.maintainers.bsc; [ abonerib rarias ];
+      platforms = lib.platforms.linux;
+      license = lib.licenses.gpl3Plus;
     };
   }

pkgs/ovni/default.nix

@@ -56,11 +56,12 @@ in
     checkTarget = "test";
     hardeningDisable = [ "all" ];
 
-    meta = with lib; {
+    meta = {
       homepage = "https://ovni.readthedocs.io";
       description = "Obtuse but Versatile Nanoscale Instrumentation";
-      maintainers = with maintainers.bsc; [ rarias ];
-      platforms = platforms.linux;
-      license = licenses.gpl3Plus;
+      maintainers = with lib.maintainers.bsc; [ rarias ];
+      platforms = lib.platforms.linux;
+      license = lib.licenses.gpl3Plus;
+      cross = true;
     };
   }

pkgs/paraver/default.nix

@@ -90,11 +90,17 @@ stdenv.mkDerivation rec {
     mv $out/share/doc/wxparaver_help_contents/man $out/share/man/man1
   '';
 
-  meta = with lib; {
-    homepage = "https://github.com/bsc-performance-tools/wxparaver";
-    description = "Trace-based visualization and analysis tool designed to study quantitative detailed metrics and obtain qualitative knowledge of the performance of applications, libraries, processors and whole architectures";
-    maintainers = with maintainers.bsc; [ rarias ];
-    platforms = platforms.linux;
-    license = licenses.lgpl21Plus;
+  meta = {
+    homepage = "https://tools.bsc.es/paraver";
+    downloadPage = "https://github.com/bsc-performance-tools/wxparaver";
+    description = "Performance analyzer based on event traces";
+    longDescription = ''
+      Trace-based visualization and analysis tool designed to study quantitative
+      detailed metrics and obtain qualitative knowledge of the performance of
+      applications, libraries, processors and whole architectures
+    '';
+    maintainers = with lib.maintainers.bsc; [ rarias ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.lgpl21Plus;
   };
 }

pkgs/paraver/kernel.nix

@@ -1,5 +1,6 @@
 {
   stdenv
+, lib
 , fetchFromGitHub
 , autoreconfHook
 , boost
@@ -57,4 +58,13 @@ stdenv.mkDerivation rec {
     xml2
     zlib
   ];
+
+  meta = {
+    homepage = "https://tools.bsc.es/paraver";
+    downloadPage = "https://github.com/bsc-performance-tools/paraver-kernel";
+    description = "Kernel library used by wxparaver";
+    maintainers = with lib.maintainers.bsc; [ rarias ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.lgpl21Plus;
+  };
 }

pkgs/sonar/default.nix

@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
     mpi
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/bsc-pm/sonar";
     description = "Set of runtime libraries which instrument parallel programming models through the ovni instrumentation library";
-    maintainers = with maintainers.bsc; [ rarias ];
-    platforms = platforms.linux;
-    license = licenses.mit;
+    maintainers = with lib.maintainers.bsc; [ rarias ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
   };
 }

pkgs/tagaspi/default.nix

@@ -57,11 +57,11 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "all" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/bsc-pm/tagaspi";
     description = "Task-Aware GASPI";
-    maintainers = with maintainers.bsc; [ rarias ];
-    platforms = platforms.linux;
-    license = licenses.gpl3Plus;
+    maintainers = with lib.maintainers.bsc; [ rarias ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Plus;
   };
 }

pkgs/tampi/default.nix

@@ -62,11 +62,11 @@ in stdenv.mkDerivation {
   dontDisableStatic = true;
   hardeningDisable = [ "all" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/bsc-pm/tampi";
     description = "Task-Aware MPI";
-    maintainers = with maintainers.bsc; [ rarias ];
-    platforms = platforms.linux;
-    license = licenses.gpl3Plus;
+    maintainers = with lib.maintainers.bsc; [ rarias ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Plus;
   };
 }