From 667902897a706e24a0e4a780a83a140cd039fb10 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 17:24:15 -0300 Subject: [PATCH 1/8] pkgs/build-support/fetchurl/mirrors.nix: add IBiblioPubLinux It corresponds to old Metalab/Sunsite. --- pkgs/build-support/fetchurl/mirrors.nix | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 82f768daa5f..8145ffa5179 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -98,6 +98,23 @@ "http://www.ring.gr.jp/pub/net/" ]; + # IBiblio (former metalab/sunsite) + # Most of the time the expressions refer to the /pub/Linux/ subdirectory; + # however there are other useful files outside it + ibiblioPubLinux = [ + "https://www.ibiblio.org/pub/Linux/" + "ftp://ftp.ibiblio.org/pub/linux/" + "ftp://ftp.gwdg.de/pub/linux/metalab/" + "ftp://ftp.metalab.unc.edu/pub/linux/" + ]; + + # Metalab (to be removed) + metalab = [ + "ftp://ftp.gwdg.de/pub/linux/metalab/" + "ftp://ftp.metalab.unc.edu/pub/linux/" + ]; + + # ImageMagick mirrors, see https://www.imagemagick.org/script/mirror.php imagemagick = [ "https://www.imagemagick.org/download/" @@ -124,12 +141,6 @@ "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/" ]; - # Metalab, now IBiblio - metalab = [ - "ftp://ftp.gwdg.de/pub/linux/metalab/" - "ftp://ftp.metalab.unc.edu/pub/linux/" - ]; - # MySQL mysql = [ "https://cdn.mysql.com/Downloads/" From 8996c57c202f42e0b08a7936f03ac885710a4a8d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 17:24:56 -0300 Subject: [PATCH 2/8] t1lib: ibiblioPubLinux mirror --- pkgs/development/libraries/t1lib/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 69940c18aaf..66c9863c38a 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -21,19 +21,22 @@ stdenv.mkDerivation rec { version = "5.1.2"; src = fetchurl { - url = "mirror://metalab/libs/graphics/t1lib-${version}.tar.gz"; - sha256 = "0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2"; + url = "mirror://ibiblioPubLinux/libs/graphics/${pname}-${version}.tar.gz"; + hash = "sha256-ghMotQVPeJCg0M0vUoJScHBd82QdvUdtWNF+Vu2Ve1k="; }; inherit patches; buildInputs = [ libX11 libXaw ]; buildFlags = [ "without_doc" ]; - postInstall = lib.optionalString (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? + postInstall = lib.optionalString (!stdenv.isDarwin) '' + # ?? + chmod +x $out/lib/*.so.* + ''; meta = with lib; { - description = "A type 1 font rasterizer library for UNIX/X11"; homepage = "http://www.t1lib.org/"; + description = "A type 1 font rasterizer library for UNIX/X11"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.unix; }; From ae55f08023e44aebffd9d184ecf8e0d29537de32 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 17:26:20 -0300 Subject: [PATCH 3/8] bsdgames: ibiblioPubLinux mirror --- pkgs/games/bsdgames/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix index 837fb4e1768..c837ba39b44 100644 --- a/pkgs/games/bsdgames/default.nix +++ b/pkgs/games/bsdgames/default.nix @@ -5,13 +5,14 @@ stdenv.mkDerivation rec { version = "2.17"; src = fetchurl { - url = "ftp://metalab.unc.edu/pub/Linux/games/bsd-games-${version}.tar.gz"; - sha256 = "0q7zdyyfvn15y0w4g54kq3gza89h61py727m8slmw73cxx594vq6"; + url = "mirror://ibiblioPubLinux/games/${pname}-${version}.tar.gz"; + hash = "sha256-Bm+SSu9sHF6pRvWI428wMCH138CTlEc48CXY7bxv/2A="; }; buildInputs = [ ncurses openssl flex bison ]; patches = [ + # Remove UTMPX support on Makefrag file (fetchurl { url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/dm-noutmpx.patch"; sha256 = "1k3qp3jj0dksjr4dnppv6dvkwslrgk9c7p2n9vipqildpxgqp7w2"; From 197cb04778e894452f9b52503be85e0ba22ff8cb Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 17:26:49 -0300 Subject: [PATCH 4/8] forktty: ibiblioPubLinux mirror --- pkgs/os-specific/linux/forktty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/forktty/default.nix b/pkgs/os-specific/linux/forktty/default.nix index f060557cdec..7dc1f0c3b2e 100644 --- a/pkgs/os-specific/linux/forktty/default.nix +++ b/pkgs/os-specific/linux/forktty/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { version = "1.3"; src = fetchurl { - url = "http://sunsite.unc.edu/pub/linux/utils/terminal/forktty-${version}.tgz"; - sha256 = "sha256-6xc5eshCuCIOsDh0r2DizKAeypGH0TRRotZ4itsvpVk="; + url = "mirror://ibiblioPubLinux/utils/terminal/${pname}-${version}.tgz"; + hash = "sha256-6xc5eshCuCIOsDh0r2DizKAeypGH0TRRotZ4itsvpVk="; }; preBuild = '' From f3e1e37041b33d658c1d606658c7b74caaad0333 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 17:27:02 -0300 Subject: [PATCH 5/8] bsd-fingerd: ibiblioPubLinux mirror --- pkgs/servers/fingerd/bsd-fingerd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix index 4fb6f44b454..b907c67ccb7 100644 --- a/pkgs/servers/fingerd/bsd-fingerd/default.nix +++ b/pkgs/servers/fingerd/bsd-fingerd/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.17"; src = fetchurl { - url = "mirror://metalab/system/network/finger/bsd-finger-${version}.tar.gz"; + url = "mirror://ibiblioPubLinux/system/network/finger/bsd-finger-${version}.tar.gz"; sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; }; From de6c0f0ff7cd6e0a9337a4ac20b76a9108f1b25d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 17:27:14 -0300 Subject: [PATCH 6/8] bsd-finger: ibiblioPubLinux mirror --- pkgs/tools/networking/bsd-finger/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index 4f8d946fa36..a83a02bd097 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.17"; src = fetchurl { - url = "mirror://metalab/system/network/finger/bsd-finger-${version}.tar.gz"; + url = "mirror://ibiblioPubLinux/system/network/finger/bsd-finger-${version}.tar.gz"; sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; }; From 638efbf778c49ec60e636d2c9d35d459a3dfe0df Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 17:27:23 -0300 Subject: [PATCH 7/8] wakelan: ibiblioPubLinux mirror --- pkgs/tools/networking/wakelan/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/tools/networking/wakelan/default.nix index 5365e696fad..7e9bcc1a70c 100644 --- a/pkgs/tools/networking/wakelan/default.nix +++ b/pkgs/tools/networking/wakelan/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { version = "1.1"; src = fetchurl { - url = "mirror://metalab/system/network/misc/wakelan-${version}.tar.gz"; - sha256 = "0vydqpf44146ir6k87gmqaq6xy66xhc1gkr3nsd7jj3nhy7ypx9x"; + url = "mirror://ibiblioPubLinux/system/network/misc/${pname}-${version}.tar.gz"; + hash = "sha256-PfXrj4d2SHmatiPPFxjsxvhusML1HTRNjoYEQtzFzW8="; }; preInstall = '' @@ -15,15 +15,12 @@ stdenv.mkDerivation rec { meta = { description = "Send a wake-on-lan packet"; - - longDescription = - '' WakeLan sends a properly formatted UDP packet across the - network which will cause a wake-on-lan enabled computer to - power on. - ''; - + longDescription = '' + WakeLan sends a properly formatted UDP packet across the + network which will cause a wake-on-lan enabled computer to + power on. + ''; license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.viric ]; platforms = lib.platforms.unix; }; From b988e9a1f9aab982c5adc95143df37417b82a951 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Mar 2022 18:41:48 -0300 Subject: [PATCH 8/8] pkgs/build-support/fetchurl/mirrors.nix: remove metalab --- pkgs/build-support/fetchurl/mirrors.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 8145ffa5179..954c88d1baf 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -108,13 +108,6 @@ "ftp://ftp.metalab.unc.edu/pub/linux/" ]; - # Metalab (to be removed) - metalab = [ - "ftp://ftp.gwdg.de/pub/linux/metalab/" - "ftp://ftp.metalab.unc.edu/pub/linux/" - ]; - - # ImageMagick mirrors, see https://www.imagemagick.org/script/mirror.php imagemagick = [ "https://www.imagemagick.org/download/"