From facb7a38b3a0a7f276f8a7f7902cb126b51e87f4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 14 Dec 2023 20:04:03 +0100 Subject: [PATCH] urlview: remove Closes #273406 There are no upstream maintainers anymore[1]. This tool is known to wrongly truncate URLs (this broke invite links a few times for me). Now it's officially dead and there are a few useful alternatives, `urlscan` & `extract_url`. [1] https://salsa.debian.org/debian/urlview/-/commit/4ad7d236c745b665db1d2fd07ce5ffc1748e4240 --- pkgs/applications/misc/urlview/default.nix | 51 ---------------------- pkgs/top-level/aliases.nix | 4 ++ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 4 insertions(+), 53 deletions(-) delete mode 100644 pkgs/applications/misc/urlview/default.nix diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix deleted file mode 100644 index 2eca4cfccb31..000000000000 --- a/pkgs/applications/misc/urlview/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchurl, ncurses, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "urlview"; - _version = "0.9"; - patchLevel = "19"; - version = "${_version}-${patchLevel}"; - - urlBase = "mirror://debian/pool/main/u/urlview/"; - - src = fetchurl { - url = urlBase + "urlview_${_version}.orig.tar.gz"; - sha256 = "746ff540ccf601645f500ee7743f443caf987d6380e61e5249fc15f7a455ed42"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ncurses ]; - - preAutoreconf = '' - touch NEWS - ''; - - preConfigure = '' - mkdir -p $out/share/man/man1 - ''; - - debianPatches = fetchurl { - url = urlBase + "urlview_${_version}-${patchLevel}.diff.gz"; - sha256 = "056883c17756f849fb9235596d274fbc5bc0d944fcc072bdbb13d1e828301585"; - }; - - patches = debianPatches; - - postPatch = '' - substituteInPlace urlview.c \ - --replace '/etc/urlview/url_handler.sh' "$out/etc/urlview/url_handler.sh" - ''; - - postInstall = '' - install -Dm755 url_handler.sh $out/etc/urlview/url_handler.sh - patchShebangs $out/etc/urlview - ''; - - meta = with lib; { - description = "Extract URLs from text"; - homepage = "https://packages.qa.debian.org/u/urlview.html"; - license = licenses.gpl2; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ ma27 ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 16d8b581e90b..1ca4627fb7cb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -963,6 +963,10 @@ mapAliases ({ unifi-poller = unpoller; # Added 2022-11-24 unifiStable = unifi6; # Added 2020-12-28 untrunc = untrunc-anthwlock; # Added 2021-02-01 + urlview = throw '' + 'urlview' has been dropped because it's unmaintained. + Consider switching to an alternative such as `pkgs.extract_url` or `pkgs.urlscan`. + ''; # Added 2023-12-14 urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # Added 2020-02-02 urxvt_bidi = rxvt-unicode-plugins.bidi; # Added 2020-02-02 urxvt_font_size = rxvt-unicode-plugins.font-size; # Added 2020-02-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98b8e880a79c..0df3ffe55204 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14350,8 +14350,6 @@ with pkgs; urlscan = callPackage ../applications/misc/urlscan { }; - urlview = callPackage ../applications/misc/urlview { }; - url-parser = callPackage ../tools/misc/url-parser { }; urn-timer = callPackage ../tools/misc/urn-timer { };