From b5213d5b0f6bda0fe098ff98890599ff63dfdd5f Mon Sep 17 00:00:00 2001 From: Damien Diederen Date: Thu, 28 Sep 2023 20:54:54 +0200 Subject: [PATCH] treewide: fix invalid gentoo/distfiles urls (#257808) * nettools: fix url; avoid gentoo/distfiles which now uses hashed directories * pax-utils: fix url; avoid gentoo/distfiles which now uses hashed directories The project doesn't seem to publish the exact tarball which was relied on, but we can fetch the sources from the original repository. (This implies some rebuilds.) * mtx: fix url; avoid gentoo/distfiles which now uses hashed directories * vlan: fix url; avoid gentoo/distfiles which now uses hashed directories --- pkgs/os-specific/linux/net-tools/default.nix | 2 +- pkgs/os-specific/linux/pax-utils/default.nix | 9 +++++---- pkgs/tools/backup/mtx/default.nix | 2 +- pkgs/tools/networking/vlan/default.nix | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index 9630b5c0c7a1..bedeaadc294e 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.10"; src = fetchurl { - url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-smJDWlJB6Jv6UcPKvVEzdTlS96e3uT8y4Iy52W9YDWk="; }; diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 1d27cf80e4da..dcecfa4c13b8 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchurl +, fetchgit , buildPackages , docbook_xml_dtd_44 , docbook_xsl @@ -18,9 +18,10 @@ stdenv.mkDerivation rec { pname = "pax-utils"; version = "1.3.7"; - src = fetchurl { - url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz"; - sha256 = "sha256-EINi0pZo0lz3sMrcY7FaTBz8DbxxrcFRszxf597Ok5o="; + src = fetchgit { + url = "https://anongit.gentoo.org/git/proj/pax-utils.git"; + rev = "v${version}"; + hash = "sha256-WyNng+UtfRz1+Eu4gwXLxUvBAg+m3mdrc8GdEPYRKVE="; }; strictDeps = true; diff --git a/pkgs/tools/backup/mtx/default.nix b/pkgs/tools/backup/mtx/default.nix index b8476954949e..683bee11067d 100644 --- a/pkgs/tools/backup/mtx/default.nix +++ b/pkgs/tools/backup/mtx/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.3.12"; src = fetchurl { - url = "mirror://gentoo/distfiles/mtx-${version}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-stable/${version}/${pname}-${version}.tar.gz"; sha256 = "0261c5e90b98b6138cd23dadecbc7bc6e2830235145ed2740290e1f35672d843"; }; diff --git a/pkgs/tools/networking/vlan/default.nix b/pkgs/tools/networking/vlan/default.nix index 8ddbb8346347..aff4ebd09f37 100644 --- a/pkgs/tools/networking/vlan/default.nix +++ b/pkgs/tools/networking/vlan/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.9"; src = fetchurl { - url = "mirror://gentoo/distfiles/vlan.${version}.tar.gz"; + url = "https://www.candelatech.com/~greear/${pname}/${pname}.${version}.tar.gz"; sha256 = "1jjc5f26hj7bk8nkjxsa8znfxcf8pgry2ipnwmj2fr6ky0dhm3rv"; };