From 6d2532593145aa9a1f8191ee9f9b8e9784852d69 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 30 May 2026 00:18:03 +0200 Subject: [PATCH] silver-searcher: drop Stuck on pcre and no development since 2020. We want to yank pcre because it is obsolete. --- .../si/silver-searcher/bash-completion.patch | 5 -- pkgs/by-name/si/silver-searcher/package.nix | 55 ------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 pkgs/by-name/si/silver-searcher/bash-completion.patch delete mode 100644 pkgs/by-name/si/silver-searcher/package.nix diff --git a/pkgs/by-name/si/silver-searcher/bash-completion.patch b/pkgs/by-name/si/silver-searcher/bash-completion.patch deleted file mode 100644 index 30e8c72389b7..000000000000 --- a/pkgs/by-name/si/silver-searcher/bash-completion.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -9 +9 @@ --bashcompdir = $(pkgdatadir)/completions -+bashcompdir = $(datadir)/bash-completion/completions diff --git a/pkgs/by-name/si/silver-searcher/package.nix b/pkgs/by-name/si/silver-searcher/package.nix deleted file mode 100644 index 6015d39697c6..000000000000 --- a/pkgs/by-name/si/silver-searcher/package.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoreconfHook, - pkg-config, - pcre, - zlib, - xz, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "silver-searcher"; - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "ggreer"; - repo = "the_silver_searcher"; - rev = finalAttrs.version; - sha256 = "0cyazh7a66pgcabijd27xnk1alhsccywivv6yihw378dqxb22i1p"; - }; - - patches = [ ./bash-completion.patch ]; - - env = { - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: src/zfile.o:/build/source/src/log.h:12: multiple definition of - # `print_mtx'; src/ignore.o:/build/source/src/log.h:12: first defined here - # TODO: remove once next release has https://github.com/ggreer/the_silver_searcher/pull/1377 - NIX_CFLAGS_COMPILE = "-fcommon"; - } - // lib.optionalAttrs stdenv.hostPlatform.isLinux { - NIX_LDFLAGS = "-lgcc_s"; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - buildInputs = [ - pcre - zlib - xz - ]; - - meta = { - homepage = "https://github.com/ggreer/the_silver_searcher/"; - description = "Code-searching tool similar to ack, but faster"; - maintainers = with lib.maintainers; [ madjar ]; - mainProgram = "ag"; - platforms = lib.platforms.all; - license = lib.licenses.asl20; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3d4c509b845b..9ab4f5778e6b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1936,6 +1936,7 @@ mapAliases { sierra-breeze-enhanced = throw "'sierra-breeze-enhanced' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 signal-desktop-bin = throw "'signal-desktop-bin' has been replaced by 'signal-desktop' which is built from source"; # Added 2026-03-02 signal-desktop-source = throw "'signal-desktop-source' has been renamed to/replaced by 'signal-desktop'"; # Converted to throw 2025-10-27 + silver-searcher = throw "'silver-surfer' has been removed as it has seen no development since 2020 and is stuck on the obsolete pcre library"; simpleBluez = warnAlias "'simpleBluez' has been renamed to 'simplebluez'" simplebluez; # Added 2026-02-18 simpleDBus = warnAlias "'simpleDBus' has been renamed to 'simpledbus'" simpledbus; # Added 2026-02-12 simplesamlphp = throw "'simplesamlphp' was removed because it was unmaintained in nixpkgs"; # Added 2025-10-17