From a2ded6ccbda4858e390d419513b93e77bc2070ff Mon Sep 17 00:00:00 2001 From: whispers Date: Wed, 2 Sep 2026 00:13:39 -0400 Subject: [PATCH] clblas: drop clblas' last commit upstream was march 2017, and it currently requires us to pin an old compiler version (llvm 19) on darwin. it does not seem particularly used (unmaintained in nixpkgs, only dependent is the old and now-removed clmagma), so let's simply remove it. --- pkgs/by-name/cl/clblas/package.nix | 83 --------------------------- pkgs/by-name/cl/clblas/platform.patch | 34 ----------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 117 deletions(-) delete mode 100644 pkgs/by-name/cl/clblas/package.nix delete mode 100644 pkgs/by-name/cl/clblas/platform.patch diff --git a/pkgs/by-name/cl/clblas/package.nix b/pkgs/by-name/cl/clblas/package.nix deleted file mode 100644 index f77834528d23..000000000000 --- a/pkgs/by-name/cl/clblas/package.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ - lib, - stdenv, - llvmPackages_19, - fetchFromGitHub, - fetchpatch, - cmake, - gfortran, - blas, - boost, - python3, - ocl-icd, - opencl-headers, -}: - -let - stdenv' = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv else stdenv; -in - -stdenv'.mkDerivation (finalAttrs: { - pname = "clblas"; - version = "2.12"; - - src = fetchFromGitHub { - owner = "clMathLibraries"; - repo = "clBLAS"; - tag = "v${finalAttrs.version}"; - hash = "sha256-Wq5oBl3TW3qpK0cyNWVgJMS5/s8xY1dulqDCkkX5lZQ="; - }; - - patches = [ - ./platform.patch - (fetchpatch { - url = "https://github.com/clMathLibraries/clBLAS/commit/68ce5f0b824d7cf9d71b09bb235cf219defcc7b4.patch"; - hash = "sha256-XoVcHgJ0kTPysZbM83mUX4/lvXVHKbl7s2Q8WWiUnMs="; - }) - ]; - - postPatch = '' - sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt - - substituteInPlace src/CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" - substituteInPlace src/library/tools/tplgen/CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" - ''; - - preConfigure = '' - cd src - ''; - - cmakeFlags = [ - "-DBUILD_TEST=OFF" - ]; - - nativeBuildInputs = [ - cmake - gfortran - python3 - ]; - buildInputs = [ - blas - boost - ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - ocl-icd - opencl-headers - ]; - - strictDeps = true; - - meta = { - homepage = "https://github.com/clMathLibraries/clBLAS"; - description = "Software library containing BLAS functions written in OpenCL"; - longDescription = '' - This package contains a library of BLAS functions on top of OpenCL. - ''; - license = lib.licenses.asl20; - maintainers = [ ]; - platforms = lib.platforms.unix; - }; - -}) diff --git a/pkgs/by-name/cl/clblas/platform.patch b/pkgs/by-name/cl/clblas/platform.patch deleted file mode 100644 index 87404a426a4b..000000000000 --- a/pkgs/by-name/cl/clblas/platform.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/library/tools/ktest/config.cpp b/src/library/tools/ktest/config.cpp -index 8b20128..faf9bde 100644 ---- a/src/library/tools/ktest/config.cpp -+++ b/src/library/tools/ktest/config.cpp -@@ -24,8 +24,6 @@ - - using namespace clMath; - --static const char DEFAULT_PLATFORM_NAME[] = "AMD Accelerated Parallel Processing"; -- - Config::Config() : - defaultConfig_(""), - cpp_("ktest.cpp"), -@@ -35,7 +33,10 @@ Config::Config() : - hasFuncID_(false), hasSubdims_(false), - skipAccuracy_(false) - { -- setPlatform(DEFAULT_PLATFORM_NAME); -+ platform_ = NULL; -+ setPlatform(""); -+ -+ device_ = NULL; - setDevice(""); - - memset(&kargs_, 0, sizeof(kargs_)); -@@ -262,7 +263,7 @@ Config::setPlatform(const std::string& name) - continue; - } - if (name.empty()) { -- found = (strcmp(pname, DEFAULT_PLATFORM_NAME) == 0); -+ found = true; - } - else { - found = (strcmp(pname, name.c_str()) == 0); diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0b78ef8b2e8e..1546f7b5cbe7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -560,6 +560,7 @@ mapAliases { classads = throw "'classads' has been removed, as it is unmaintained both upstream and in nixpkgs"; # Added 2026-06-27 claude-code-acp = warnAlias "'claude-code-acp' has been renamed to 'claude-agent-acp'" claude-agent-acp; # Added 2026-03-31 claude-code-bin = warnAlias "'claude-code-bin' has been merged into 'claude-code'" claude-code; # Added 2026-04-18 + clblas = throw "'clblas' has been removed as it was unmaintained upstream"; # Added 2026-09-02 clearlyU = clearly-u; # Added 2026-02-08 cli-visualizer = throw "'cli-visualizer' has been removed as the upstream repository is gone"; # Added 2025-06-05 clima = throw "'clima' has been removed, as it has been unmaintained upstream since December 2024, use glow instead"; # Added 2026-01-01