From 719ce1641b751af836d0c4f94a533d3fc34ecf08 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 6 Apr 2023 20:01:14 +0300 Subject: [PATCH 1/2] utsushi-imagescan: use mirrors https://aur.archlinux.org/packages/imagescan-plugin-networkscan#comment-889998 > It seems that Epson has abandoned this software. I have changed the package to download from a mirror hosted by me. --- pkgs/misc/drivers/utsushi/networkscan.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/drivers/utsushi/networkscan.nix b/pkgs/misc/drivers/utsushi/networkscan.nix index c0416a11be3c..b9aa1cbe904f 100644 --- a/pkgs/misc/drivers/utsushi/networkscan.nix +++ b/pkgs/misc/drivers/utsushi/networkscan.nix @@ -6,7 +6,10 @@ stdenv.mkDerivation rec { version = "1.1.4"; src = fetchurl { - url = "https://download2.ebz.epson.net/imagescanv3/fedora/latest1/rpm/x64/imagescan-bundle-fedora-32-${imagescanVersion}.x64.rpm.tar.gz"; + urls = [ + "https://buzo.eu/mirror/epson/imagescan-bundle-fedora-32-${imagescanVersion}.x64.rpm.tar.gz" + "https://web.archive.org/web/20221027001620if_/https://download2.ebz.epson.net/imagescanv3/fedora/latest1/rpm/x64/imagescan-bundle-fedora-32-${imagescanVersion}.x64.rpm.tar.gz" + ]; sha256 = "sha256-fxi63sV+YJOlv1aVTfCPIXOPfNAo+R7zNPvA11sFmMk="; }; From 03ead006e08f9f91a0b9f3249bff05dd6fee5ac9 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 6 Apr 2023 20:08:10 +0300 Subject: [PATCH 2/2] slmenu: remove upstream is gone and the package hadn't been updated in a long time --- pkgs/applications/misc/slmenu/default.nix | 19 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 pkgs/applications/misc/slmenu/default.nix diff --git a/pkgs/applications/misc/slmenu/default.nix b/pkgs/applications/misc/slmenu/default.nix deleted file mode 100644 index 80aedd574187..000000000000 --- a/pkgs/applications/misc/slmenu/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{lib, stdenv, fetchhg}: - -stdenv.mkDerivation { - pname = "slmenu"; - version = "hg-2012-02-01"; - - src = fetchhg { - url = "https://bitbucket.org/rafaelgg/slmenu/"; - rev = "7e74fa5db73e8b018da48d50dbbaf11cb5c62d13"; - sha256 = "0zb7mm8344d3xmvrl62psazcabfk75pp083jqkmywdsrikgjagv6"; - }; - makeFlags = [ "PREFIX=$(out)" ]; - meta = with lib; { - description = "A console dmenu-like tool"; - license = licenses.mit; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2f61cd10a6a5..5c5b49f4305c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1471,6 +1471,7 @@ mapAliases ({ slack-dark = slack; # Added 2020-03-27 sleepyhead = throw "'sleepyhead' has been renamed to/replaced by 'OSCAR'"; # Added 2022-11-20 slic3r-prusa3d = throw "'slic3r-prusa3d' has been renamed to/replaced by 'prusa-slicer'"; # Converted to throw 2022-02-22 + slmenu = throw "slmenu has been removed (upstream is gone)"; # Added 2023-04-06 slurm-full = throw "'slurm-full' has been renamed to/replaced by 'slurm'"; # Converted to throw 2022-02-22 slurm-llnl = slurm; # renamed July 2017 slurm-llnl-full = slurm-full; # renamed July 2017 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53a4d1b299fe..2bce56611de1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33511,8 +33511,6 @@ with pkgs; SkypeExport = callPackage ../applications/networking/instant-messengers/SkypeExport { }; - slmenu = callPackage ../applications/misc/slmenu { }; - slop = callPackage ../tools/misc/slop { }; slowhttptest = callPackage ../tools/security/slowhttptest { };