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 { };
@@ -48,7 +75,6 @@ let
     ovni = callPackage ./pkgs/ovni/default.nix { };
     ovniGit = final.ovni.override { useGit = true; };
     paraverKernel = callPackage ./pkgs/paraver/kernel.nix { };
-    pocl = callPackage ./pkgs/pocl/default.nix { };
     prometheus-slurm-exporter = prev.callPackage ./pkgs/slurm-exporter/default.nix { };
     #pscom = callPackage ./pkgs/parastation/pscom.nix { }; # Unmaintaned
     #psmpi = callPackage ./pkgs/parastation/psmpi.nix { }; # Unmaintaned
@@ -95,8 +121,6 @@ let
     clangNosvOmpv-ld = callPackage ./test/compilers/clang-openmp-ld.nix {
       stdenv = final.stdenvClangOmpss2NodesOmpv;
     };
-
-    pocl = callPackage ./test/compilers/pocl.nix { };
   };
 
   # For now, only build toplevel packages in CI/Hydra

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/pocl/0001-cmake-do-not-use-suffix.patch

@@ -1,26 +0,0 @@
-From ccf301659caac9b5e973ba1f2d32352acf617a98 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Aleix=20Bon=C3=A9?= <aleix.boneribo@bsc.es>
-Date: Tue, 2 Jul 2024 16:45:05 +0200
-Subject: [PATCH] cmake: do not use suffix
-
----
- cmake/LLVM.cmake                              |  3 ++
- 1 files changed, 3 insertions(+)
-
-diff --git a/cmake/LLVM.cmake b/cmake/LLVM.cmake
-index f4dbda065..e29144dce 100644
---- a/cmake/LLVM.cmake
-+++ b/cmake/LLVM.cmake
-@@ -65,6 +65,9 @@ else()
-     message(WARNING "Cannot determine llvm binary suffix from ${LLVM_CONFIG}")
-   endif()
-   message(STATUS "LLVM binaries suffix : ${LLVM_BINARY_SUFFIX}")
-+
-+  # We don't want suffixes in nix
-+  set(LLVM_BINARY_SUFFIX "")
- endif()
- 
- get_filename_component(LLVM_CONFIG_LOCATION "${LLVM_CONFIG}" DIRECTORY)
--- 
-2.45.1
-

pkgs/pocl/0001-cmake-native-build-tools.patch

