From 4f2f7d9a67b021ef837be6844320e3734051084a Mon Sep 17 00:00:00 2001 From: Justin Restivo Date: Sat, 20 Dec 2025 12:22:59 -0500 Subject: [PATCH] computecpp: drop --- .../co/computecpp-unwrapped/package.nix | 59 ------------------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 18 ------ 3 files changed, 2 insertions(+), 77 deletions(-) delete mode 100644 pkgs/by-name/co/computecpp-unwrapped/package.nix diff --git a/pkgs/by-name/co/computecpp-unwrapped/package.nix b/pkgs/by-name/co/computecpp-unwrapped/package.nix deleted file mode 100644 index c439bedca109..000000000000 --- a/pkgs/by-name/co/computecpp-unwrapped/package.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - lib, - stdenv, - fetchzip, - pkg-config, - autoPatchelfHook, - installShellFiles, - ocl-icd, - zlib, -}: - -stdenv.mkDerivation rec { - pname = "computecpp"; - version = "2.11.0"; - - src = fetchzip { - url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/x86_64-linux-gnu.tar.gz"; - hash = "sha256-xHOPuijx5TZeHzRHPXcll0WqoBzHBryIoe3BnOxBVVY="; - stripRoot = true; - }; - - dontStrip = true; - - buildInputs = [ - (lib.getLib stdenv.cc.cc) - ocl-icd - zlib - ]; - nativeBuildInputs = [ - autoPatchelfHook - pkg-config - installShellFiles - ]; - - installPhase = '' - runHook preInstall - - find ./lib -type f -exec install -D -m 0755 {} -t $out/lib \; - find ./bin -type l -exec install -D -m 0755 {} -t $out/bin \; - find ./bin -type f -exec install -D -m 0755 {} -t $out/bin \; - find ./doc -type f -exec install -D -m 0644 {} -t $out/doc \; - find ./include -type f -exec install -D -m 0644 {} -t $out/include \; - - runHook postInstall - ''; - - passthru = { - isClang = true; - }; - - meta = { - description = "Accelerate Complex C++ Applications on Heterogeneous Compute Systems using Open Standards"; - homepage = "https://www.codeplay.com/products/computesuite/computecpp"; - license = lib.licenses.unfree; - maintainers = [ ]; - platforms = [ "x86_64-linux" ]; - sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 72e4fdf67493..ac706d5fc41a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -453,6 +453,8 @@ mapAliases { collada2gltf = throw "collada2gltf has been removed from Nixpkgs, as it has been unmaintained upstream for 5 years and does not build with supported GCC versions"; # Addd 2025-08-08 colloid-kde = throw "'colloid-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 colorstorm = throw "'colorstorm' has been removed because it was unmaintained in nixpkgs and upstream was rewritten."; # Added 2025-06-15 + computecpp = throw "'computecpp' has been removed because its source has been pulled"; # Added 2025-12-20 + computecpp-unwrapped = throw "'computecpp-unwrapped' has been removed because its source has been pulled"; # Added 2025-12-20 conduwuit = throw "'conduwuit' has been removed as the upstream repository has been deleted. Consider migrating to 'matrix-conduit', 'matrix-continuwuity' or 'matrix-tuwunel' instead."; # Added 2025-08-08 cone = throw "cone has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48dc7cff6d71..9bf61c7ed3e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4234,24 +4234,6 @@ with pkgs; inherit (coqPackages_9_0) compcert; - computecpp = wrapCCWith rec { - cc = computecpp-unwrapped; - extraPackages = [ - llvmPackages.compiler-rt - ]; - extraBuildCommands = '' - wrap compute $wrapper $ccPath/compute - wrap compute++ $wrapper $ccPath/compute++ - export named_cc=compute - export named_cxx=compute++ - - rsrc="$out/resource-root" - mkdir -p "$rsrc/lib" - ln -s "${cc}/lib" "$rsrc/include" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - }; - corretto11 = javaPackages.compiler.corretto11; corretto17 = javaPackages.compiler.corretto17; corretto21 = javaPackages.compiler.corretto21;