From 33a8a5165764a3ae9ba7ae5c01b1b97e6fb6fb2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc> Date: Sun, 8 Feb 2015 22:29:27 +0100 Subject: [PATCH] fetchurl: collate samba project urls into a mirror --- pkgs/applications/networking/sync/rsync/default.nix | 4 ++-- pkgs/build-support/fetchurl/mirrors.nix | 5 +++++ pkgs/development/libraries/ctdb/default.nix | 2 +- pkgs/development/libraries/ldb/default.nix | 5 +---- pkgs/development/libraries/ntdb/default.nix | 5 +---- pkgs/development/libraries/talloc/default.nix | 2 +- pkgs/development/libraries/tdb/default.nix | 5 +---- pkgs/development/libraries/tevent/default.nix | 2 +- pkgs/development/tools/misc/ccache/default.nix | 2 +- pkgs/os-specific/linux/cifs-utils/default.nix | 2 +- pkgs/servers/samba/3.x.nix | 2 +- pkgs/servers/samba/4.x.nix | 5 +---- pkgs/tools/compression/rzip/default.nix | 2 +- pkgs/tools/networking/ppp/default.nix | 2 +- 14 files changed, 19 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 8d32c1e5d865..5e29e3cfd0dd 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { mainSrc = fetchurl { # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 - url = "http://rsync.samba.org/ftp/rsync/src/rsync-${version}.tar.gz"; + url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; sha256 = "0896iah6w72q5izpxgkai75bn40dqkqifi2ivcxjzr2zrx7kdr3x"; }; patchesSrc = fetchurl { # signed with key 0048 C8B0 26D4 C96F 0E58 9C2F 6C85 9FB1 4B96 A8C5 - url = "http://rsync.samba.org/ftp/rsync/rsync-patches-${version}.tar.gz"; + url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz"; sha256 = "0iij996xbyn20yr4w3kv3rw3cx4jwkg2k85x6w5hb5xlgsis8zjl"; }; diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 5f0fe5fa4869..53104f2f1f26 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -137,6 +137,11 @@ rec { http://www.centervenus.com/mirrors/nongnu/ ]; + samba = [ + http://samba.org/ftp/ + http://ftp.riken.jp/net/samba + ]; + # BitlBee mirrors, see http://www.bitlbee.org/main.php/mirrors.html . bitlbee = [ http://get.bitlbee.org/ diff --git a/pkgs/development/libraries/ctdb/default.nix b/pkgs/development/libraries/ctdb/default.nix index c3321108d865..3176352a72e3 100644 --- a/pkgs/development/libraries/ctdb/default.nix +++ b/pkgs/development/libraries/ctdb/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ctdb-2.5.4"; src = fetchurl { - url = "http://samba.org/ftp/ctdb/${name}.tar.gz"; + url = "mirror://samba/ctdb/${name}.tar.gz"; sha256 = "09fb29ngxnh1crsqchykg23bl6s4fifvxwq4gwg1y742mmnjp9fy"; }; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index a7583c8d062e..166444d1b3b0 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -6,10 +6,7 @@ stdenv.mkDerivation rec { name = "ldb-1.1.19"; src = fetchurl { - urls = [ - "http://samba.org/ftp/ldb/${name}.tar.gz" - "http://distfiles.exherbo.org/distfiles/${name}.tar.gz" - ]; + url = "mirror://samba/ldb/${name}.tar.gz"; sha256 = "1p2815z9sjack08pcdbv4xzp1fvr4lxcn30rj0wh3py4ly6ji1h0"; }; diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix index 653f07bd716b..0d553f68885f 100644 --- a/pkgs/development/libraries/ntdb/default.nix +++ b/pkgs/development/libraries/ntdb/default.nix @@ -6,10 +6,7 @@ stdenv.mkDerivation rec { name = "ntdb-1.0"; src = fetchurl { - urls = [ - "http://samba.org/ftp/tdb/${name}.tar.gz" - "http://ftp.riken.jp/net/samba/tdb/${name}.tar.gz" - ]; + url = "mirror://samba/tdb/${name}.tar.gz"; sha256 = "0jdzgrz5sr25k83yrw7wqb3r0yj1v04z4s3lhsmnr5z6n5ifhyl1"; }; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 8c82d9470f3a..8a523593c4b3 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "talloc-2.1.1"; src = fetchurl { - url = "http://samba.org/ftp/talloc/${name}.tar.gz"; + url = "mirror://samba/talloc/${name}.tar.gz"; sha256 = "0x31id42b425dbxv5whrqlc6dj14ph7wzs3wsp1ggi537dncwa9y"; }; diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 778cf8a8d7b7..81227f0829bc 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -6,10 +6,7 @@ stdenv.mkDerivation rec { name = "tdb-1.3.4"; src = fetchurl { - urls = [ - "http://samba.org/ftp/tdb/${name}.tar.gz" - "http://distfiles.exherbo.org/distfiles/${name}.tar.gz" - ]; + url = "mirror://samba/tdb/${name}.tar.gz"; sha256 = "0a8pa4ar7dxkbsgv1447av2rn35a1m6l1v2s9hgz3ccwni9wv1gm"; }; diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 978d106e91e1..833fd69aa9c6 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "tevent-0.9.22"; src = fetchurl { - url = "http://samba.org/ftp/tevent/${name}.tar.gz"; + url = "mirror://samba/tevent/${name}.tar.gz"; sha256 = "0myyi3lwsi6f3f0a5qw8rjpm2d5yf18pw4vljdwyi885l411sksl"; }; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 65a92a05e0e3..305ccdb8dd06 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -5,7 +5,7 @@ let stdenv.mkDerivation { name = "ccache-3.2.1"; src = fetchurl { - url = http://samba.org/ftp/ccache/ccache-3.2.1.tar.xz; + url = mirror://samba/ccache/ccache-3.2.1.tar.xz; sha256 = "17dxb0adha2bqzb2r8rcc3kl9mk7y6vrvlh181liivrc3m7g6al7"; }; diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 5126a58e1a3b..46a927209a23 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "cifs-utils-6.4"; src = fetchurl { - url = "ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/${name}.tar.bz2"; + url = "mirror://samba/pub/linux-cifs/cifs-utils/${name}.tar.bz2"; sha256 = "1qz6d2xg4z1if0hy7qwyzgcr59l0alkhci6gxgjdldglda967z1q"; }; diff --git a/pkgs/servers/samba/3.x.nix b/pkgs/servers/samba/3.x.nix index b0b1b152e9b7..ad8a6de6729b 100644 --- a/pkgs/servers/samba/3.x.nix +++ b/pkgs/servers/samba/3.x.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { name = "samba-3.6.24"; src = fetchurl { - url = "http://samba.org/samba/ftp/stable/${name}.tar.gz"; + url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; sha256 = "19rln8m1k359bz6dhmlv39kzyjg7p296dz4y4mq1jwrlnw2bvl0i"; }; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 283951fa7180..c290f75cd0dc 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -34,10 +34,7 @@ stdenv.mkDerivation rec { name = "samba-4.1.16"; src = fetchurl { - urls = [ - "http://samba.org/samba/ftp/stable/${name}.tar.gz" - "http://distfiles.exherbo.org/distfiles/${name}.tar.gz" - ]; + url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; sha256 = "0yx840qg5q6syq81439v3pbwawacm7nwnnvph85za9gsgcb9r80j"; }; diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index 4460ae6edf3e..733634da652f 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "rzip-2.1"; src = fetchurl { - url = http://rzip.samba.org/ftp/rzip/rzip-2.1.tar.gz; + url = mirror://samba/rzip/rzip-2.1.tar.gz; sha256 = "4bb96f4d58ccf16749ed3f836957ce97dbcff3e3ee5fd50266229a48f89815b7"; }; buildInputs = [ bzip2 ]; diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index ad69f5751a09..b7f42b019c43 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "ppp-${version}"; src = fetchurl { - url = "${meta.homepage}ftp/ppp/${name}.tar.gz"; + url = "mirror://samba/ppp/${name}.tar.gz"; sha256 = "019m00q85nrgdpjlhb9021a3iw3pr4a0913gp4h9k7r9r7z7lca3"; };