@@ -1,33 +0,0 @@
-From f24b456c50f587b05cc8f2699c94d8cdefc5b13e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Aleix=20Bon=C3=A9?= <aleix.boneribo@bsc.es>
-Date: Tue, 2 Jul 2024 17:11:11 +0200
-Subject: [PATCH] cmake: native build tools
-
----
- cmake/LLVM.cmake                    |   7 +-
- 1 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/LLVM.cmake b/cmake/LLVM.cmake
-index e29144dce..b9f14ce6a 100644
---- a/cmake/LLVM.cmake
-+++ b/cmake/LLVM.cmake
-@@ -269,10 +269,15 @@ endforeach()
- 
- ####################################################################
- 
-+if(DEFINED LLVM_NATIVE_TOOL_DIR)
-+  set(TOOL_DIR "${LLVM_NATIVE_TOOL_DIR}")
-+  message(STATUS "TOOL_DIR=${TOOL_DIR}")
-+endif()
-+
- macro(find_program_or_die OUTPUT_VAR PROG_NAME DOCSTRING)
-   find_program(${OUTPUT_VAR}
-     NAMES "${PROG_NAME}${LLVM_BINARY_SUFFIX}${CMAKE_EXECUTABLE_SUFFIX}"
--    HINTS "${LLVM_BINDIR}" "${LLVM_CONFIG_LOCATION}"
-+    HINTS "${TOOL_DIR}" "${LLVM_BINDIR}" "${LLVM_CONFIG_LOCATION}"
-     DOC "${DOCSTRING}"
-     NO_CMAKE_PATH
-     NO_CMAKE_ENVIRONMENT_PATH
--- 
-2.45.1
-

pkgs/pocl/0001-cmake-use-clang-from-cmake-variable.patch

@@ -1,48 +0,0 @@
-From 4688b5ce895761c884ae15fc0234ed8d623b988b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Aleix=20Bon=C3=A9?= <aleix.boneribo@bsc.es>
-Date: Tue, 2 Jul 2024 15:41:47 +0200
-Subject: [PATCH] cmake: use clang from cmake variable
-
----
- cmake/LLVM.cmake | 22 ++++++++++++++++++++--
- 1 file changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/LLVM.cmake b/cmake/LLVM.cmake
-index 71b786dc7..f4dbda065 100644
---- a/cmake/LLVM.cmake
-+++ b/cmake/LLVM.cmake
-@@ -281,11 +281,29 @@ macro(find_program_or_die OUTPUT_VAR PROG_NAME DOCSTRING)
-   endif()
- endmacro()
- 
--find_program_or_die( CLANG "clang" "clang binary")
-+# -DCMAKE_C_COMPILER=riscv64-unknown-linux-gnu-clang -DCMAKE_CXX_COMPILER=riscv64-unknown-linux-gnu-clang++
-+
-+# if(DEFINED CLANG_EXECUTABLE)
-+if(DEFINED CMAKE_C_COMPILER)
-+  # set(CLANG "${CLANG_EXECUTABLE}")
-+  set(CLANG "${CMAKE_C_COMPILER}")
-+  message(STATUS "Using CLANG_EXECUTABLE: ${CLANG}")
-+else()
-+  find_program_or_die( CLANG "clang" "clang binary")
-+endif()
- execute_process(COMMAND "${CLANG}" "--version" OUTPUT_VARIABLE LLVM_CLANG_VERSION RESULT_VARIABLE CLANG_RES)
-+
- # TODO this should be optional
--find_program_or_die( CLANGXX "clang++" "clang++ binary")
-+# if(DEFINED CLANGXX_EXECUTABLE)
-+if(DEFINED CMAKE_CXX_COMPILER)
-+  # set(CLANGXX "${CLANGXX_EXECUTABLE}")
-+  set(CLANGXX "${CMAKE_CXX_COMPILER}")
-+  message(STATUS "Using CLANGXX_EXECUTABLE: ${CLANGXX}")
-+else()
-+  find_program_or_die( CLANGXX "clang++" "clang++ binary")
-+endif()
- execute_process(COMMAND "${CLANGXX}" "--version" OUTPUT_VARIABLE LLVM_CLANGXX_VERSION RESULT_VARIABLE CLANGXX_RES)
-+
- if(CLANGXX_RES OR CLANG_RES)
-   message(FATAL_ERROR "Failed running clang/clang++ --version")
- endif()
--- 
-2.45.1
-

pkgs/pocl/default.nix

@@ -1,226 +0,0 @@
-{ lib
-, llvmPackages
-, ninja
-, cmake
-, hwloc
-, ocl-icd
-, opencl-headers
-, getconf
-, pkg-config
-, spirv-llvm-translator
-, spirv-tools
-, libxml2  # required for statically linked llvm
-, python3
-, writableTmpDirAsHomeHook
-
-, fetchFromGitHub
-
-, useGit ? false
-, gitUrl ? "git@gitlab-internal.bsc.es:task-awareness/pocl/pocl.git"
-, gitBranch ? "new-device"
-, gitCommit ? "dd10c2221b31223cbb796182df6a07f11c7541f5"
-
-, staticLLVM ? true
-, enableICD ? true
-, enableSPIRV ? true
-, enableHWLOC ? true
-, enableRemoteServer ? false
-, enableRemoteClient ? false
-, enableDistroVariants ? false
-
-, lttng-ust
-, enableLTTNG ? false
-
-, tbb
-, enableTBB ? false
-
-, nosv ? null
-, ovni ? null
-, enableNOSV ? useGit
-, enableOVNI ? useGit
-
-, buildPackages
-, nix-update-script
-}:
-
-let
-
-  release = rec {
-    version = "7.1";
-    src = fetchFromGitHub {
-      owner = "pocl";
-      repo = "pocl";
-      tag = "v${version}";
-      hash = "sha256-bS6vTIjLO7YLs7qYLKW0cYYbEJ/hRS/+IjjAKbkj8ac=";
-    };
-  };
-
-  git = rec {
-    version = src.shortRev;
-    src = builtins.fetchGit {
-      url = gitUrl;
-      ref = gitBranch;
-      rev = gitCommit;
-    };
-  };
-
-  source = if (useGit) then git else release;
-
-  stdenv = llvmPackages.stdenv;
-
-  buildLlvmPackages = buildPackages.llvmPackages;
-
-  isCross = stdenv.hostPlatform != stdenv.buildPlatform;
-
-  featureList = lib.concatStringsSep "+" (
-    (lib.optionals enableICD ["icd"]) ++
-    (lib.optionals enableNOSV ["nosv"]) ++
-    (lib.optionals enableOVNI ["ovni"]) ++
-    (lib.optionals enableSPIRV ["spirv"]) ++
-    (lib.optionals enableTBB ["tbb"]) ++
-    (lib.optionals enableRemoteClient ["server"]) ++
-    (lib.optionals enableRemoteServer ["client"])
-  );
-in
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "pocl";
-  version = featureList + "-" + source.version;
-  inherit (source) src;
-
-  patches = lib.optionals useGit [
-    ./0001-cmake-use-clang-from-cmake-variable.patch
-    ./0001-cmake-do-not-use-suffix.patch
-    ./0001-cmake-native-build-tools.patch
-  ];
-
-  cmakeFlags = [
-    (lib.cmakeOptionType "filepath" "WITH_LLVM_CONFIG"    (lib.getExe' buildLlvmPackages.llvm.dev     "llvm-config"))
-    (lib.cmakeOptionType "filepath" "CLANG"               (lib.getExe' buildLlvmPackages.clangUseLLVM "clang"))
-    (lib.cmakeOptionType "filepath" "CLANGXX"             (lib.getExe' buildLlvmPackages.clangUseLLVM "clang++"))
-    (lib.cmakeOptionType "path"     "CLANG_RESOURCE_DIR" "${llvmPackages.stdenv.cc}/resource-root")
-
-    (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
-
-    (lib.cmakeBool "ENABLE_RELOCATION"    true)
-    (lib.cmakeBool "ENABLE_POCL_BUILDING"   true)
-    (lib.cmakeBool "POCL_ICD_ABSOLUTE_PATH" true)
-
-    (lib.cmakeBool "ENABLE_TBB_DEVICE" enableTBB)
-    (lib.cmakeBool "ENABLE_ICD"        enableICD)
-    (lib.cmakeBool "ENABLE_HWLOC"      enableHWLOC)
-    (lib.cmakeBool "ENABLE_LTTNG"      enableLTTNG)
-
-    (lib.cmakeBool "ENABLE_REMOTE_CLIENT" enableRemoteClient)
-    (lib.cmakeBool "ENABLE_REMOTE_SERVER" enableRemoteServer)
-
-    # avoid the runtime linker pulling in a different llvm e.g. from graphics drivers
-    (lib.cmakeBool "STATIC_LLVM" staticLLVM)
-  ] ++ lib.optionals (enableNOSV || enableOVNI) [
-    (lib.cmakeBool "ENABLE_NOSV"       enableNOSV)
-    (lib.cmakeBool "ENABLE_OVNI"       enableOVNI)
-  ] ++ lib.optionals (!isCross && enableDistroVariants) [
-    (lib.cmakeFeature "KERNELLIB_HOST_CPU_VARIANTS" "distro") # TODO: check if we can do it when cross compiling
-  ] ++ lib.optionals isCross [
-    (lib.cmakeFeature "CMAKE_SYSTEM_NAME" "Linux")
-    (lib.cmakeFeature "CMAKE_FIND_ROOT_PATH_MODE_PROGRAM" "NEVER")
-    (lib.cmakeFeature "CMAKE_FIND_ROOT_PATH_MODE_LIBRARY" "ONLY")
-    (lib.cmakeFeature "CMAKE_FIND_ROOT_PATH_MODE_INCLUDE" "ONLY")
-    (lib.cmakeFeature "CMAKE_FIND_ROOT_PATH_MODE_PACKAGE" "ONLY")
-  ] ++ lib.optionals stdenv.hostPlatform.isRiscV [
-    (lib.cmakeFeature "LLC_TRIPLE"       "riscv64-unknown-linux-gnu")
-    (lib.cmakeFeature "LLC_HOST_CPU"     "rv64g")
-    (lib.cmakeFeature "CLANG_MARCH_FLAG" "-march=")
-  ];
-
-  # Fixes error: ld: cannot find -lgcc / -lgcc_s when linking from libpocl on
-  # host
-  preConfigure = ''
-    cmakeFlagsArray+=(
-      -DEXTRA_HOST_LD_FLAGS="${lib.escapeShellArg (builtins.readFile "${stdenv.cc}/nix-support/cc-ldflags")}"
-      -DEXTRA_KERNEL_FLAGS="${lib.escapeShellArg (builtins.readFile "${stdenv.cc}/nix-support/cc-ldflags")}"
-    )
-  '' + lib.optionalString stdenv.hostPlatform.isRiscV ''
-     cmakeFlagsArray+=(
-      -DEXTRA_HOST_LLC_FLAGS=${lib.escapeShellArg ([
-        "-march=rv64g"
-        "-mcpu=sifive-u74"
-      ])}
-      -DEXTRA_HOST_CLANG_FLAGS=${lib.escapeShellArg ([
-        "-mabi=lp64d"
-        "-march=rv64g"
-        "-mcpu=sifive-u74"
-        "-mtune=sifive-7-series"
-      ])}
-    )
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    getconf
-    ninja
-    pkg-config
-    python3
-  ];
-
-  buildInputs = [
-    opencl-headers
-    llvmPackages.libclang
-    llvmPackages.llvm
-  ] ++ lib.optionals staticLLVM [ libxml2 ]
-  ++ lib.optionals enableNOSV   [ nosv ]
-  ++ lib.optionals enableOVNI   [ ovni ]
-  ++ lib.optionals enableHWLOC  [ hwloc ]
-  ++ lib.optionals enableTBB    [ tbb ]
-  ++ lib.optionals enableICD    [ ocl-icd ]
-  ++ lib.optionals enableLTTNG  [ lttng-ust ]
-  ++ lib.optionals enableSPIRV  [
-    (spirv-llvm-translator.override { inherit (llvmPackages) llvm; })
-    spirv-tools
-  ];
-
-  nativeInstallCheckInputs = [
-    writableTmpDirAsHomeHook
-  ];
-
-  doInstallCheck = true;
-
-  installCheckPhase = lib.optionalString enableICD ''
-    runHook preInstallCheck
-
-    export OCL_ICD_VENDORS=$out/etc/OpenCL/vendors
-    $out/bin/poclcc -o poclcc.cl.pocl $src/examples/poclcc/poclcc.cl
-
-    runHook postInstallCheck
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  passthru = {
-    updateScript = nix-update-script { };
-    git = finalAttrs.finalPackage.override { useGit = true; };
-    test = finalAttrs.finalPackage.overrideAttrs { doCheck = true; };
-  };
-
-  requiredSystemFeatures = lib.optionals (finalAttrs.finalPackage.doCheck && enableHWLOC) [ "sys-devices" ];
-
-  preCheck = ''
-    export POCL_DEBUG=error,warn
-    export NIX_DEBUG=1
-  '';
-
-  propagatedBuildInputs = [ stdenv.cc.cc ];
-
-  meta = with lib; {
-    description = "A portable open source (MIT-licensed) implementation of the OpenCL standard";
-    homepage = "http://portablecl.org";
-    license = licenses.mit;
-    maintainers = with maintainers; [
-      leixb
-      jansol
-      xddxdd
-      bsc.maintainers.leixb
-    ];
-    platforms = platforms.linux ++ platforms.darwin;
-  };
-})

pkgs/pocl/setup-hook.sh

@@ -1,6 +0,0 @@
-preCheckHooks+=('setupPoclCheck')
-preInstallCheckHooks+=('setupPoclCheck')
-
-setupPoclCheck () {
-  export OCL_ICD_VENDORS="@out@/etc/OpenCL/vendors"
-}

test/compilers/pocl.nix

@@ -1,26 +0,0 @@
-{
-  runCommand,
-  pocl,
-  clinfo,
-  writableTmpDirAsHomeHook,
-}:
-
-runCommand "clinfo-pocl"
-  {
-    nativeBuildInputs = [
-      clinfo
-      writableTmpDirAsHomeHook
-    ];
-
-    requiredSystemFeatures = [ "sys-devices" ];
-
-    env = {
-      POCL_DEBUG = "error,warn";
-      OCL_ICD_VENDORS = "${pocl}/etc/OpenCL/vendors";
-    };
-  }
-  ''
-    set -x
-    clinfo | tee $out
-    set +x
-  ''