From 16999590ce0cb09df693fe0d2470153c86d27d5f Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Mon, 3 Jun 2024 21:48:42 +0300 Subject: [PATCH] opencl-info: drop Upstream has been abandoned and unmaintained for 11 years. opencl-clhpp updates are causing build failures which need vendored patches. --- pkgs/tools/system/opencl-info/default.nix | 38 ------------------- .../opencl-info/opencl-info-clhpp2.diff | 22 ----------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 pkgs/tools/system/opencl-info/default.nix delete mode 100644 pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff diff --git a/pkgs/tools/system/opencl-info/default.nix b/pkgs/tools/system/opencl-info/default.nix deleted file mode 100644 index 7396e67087b1..000000000000 --- a/pkgs/tools/system/opencl-info/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, opencl-clhpp, ocl-icd }: - -stdenv.mkDerivation { - pname = "opencl-info"; - version = "unstable-2014-02-21"; - - src = fetchFromGitHub { - owner = "marchv"; - repo = "opencl-info"; - rev = "3e53d001a98978feb865650cf0e93b045400c0d7"; - sha256 = "114lxgnjg40ivjjszkv4n3f3yq2lbrvywryvbazf20kqmdz7315l"; - }; - - patches = [ - # The cl.hpp header was removed from opencl-clhpp. This patch - # updates opencl-info to use the new cp2.hpp header. - # - # Submitted upstream: https://github.com/marchv/opencl-info/pull/2 - ./opencl-info-clhpp2.diff - ]; - - buildInputs = [ opencl-clhpp ocl-icd ]; - - NIX_LDFLAGS = "-lOpenCL"; - - installPhase = '' - install -Dm755 opencl-info $out/bin/opencl-info - ''; - - meta = with lib; { - description = "Tool to dump OpenCL platform/device information"; - homepage = "https://github.com/marchv/opencl-info"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - mainProgram = "opencl-info"; - }; -} diff --git a/pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff b/pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff deleted file mode 100644 index 013222beebf7..000000000000 --- a/pkgs/tools/system/opencl-info/opencl-info-clhpp2.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/opencl-info.cpp b/opencl-info.cpp -index a23015d..a6de0c1 100644 ---- a/opencl-info.cpp -+++ b/opencl-info.cpp -@@ -7,7 +7,7 @@ - #if defined(__APPLE__) || defined(__MACOSX) - # include - #else --# include -+# include - #endif - - #include -@@ -130,7 +130,7 @@ int main() { - PconstEnd; - P(device, CL_DEVICE_LOCAL_MEM_SIZE); - Pbool(device, CL_DEVICE_ERROR_CORRECTION_SUPPORT); -- Pbool(device, CL_DEVICE_HOST_UNIFIED_MEMORY); -+ // Pbool(device, CL_DEVICE_HOST_UNIFIED_MEMORY); /* Deprecated in 2.0 */ - P(device, CL_DEVICE_PROFILING_TIMER_RESOLUTION); - Pbool(device, CL_DEVICE_ENDIAN_LITTLE); - Pbool(device, CL_DEVICE_AVAILABLE); diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 58afce07bdcc..bba9374aec5e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -958,6 +958,7 @@ mapAliases ({ openapi-generator-cli-unstable = throw "openapi-generator-cli-unstable was removed as it was not being updated; consider openapi-generator-cli instead"; # Added 2024-01-02 openbangla-keyboard = throw "openbangla-keyboard has been replaced by ibus-engines.openbangla-keyboard and fcitx5-openbangla-keyboard"; # added 2023-10-10 opencascade = throw "'opencascade' has been removed as it is unmaintained; consider opencascade-occt instead'"; # Added 2023-09-18 + opencl-info = throw "opencl-info has been removed, as the upstream is unmaintained; consider using 'clinfo' instead"; # Added 2024-06-12 openconnect_head = openconnect_unstable; # Added 2022-03-29 openconnect_gnutls = openconnect; # Added 2022-03-29 openconnect_unstable = throw "openconnect_unstable was removed from nixpkgs as it was not being updated"; # Added 2023-06-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0def6bf6c19..c4072d608272 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11241,8 +11241,6 @@ with pkgs; opencc = callPackage ../tools/text/opencc { }; - opencl-info = callPackage ../tools/system/opencl-info { }; - opencryptoki = callPackage ../tools/security/opencryptoki { }; opendbx = callPackage ../development/libraries/opendbx { };