Add missing pre/postInstall hooks to intel 2023

Even if we do an override to papi get the proper configure flags for
cross-compiling, the memory fences are not defined for risc-v:

mb.h:67:2: error: #error Need to define rmb for this architecture!

.gitea/workflows/ci.yaml

@@ -0,0 +1,15 @@
+name: CI
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:all:
+    runs-on: native
+    steps:
+      - uses: https://gitea.com/ScMi1/checkout@v1.4
+      - run: nix build -L --no-link --print-out-paths .#bsc-ci.all

flake.nix

@@ -17,11 +17,7 @@
       legacyPackages.${system} = pkgs;
 
       hydraJobs = {
-        inherit (self.legacyPackages.${system}.bsc-ci) test pkgs;
-
-        cross = self.lib.genAttrs [ "riscv64" ] (target:
-          self.legacyPackages.${system}.pkgsCross.${target}.bsc-ci.pkgs
-        );
+        inherit (self.legacyPackages.${system}.bsc-ci) tests pkgs cross;
       };
 
       # propagate nixpkgs lib, so we can do bscpkgs.lib

overlay.nix

@@ -6,10 +6,34 @@ with final.lib;
 let
   callPackage = final.callPackage;
 
-  mkDeps = name: pkgs: final.runCommand name { }
-    "printf '%s\n' ${toString (collect (x: x ? outPath) pkgs)} > $out";
-
   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;
+    };
+
     bench6 = callPackage ./pkgs/bench6/default.nix { };
     bigotes = callPackage ./pkgs/bigotes/default.nix { };
     clangOmpss2 = callPackage ./pkgs/llvm-ompss2/default.nix { };
@@ -49,6 +73,65 @@ let
     wxparaver = callPackage ./pkgs/paraver/default.nix { };
   };
 
+  tests = rec {
+    #hwloc = callPackage ./test/bugs/hwloc.nix { }; # Broken, no /sys
+    #sigsegv = callPackage ./test/reproducers/sigsegv.nix { };
+    hello-c = callPackage ./test/compilers/hello-c.nix { };
+    hello-cpp = callPackage ./test/compilers/hello-cpp.nix { };
+    lto = callPackage ./test/compilers/lto.nix { };
+    asan = callPackage ./test/compilers/asan.nix { };
+    intel2023-icx-c   = hello-c.override   { stdenv = final.intelPackages_2023.stdenv; };
+    intel2023-icc-c   = hello-c.override   { stdenv = final.intelPackages_2023.stdenv-icc; };
+    intel2023-icx-cpp = hello-cpp.override { stdenv = final.intelPackages_2023.stdenv; };
+    intel2023-icc-cpp = hello-cpp.override { stdenv = final.intelPackages_2023.stdenv-icc; };
+    intel2023-ifort   = callPackage ./test/compilers/hello-f.nix {
+      stdenv = final.intelPackages_2023.stdenv-ifort;
+    };
+    clangOmpss2-lto   = lto.override       { stdenv = final.stdenvClangOmpss2Nanos6; };
+    clangOmpss2-asan  = asan.override      { stdenv = final.stdenvClangOmpss2Nanos6; };
+    clangOmpss2-task  = callPackage ./test/compilers/ompss2.nix {
+      stdenv = final.stdenvClangOmpss2Nanos6;
+    };
+    clangNodes-task = callPackage ./test/compilers/ompss2.nix {
+      stdenv = final.stdenvClangOmpss2Nodes;
+    };
+    clangNosvOpenmp-task = callPackage ./test/compilers/clang-openmp.nix {
+      stdenv = final.stdenvClangOmpss2Nodes;
+    };
+    clangNosvOmpv-nosv = callPackage ./test/compilers/clang-openmp-nosv.nix {
+      stdenv = final.stdenvClangOmpss2NodesOmpv;
+    };
+    clangNosvOmpv-ld = callPackage ./test/compilers/clang-openmp-ld.nix {
+      stdenv = final.stdenvClangOmpss2NodesOmpv;
+    };
+  };
+
+  pkgs = filterAttrs (_: isDerivation) bscPkgs;
+
+  crossTargets = [ "riscv64" ];
+  cross = prev.lib.genAttrs crossTargets (target:
+    final.pkgsCross.${target}.bsc-ci.pkgs
+  );
+
+  buildList = name: paths:
+    final.runCommandLocal name { } ''
+      printf '%s\n' ${toString paths} | tee $out
+    '';
+
+  buildList' = name: paths:
+    final.runCommandLocal name { } ''
+      deps="${toString paths}"
+      cat $deps
+      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 ];
+
 in bscPkgs // {
 
  lib = prev.lib // {
