flake.nix

@@ -47,8 +47,6 @@ in
     };
 
     # propagate nixpkgs lib, so we can do bscpkgs.lib
-    lib = nixpkgs.lib // {
-      bsc.maintainers = import ./maintainers/maintainer-list.nix;
-    };
+    inherit (nixpkgs) lib;
   };
 }

maintainers/maintainer-list.nix

@@ -1,6 +0,0 @@
-builtins.mapAttrs (name: value: { email = name + "@bsc.es"; } // value) {
-  abonerib.name = "Aleix Boné";
-  arocanon.name = "Aleix Roca";
-  rarias.name = "Rodrigo Arias";
-  rpenacob.name = "Raúl Peñacoba";
-}

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 { };
@@ -148,11 +121,6 @@ let
   all = buildList' "ci-all" [ pkgsList testList ];
 
 in bscPkgs // {
-
- lib = prev.lib // {
-   bsc.maintainers = import ./maintainers/maintainer-list.nix;
- };
-
   # Prevent accidental usage of bsc attribute
   bsc = throw "the bsc attribute is deprecated, packages are now in the root";
 

pkgs/bench6/default.nix

@@ -1,6 +1,5 @@
 {
   stdenv
-, lib
 , bigotes
 , cmake
 , clangOmpss2
@@ -59,12 +58,4 @@ stdenv.mkDerivation rec {
   ];
   hardeningDisable = [ "all" ];
   dontStrip = true;
-
-  meta = with lib; {
-    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;
-  };
 }

pkgs/bigotes/default.nix

@@ -1,6 +1,5 @@
 {
   stdenv
-, lib
 , fetchFromGitHub
 , cmake
 }:
@@ -15,12 +14,4 @@ stdenv.mkDerivation {
     sha256 = "sha256-ktxM3pXiL8YXSK+/IKWYadijhYXqGoLY6adLk36iigE=";
   };
   nativeBuildInputs = [ cmake ];
-
-  meta = with lib; {
-    homepage = "https://github.com/rodarima/bigotes";
-    description = "Versatile benchmark tool";
-    maintainers = with maintainers.bsc; [ rarias ];
-    platforms = platforms.linux;
-    license = licenses.gpl3;
-  };
 }

pkgs/extrae/default.nix

@@ -20,7 +20,6 @@
 #, python3Packages
 , installShellFiles
 , symlinkJoin
-, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
 }:
 
 let
@@ -88,7 +87,7 @@ stdenv.mkDerivation rec {
       --enable-sampling
       --with-unwind=${libunwind.dev}
       --with-xml-prefix=${libxml2.dev}
-      ${lib.optionalString enablePapi "--with-papi=${papi}"}
+      --with-papi=${papi}
       ${if (mpi != null) then ''--with-mpi=${mpi}''
         else ''--without-mpi''}
       --without-dyninst)
@@ -111,12 +110,4 @@ stdenv.mkDerivation rec {
 #    then [ "--enable-openmp" ]
 #    else []
 #  );
-
-  meta = with lib; {
-    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;
-  };
 }

pkgs/gpi-2/default.nix

@@ -1,6 +1,5 @@
 {
   stdenv
-, lib
 , fetchurl
 , symlinkJoin
 , slurm
@@ -53,12 +52,4 @@ stdenv.mkDerivation rec {
   buildInputs = [ slurm mpiAll rdma-core-all autoconf automake libtool rsync gfortran ];
 
   hardeningDisable = [ "all" ];
-
-  meta = with lib; {
-    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;
-  };
 }

pkgs/intel-compiler/icc2020.nix

@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , fetchurl
 , rpmextract
 , autoPatchelfHook
@@ -60,12 +59,4 @@ stdenv.mkDerivation rec {
       rm $out/lib/*.dbg
     popd
   '';
-
-  meta = with lib; {
-    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;
-  };
 }

pkgs/intel-compiler/icc2021.nix

@@ -145,12 +145,4 @@ in
       popd
     '';
 
-    meta = with lib; {
-      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;
-    };
-
   }

pkgs/intel-mpi/default.nix

@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , rpmextract
 , gcc
 , zlib
@@ -102,12 +101,4 @@ stdenv.mkDerivation rec {
     patchelf --set-rpath "$out/lib:${rdma-core}/lib:${libpsm2}/lib" $out/lib/libfabric.so
     echo "Patched RPATH in libfabric.so to: $(patchelf --print-rpath $out/lib/libfabric.so)"
   '';
-
-  meta = with lib; {
-    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;
-  };
 }

pkgs/intel-oneapi/2023.nix

@@ -43,15 +43,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 +81,12 @@ 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; [  ];
-    };
   };
 
   joinDebs = name: names:
@@ -137,8 +122,6 @@ let
     phases = [ "installPhase" "fixupPhase" ];
     dontStrip = true;
     installPhase = ''
-      runHook preInstall
-
       mkdir -p $out/{bin,etc,lib,include}
       mkdir -p $out/share/man
 
@@ -155,8 +138,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
@@ -164,13 +145,6 @@ let
         sed -i "s:I_MPI_SUBSTITUTE_INSTALLDIR:$out:g" "$i"
       done
     '';
-
-    meta = {
-      description = "";
-      homepage = "";
-      license = lib.licenses.unfree;
-      maintainers = with lib.maintainers; [  ];
-    };
   };
 
   intel-tbb = stdenv.mkDerivation rec {
@@ -200,8 +174,6 @@ let
     autoPatchelfIgnoreMissingDeps = [ "libhwloc.so.5" ];
 
     installPhase = ''
-      runHook preInstall
-
       mkdir -p $out/lib
 
       cd $src
@@ -210,16 +182,7 @@ let
         # Libraries
         rsync -a lib/intel64/gcc4.8/ $out/lib/
       popd
-
-      runHook postInstall
     '';
-
-    meta = {
-      description = "";
-      homepage = "";
-      license = lib.licenses.unfree;
-      maintainers = with lib.maintainers; [  ];
-    };
   };
 
   intel-compiler-shared = stdenv.mkDerivation rec {
@@ -252,8 +215,6 @@ let
     autoPatchelfIgnoreMissingDeps = [ "libsycl.so.6" ];
 
     installPhase = ''
-      runHook preInstall
-
       mkdir -p $out/{bin,lib,include}
       mkdir -p $out/share/man
 
@@ -278,16 +239,7 @@ let
           rsync -a compiler/include/ $out/include/
         popd
       popd
-
-      runHook postInstall
     '';
-
-    meta = {
-      description = "";
-      homepage = "";
-      license = lib.licenses.unfree;
-      maintainers = with lib.maintainers; [  ];
-    };
   };
 
 
@@ -326,8 +278,6 @@ let
     dontStrip = true;
 
     installPhase = ''
-      runHook preInstall
-
       mkdir -p $out/{bin,lib,include}
       mkdir -p $out/share/man
 
@@ -353,18 +303,8 @@ 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; [  ];
-    };
   };
 
   intel-compiler = stdenv.mkDerivation rec {
@@ -424,8 +364,6 @@ let
     dontStrip = true;
 
     installPhase = ''
-      runHook preInstall
-
       mkdir -p $out/{bin,lib}
       mkdir -p $out/share/man
 
@@ -453,16 +391,7 @@ 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; [  ];
-    };
   };
 
   wrapIntel = { cc, mygcc, extraBuild ? "", extraInstall ? "" }:

pkgs/lmbench/default.nix

@@ -35,8 +35,6 @@ stdenv.mkDerivation rec {
       CFLAGS=-Wno-implicit-int
       CPPFLAGS=-I${libtirpc.dev}/include/tirpc
       LDFLAGS=-ltirpc
-      CC=$CC
-      AR=$AR
     )
   '';
 

pkgs/mcxx/default.nix

@@ -1,6 +1,5 @@
 {
   stdenv
-, lib
 , fetchFromGitHub
 , autoreconfHook
 , nanos6
@@ -63,12 +62,4 @@ stdenv.mkDerivation rec {
 # Fails with "memory exhausted" with bison 3.7.1
 #    "--enable-bison-regeneration"
   ];
-
-  meta = with lib; {
-    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;
-  };
 }

pkgs/mcxx/git.nix

@@ -1,6 +1,5 @@
 {
   stdenv
-, lib
 , fetchFromGitHub
 , autoreconfHook
 , nanos6
@@ -58,12 +57,4 @@ stdenv.mkDerivation rec {
 # Fails with "memory exhausted" with bison 3.7.1
 #    "--enable-bison-regeneration"
   ];
-
-  meta = with lib; {
-    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;
-  };
 }

pkgs/mcxx/rarias.nix

@@ -1,5 +1,4 @@
 { stdenv
-, lib
 , fetchgit
 , autoreconfHook
 , nanos6
@@ -57,12 +56,4 @@ stdenv.mkDerivation rec {
   #preBuild = ''
   #  make generate_builtins_ia32 GXX_X86_BUILTINS=${gcc}/bin/g++
   #'';
-  #
-  meta = with lib; {
-    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;
-  };
 }

pkgs/mpich/default.nix

@@ -33,8 +33,4 @@ in mpich.overrideAttrs (old: {
     "FCFLAGS=-fallow-argument-mismatch"
   ];
   hardeningDisable = [ "all" ];
-
-  meta = old.meta // {
-    maintainers = old.meta.maintainers ++ (with lib.maintainers.bsc; [ rarias ]);
-  };
 })

pkgs/nanos6/default.nix

@@ -16,7 +16,6 @@
 , jemallocNanos6 ? null
 , cachelineBytes ? 64
 , enableGlibcxxDebug ? false
-, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
 , useGit ? false
 , gitUrl ? "ssh://git@bscpm04.bsc.es/nanos6/nanos6"
 , gitBranch ? "master"
@@ -48,8 +47,6 @@ let
   };
 
   source = if (useGit) then git else release;
-
-  isCross = stdenv.hostPlatform != stdenv.buildPlatform;
 in
   stdenv.mkDerivation (source // {
     pname = "nanos6";
@@ -74,13 +71,9 @@ in
       "--disable-all-instrumentations"
       "--enable-ovni-instrumentation"
       "--with-ovni=${ovni}"
-      "--with-boost=${boost.dev}"
     ] ++
       (optional enableJemalloc "--with-jemalloc=${jemallocNanos6}") ++
-      (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG") ++
-      # Most nanos6 api symbols are resolved at runtime, so prefer
-      # ifunc by default
-      (optional isCross "--with-symbol-resolution=ifunc");
+      (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG");
 
     postConfigure = lib.optionalString (!enableDebug) ''
       # Disable debug
@@ -104,14 +97,16 @@ in
       # TODO: papi_version is needed for configure:
       # ./configure: line 27378: papi_version: command not found
       # This probably breaks cross-compilation
-    ] ++ lib.optionals enablePapi [ papi ];
+      papi
+    ];
 
     buildInputs = [
       boost
       numactl
       hwloc
+      papi
       ovni
-    ] ++ lib.optionals enablePapi [ papi ];
+    ];
 
     # Create a script that sets NANOS6_HOME
     postInstall = ''
@@ -123,7 +118,6 @@ in
       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;
     };

pkgs/nanos6/jemalloc.nix

@@ -1,4 +1,4 @@
-{ jemalloc, lib }:
+{ jemalloc }:
 
 jemalloc.overrideAttrs (old: {
   configureFlags = old.configureFlags ++ [
@@ -8,6 +8,5 @@ jemalloc.overrideAttrs (old: {
   hardeningDisable = [ "all" ];
   meta = old.meta // {
     description = old.meta.description + " (for Nanos6)";
-    maintainers = (old.meta.maintainers or []) ++ (with lib.maintainers.bsc; [ rarias ]);
   };
 })

pkgs/nix-wrap/default.nix

@@ -1,6 +1,5 @@
 {
   stdenv
-, lib
 , bashInteractive
 , busybox
 , nix
@@ -87,13 +86,5 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share
     cp ${nix_conf} $out/share/nix.conf
   '';
-
-  meta = with lib; {
-    homepage = null;
-    description = "nix bubblewrap wrapper";
-    maintainers = with maintainers.bsc; [ rarias ];
-    platforms = platforms.linux;
-    license = licenses.gpl3Plus; # TODO: license?
-  };
 }
 

pkgs/nixtools/default.nix

@@ -1,6 +1,5 @@
 {
   stdenv
-, lib
 , glibc
 }:
 
@@ -16,12 +15,4 @@ stdenv.mkDerivation rec {
   makeFlags = [ "DESTDIR=$(out)" ];
   preBuild = "env";
   dontPatchShebangs = true;
-
-  meta = with lib; {
-    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?
-  };
 }

pkgs/nodes/default.nix

@@ -81,12 +81,4 @@ in
     passthru = {
       inherit nosv;
     };
-
-    meta = with lib; {
-      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;
-    };
   }

pkgs/nosv/default.nix

@@ -7,7 +7,7 @@
 , numactl
 , hwloc
 , papi
-, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
+, enablePapi ? true
 , cacheline ? 64 # bits
 , ovni ? null
 , useGit ? false
@@ -59,12 +59,4 @@ in
       hwloc
       ovni
     ] ++ lib.optionals enablePapi [ papi ];
-
-    meta = with lib; {
-      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;
-    };
   }

pkgs/ovni/default.nix

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

pkgs/paraver/default.nix

@@ -1,6 +1,5 @@
 {
   stdenv
-, lib
 , fetchFromGitHub
 , autoreconfHook
 , boost
@@ -89,12 +88,4 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/man
     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;
-  };
 }

pkgs/sonar/default.nix

@@ -1,6 +1,5 @@
 {
   stdenv
-, lib
 , autoreconfHook
 , fetchFromGitHub
 , ovni
@@ -28,12 +27,4 @@ stdenv.mkDerivation rec {
     ovni
     mpi
   ];
-
-  meta = with lib; {
-    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;
-  };
 }

pkgs/tagaspi/default.nix

@@ -1,6 +1,5 @@
 {
   stdenv
-, lib
 , fetchFromGitHub
 , automake
 , autoconf
@@ -56,12 +55,4 @@ stdenv.mkDerivation rec {
   ];
 
   hardeningDisable = [ "all" ];
-
-  meta = with lib; {
-    homepage = "https://github.com/bsc-pm/tagaspi";
-    description = "Task-Aware GASPI";
-    maintainers = with maintainers.bsc; [ rarias ];
-    platforms = platforms.linux;
-    license = licenses.gpl3Plus;
-  };
 }

pkgs/tampi/default.nix

@@ -61,12 +61,4 @@ in stdenv.mkDerivation {
   configureFlags = optional (enableOvni) "--with-ovni=${ovni}";
   dontDisableStatic = true;
   hardeningDisable = [ "all" ];
-
-  meta = with lib; {
-    homepage = "https://github.com/bsc-pm/tampi";
-    description = "Task-Aware MPI";
-    maintainers = with maintainers.bsc; [ rarias ];
-    platforms = platforms.linux;
-    license = licenses.gpl3Plus;
-  };
 }