Disable test for SYCL Intel 2023

New apt list does not have Package: as the first entry for all packages

pkgs/tasycl/default.nix

@@ -1,32 +1,36 @@
-{
+{ stdenv
-  lib,
+, lib
-  stdenv,
+, withCFlags
-  autoconf,
+, intelPackages
-  automake,
+, fetchFromGitHub
-  autoreconfHook,
+, automake
-  boost,
+, autoconf
-  fetchFromGitHub,
+, libtool
-  gnumake,
+, gnumake
-  libtool,
+, autoreconfHook
-  withCFlags,
+, boost
+, adaptivecpp ? null
+, useIntel ? true
 
-  useIntel ? true,
+, useGit ? false
-  adaptivecpp ? null,
+, gitUrl ? "git@gitlab-internal.bsc.es:task-awareness/tasycl/tasycl.git"
-  intelPackages ? null,
+, gitBranch ? "main"
-
+, gitCommit ? "78f98dcf60a66e0eaa3b4ebcf55be076bec64825"
-  useGit ? false,
-  gitUrl ? "git@gitlab-internal.bsc.es:task-awareness/tasycl/tasycl.git",
-  gitBranch ? "main",
-  gitCommit ? "78f98dcf60a66e0eaa3b4ebcf55be076bec64825",
 }:
 
-assert !useIntel -> adaptivecpp != null;
+assert (useIntel || adaptivecpp != null);
-assert useIntel -> intelPackages != null;
 
 let
   variant = if useIntel then "intel" else "acpp";
 
-  syclStdenv = withCFlags [ "-O3" ] (if useIntel then intelPackages.stdenv else stdenv);
+  syclStdenv =
+    if useIntel then
+      # If we don't set optimization level, separateDebugInfo sets ggdb and
+      # intel disables all optimizations
+      withCFlags ["-O3"] intelPackages.stdenv
+    else
+      withCFlags [ "-L${adaptivecpp}/lib" "-lacpp-rt" "-I${adaptivecpp}/include" ] stdenv
+  ;
 
   release = rec {
     version = "2.1.0";
@@ -49,10 +53,14 @@ let
 
   source = if (useGit) then git else release;
 
+  isOldRelease = (!useGit && (builtins.compareVersions source.version "2.0.0" <= 0));
+
 in
 
+assert !isOldRelease || useIntel; # old releases only work with intel
+
 syclStdenv.mkDerivation {
-  pname = "tasycl-${variant}";
+  pname = "tasycl";
   inherit (source) src version;
 
   enableParallelBuilding = true;
@@ -70,9 +78,8 @@ syclStdenv.mkDerivation {
     boost
   ];
 
-  configureFlags = lib.optionals (!useIntel) [
+  # only needed for release versions prior or equal to 2.0.0
-    "CXX=${lib.getExe adaptivecpp}"
+  configureFlags = lib.optionals isOldRelease [ "--with-sycl-include=${intelPackages.icx.cc}/include/sycl" ];
-  ];
 
   # add symlinks so we can explicitly link with tasycl-intel / tasycl-acpp
   postInstall = ''