From d1239f586bcd25e779f687d2c151b9dd1ce8af19 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 25 Oct 2025 20:07:42 +0300 Subject: [PATCH] volk_2: remove --- pkgs/by-name/vo/volk_2/package.nix | 72 ------------------------------ pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 pkgs/by-name/vo/volk_2/package.nix diff --git a/pkgs/by-name/vo/volk_2/package.nix b/pkgs/by-name/vo/volk_2/package.nix deleted file mode 100644 index bc8f9c803f63..000000000000 --- a/pkgs/by-name/vo/volk_2/package.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - python3, - enableModTool ? true, - removeReferencesTo, - fetchpatch, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "volk"; - # Version 2.5.1 seems to cause a build issue for aarch64-darwin[1], and for - # gnuradio 3.8 on all platforms[2]. Hence we pin this package to 2.5.0 and - # use it for GR 3.8 for all platforms. - # - # [1]: https://github.com/NixOS/nixpkgs/pull/160152#issuecomment-1043380478A - # [2]: https://github.com/NixOS/nixpkgs/pull/330477#issuecomment-2254477735 - version = "2.5.0"; - - src = fetchFromGitHub { - owner = "gnuradio"; - repo = "volk"; - tag = "v${finalAttrs.version}"; - hash = "sha256-XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc="; - fetchSubmodules = true; - }; - - patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/macports/macports-ports/e83a55ef196d4283be438c052295b2fc44f3df5b/science/volk/files/patch-cpu_features-add-support-for-ARM64.diff"; - hash = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI="; - extraPrefix = ""; - }) - ]; - - cmakeFlags = [ - (lib.cmakeBool "ENABLE_MODTOOL" enableModTool) - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - # offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05 - # volk_32f_log2_32f: fail on arch neon - "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f" - ]; - - postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) - ''; - - nativeBuildInputs = [ - cmake - python3 - python3.pkgs.mako - python3.pkgs.distutils - removeReferencesTo - ]; - - doCheck = true; - - postPatch = '' - substituteInPlace cpu_features/CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" - ''; - - meta = { - homepage = "http://libvolk.org/"; - description = "Vector Optimized Library of Kernels (version 2.5.0 - for GR 3.8)"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ doronbehar ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f05860c36aa9..d3bca75e037a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2762,6 +2762,7 @@ mapAliases { vmware-horizon-client = throw "'vmware-horizon-client' has been renamed to 'omnissa-horizon-client'"; # Added 2025-04-24 vocal = throw "'vocal' has been archived upstream. Consider using 'gnome-podcasts' or 'kasts' instead."; # Added 2025-04-12 void = throw "'void' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 + volk_2 = throw "'volk_2' has been removed after not being used by any package for a long time"; # Added 2025-10-25 volnoti = throw "'volnoti' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 voxelands = throw "'voxelands' has been removed due to lack of upstream maintenance"; # Added 2025-08-30 vtk_9 = lib.warnOnInstantiate "'vtk_9' has been renamed to 'vtk_9_5'" vtk_9_5; # Added 2025-07-18