@@ -60,52 +143,9 @@ in bscPkgs // {
 
   # Internal for our CI tests
   bsc-ci = {
-    test = rec {
-      #hwloc = callPackage ./test/bugs/hwloc.nix { }; # Broken, no /sys
-      #sigsegv = callPackage ./test/reproducers/sigsegv.nix { };
-      hello-c = callPackage ./test/compilers/hello-c.nix { };
-      hello-cpp = callPackage ./test/compilers/hello-cpp.nix { };
-      lto = callPackage ./test/compilers/lto.nix { };
-      asan = callPackage ./test/compilers/asan.nix { };
-      intel2023-icx-c   = hello-c.override   { stdenv = final.intelPackages_2023.stdenv; };
-      intel2023-icc-c   = hello-c.override   { stdenv = final.intelPackages_2023.stdenv-icc; };
-      intel2023-icx-cpp = hello-cpp.override { stdenv = final.intelPackages_2023.stdenv; };
-      intel2023-icc-cpp = hello-cpp.override { stdenv = final.intelPackages_2023.stdenv-icc; };
-      intel2023-ifort   = callPackage ./test/compilers/hello-f.nix {
-        stdenv = final.intelPackages_2023.stdenv-ifort;
-      };
-      clangOmpss2-lto   = lto.override       { stdenv = final.stdenvClangOmpss2Nanos6; };
-      clangOmpss2-asan  = asan.override      { stdenv = final.stdenvClangOmpss2Nanos6; };
-      clangOmpss2-task  = callPackage ./test/compilers/ompss2.nix {
-        stdenv = final.stdenvClangOmpss2Nanos6;
-      };
-      clangNodes-task = callPackage ./test/compilers/ompss2.nix {
-        stdenv = final.stdenvClangOmpss2Nodes;
-      };
-      clangNosvOpenmp-task = callPackage ./test/compilers/clang-openmp.nix {
-        stdenv = final.stdenvClangOmpss2Nodes;
-      };
-      clangNosvOmpv-nosv = callPackage ./test/compilers/clang-openmp-nosv.nix {
-        stdenv = final.stdenvClangOmpss2NodesOmpv;
-      };
-      clangNosvOmpv-ld = callPackage ./test/compilers/clang-openmp-ld.nix {
-        stdenv = final.stdenvClangOmpss2NodesOmpv;
-      };
-    };
-
-    pkgs = filterAttrs (_: isDerivation) bscPkgs;
-
-    pkgsList = final.runCommand "ci-pkgs" { }
-      "printf '%s\n' ${toString (collect isDerivation bscPkgs)} > $out";
-
-    tests = final.runCommand "ci-tests" { }
-      "printf '%s\n' ${toString (collect isDerivation final.bsc-ci.test)} > $out";
-
-    all = final.runCommand "ci-all" { }
-    ''
-      deps="${toString [ final.bsc-ci.pkgsList final.bsc-ci.tests ]}"
-      cat $deps
-      printf '%s\n' $deps > $out
-    '';
+    inherit pkgs pkgsList;
+    inherit tests testList;
+    inherit cross crossList;
+    inherit all;
   };
 }

pkgs/intel-oneapi/2023.nix

@@ -43,11 +43,15 @@ 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
     '';
   };
 
@@ -81,12 +85,23 @@ 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:
@@ -122,6 +137,8 @@ let
     phases = [ "installPhase" "fixupPhase" ];
     dontStrip = true;
     installPhase = ''
+      runHook preInstall
+
       mkdir -p $out/{bin,etc,lib,include}
       mkdir -p $out/share/man
 
@@ -138,6 +155,8 @@ 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
@@ -145,6 +164,13 @@ 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 {
@@ -174,6 +200,8 @@ let
     autoPatchelfIgnoreMissingDeps = [ "libhwloc.so.5" ];
 
     installPhase = ''
+      runHook preInstall
+
       mkdir -p $out/lib
 
       cd $src
@@ -182,7 +210,16 @@ 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 {
@@ -215,6 +252,8 @@ let
     autoPatchelfIgnoreMissingDeps = [ "libsycl.so.6" ];
 
     installPhase = ''
+      runHook preInstall
+
       mkdir -p $out/{bin,lib,include}
       mkdir -p $out/share/man
 
@@ -239,7 +278,16 @@ let
           rsync -a compiler/include/ $out/include/
         popd
       popd
+
+      runHook postInstall
     '';
+
+    meta = {
+      description = "";
+      homepage = "";
+      license = lib.licenses.unfree;
+      maintainers = with lib.maintainers; [  ];
+    };
   };
 
 
@@ -278,6 +326,8 @@ let
     dontStrip = true;
 
     installPhase = ''
+      runHook preInstall
+
       mkdir -p $out/{bin,lib,include}
       mkdir -p $out/share/man
 
@@ -303,8 +353,18 @@ 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 {
@@ -364,6 +424,8 @@ let
     dontStrip = true;
 
     installPhase = ''
+      runHook preInstall
+
       mkdir -p $out/{bin,lib}
       mkdir -p $out/share/man
 
@@ -391,7 +453,16 @@ 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 ? "" }: