Add missing pre/postInstall hooks to intel 2023

overlay.nix

@@ -7,6 +7,33 @@ 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;
+    };
+
     agenix = prev.callPackage ./pkgs/agenix/default.nix { };
     amd-uprof = prev.callPackage ./pkgs/amd-uprof/default.nix { };
     bench6 = callPackage ./pkgs/bench6/default.nix { };
@@ -57,7 +84,6 @@ let
     stdenvClangOmpss2Nanos6 = final.stdenv.override { cc = final.clangOmpss2Nanos6; allowedRequisites = null; };
     stdenvClangOmpss2Nodes = final.stdenv.override { cc = final.clangOmpss2Nodes; allowedRequisites = null; };
     stdenvClangOmpss2NodesOmpv = final.stdenv.override { cc = final.clangOmpss2NodesOmpv; allowedRequisites = null; };
-    tacuda = callPackage ./pkgs/tacuda/default.nix { };
     tagaspi = callPackage ./pkgs/tagaspi/default.nix { };
     tampi = callPackage ./pkgs/tampi/default.nix { };
     upc-qaire-exporter = prev.callPackage ./pkgs/upc-qaire-exporter/default.nix { };

pkgs/intel-oneapi/2023.nix

@@ -50,11 +50,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
     '';
   };
 
@@ -88,11 +92,15 @@ 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
     '';
 
     inherit meta;
@@ -131,6 +139,8 @@ let
     phases = [ "installPhase" "fixupPhase" ];
     dontStrip = true;
     installPhase = ''
+      runHook preInstall
+
       mkdir -p $out/{bin,etc,lib,include}
       mkdir -p $out/share/man
 
@@ -147,6 +157,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
@@ -185,6 +197,8 @@ let
     autoPatchelfIgnoreMissingDeps = [ "libhwloc.so.5" ];
 
     installPhase = ''
+      runHook preInstall
+
       mkdir -p $out/lib
 
       cd $src
@@ -193,6 +207,8 @@ let
         # Libraries
         rsync -a lib/intel64/gcc4.8/ $out/lib/
       popd
+
+      runHook postInstall
     '';
 
     inherit meta;
@@ -228,6 +244,8 @@ let
     autoPatchelfIgnoreMissingDeps = [ "libsycl.so.6" ];
 
     installPhase = ''
+      runHook preInstall
+
       mkdir -p $out/{bin,lib,include}
       mkdir -p $out/share/man
 
@@ -252,6 +270,8 @@ let
           rsync -a compiler/include/ $out/include/
         popd
       popd
+
+      runHook postInstall
     '';
 
     inherit meta;
@@ -293,6 +313,8 @@ let
     dontStrip = true;
 
     installPhase = ''
+      runHook preInstall
+
       mkdir -p $out/{bin,lib,include}
       mkdir -p $out/share/man
 
@@ -318,7 +340,10 @@ let
 
         # Fix lib_lin
         ln -s $out/lib $out/lib_lin
+
       popd
+
+      runHook postInstall
     '';
 
     inherit meta;
@@ -381,6 +406,8 @@ let
     dontStrip = true;
 
     installPhase = ''
+      runHook preInstall
+
       mkdir -p $out/{bin,lib}
       mkdir -p $out/share/man
 
@@ -408,6 +435,8 @@ let
         # Manuals
         rsync -a documentation/en/man/common/ $out/share/man/
       popd
+
+      runHook postInstall
     '';
 
     inherit meta;

pkgs/tacuda/default.nix

@@ -1,68 +0,0 @@
-{ stdenv
-, fetchFromGitHub
-, automake
-, autoconf
-, libtool
-, gnumake
-, autoreconfHook
-, boost
-, cudaPackages
-
-, useGit ? false
-, gitUrl ? "git@gitlab-internal.bsc.es:task-awareness/tacuda/tacuda.git"
-, gitBranch ? "main"
-, gitCommit ? "35234f9445e6149a2bd38d119841e2485d6ee05e"
-}:
-
-let
-
-  release_ver = "2.1.0";
-  release = {
-    version = release_ver;
-    src = fetchFromGitHub {
-      owner = "bsc-pm";
-      repo = "tacuda";
-      rev = release_ver;
-      hash = "sha256-Cj3EiLVJSLvRv0ydeg7Vp4SpkniEqHkcWF+YOJQ8EcM=";
-    };
-  };
-
-  git = rec {
-    version = src.shortRev;
-    src = builtins.fetchGit {
-      url = gitUrl;
-      ref = gitBranch;
-      rev = gitCommit;
-    };
-  };
-
-  source = if (useGit) then git else release;
-
-in
-
-stdenv.mkDerivation {
-  pname = "tacuda";
-  inherit (source) src version;
-
-  enableParallelBuilding = true;
-  separateDebugInfo = true;
-
-  nativeBuildInputs = [
-    autoreconfHook
-    automake
-    autoconf
-    libtool
-    gnumake
-  ];
-
-  patches = [ ./fix_config.patch ];
-
-  configureFlags = [ "--with-cuda-include=${cudaPackages.cudatoolkit}/include" ];
-
-  buildInputs = [
-    boost
-    cudaPackages.libcublas
-    cudaPackages.cuda_cudart
-  ];
-
-}

pkgs/tacuda/fix_config.patch

@@ -1,13 +0,0 @@
-diff --git a/m4/cuda.m4 b/m4/cuda.m4
-index 23f5c94..8f9b534 100644
---- a/m4/cuda.m4
-+++ b/m4/cuda.m4
-@@ -40,7 +40,7 @@ search_libs="cuda cublas cudart"
- required_libs=""
- 
- m4_foreach([function],
--           [cuInit,
-+           [
- 	    cublasSgemm,
-             cudaStreamCreate,
-             cudaLaunchKernel,