From ba0f9cfa490a867f675cca4515c998d242c255eb Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 20 Aug 2016 15:14:23 +0200 Subject: [PATCH] Revert "Merge pull request #16980 from phanimahesh/sf-use-mirrors" This reverts commit 217594fd1d0b4cc36c98c1605b73ccb50ce57bc8, reversing changes made to 8e8a89d8a8f9d801f9e17d48325d06f20743b364. Turns out it wasn't ready afterall ... --- pkgs/applications/backup/areca/default.nix | 2 +- pkgs/applications/editors/ht/default.nix | 2 +- pkgs/applications/misc/gammu/default.nix | 2 +- pkgs/applications/misc/mlterm/default.nix | 2 +- pkgs/applications/misc/xautoclick/default.nix | 2 +- .../window-managers/windowmaker/dockapps/wmsystemtray.nix | 2 +- pkgs/desktops/lxde/core/lxmenu-data.nix | 2 +- pkgs/development/compilers/fpc/binary.nix | 4 ++-- pkgs/development/compilers/mlton/default.nix | 8 ++++---- pkgs/development/compilers/mozart/binary.nix | 2 +- pkgs/development/tools/omniorb/default.nix | 2 +- pkgs/tools/filesystems/fuseiso/default.nix | 2 +- pkgs/tools/networking/srelay/default.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix index 90d38712317..76913356b04 100644 --- a/pkgs/applications/backup/areca/default.nix +++ b/pkgs/applications/backup/areca/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "areca-7.5"; src = fetchurl { - url = "mirror://sourceforge/project/areca/areca-stable/areca-7.5/areca-7.5-src.tar.gz"; + url = "http://downloads.sourceforge.net/project/areca/areca-stable/areca-7.5/areca-7.5-src.tar.gz"; sha256 = "1q4ha9s96c1syplxm04bh1v1gvjq16l4pa8w25w95d2ywwvyq1xb"; }; diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix index 86a360679bd..b7acdb7f1d5 100644 --- a/pkgs/applications/editors/ht/default.nix +++ b/pkgs/applications/editors/ht/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ht-${version}"; version = "2.1.0"; src = fetchurl { - url = "mirror://sourceforge/projects/hte/files/ht-source/ht-${version}.tar.bz2"; + url = "http://sourceforge.net/projects/hte/files/ht-source/ht-${version}.tar.bz2"; sha256 = "0w2xnw3z9ws9qrdpb80q55h6ynhh3aziixcfn45x91bzrbifix9i"; }; buildInputs = [ diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 6a18dee57b9..fc88bb3e354 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "1.33.0"; src = fetchurl { - url = "mirror://sourceforge/projects/gammu/files/gammu/${version}/gammu-${version}.tar.xz"; + url = "http://sourceforge.net/projects/gammu/files/gammu/${version}/gammu-${version}.tar.xz"; sha256 = "18gplx1v9d70k1q86d5i4n4dfpx367g34pj3zscppx126vwhv112"; }; diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index d9b03fd86e1..80d0c136628 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.3.8"; src = fetchurl { - url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz"; + url = "https://downloads.sourceforge.net/project/mlterm/01release/${name}/${name}.tar.gz"; sha256 = "088pgxynzxxii7wdmjp2fdkxydirx4k05588zkhlzalkb5l8ji1i"; }; diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index 1a71a2756d1..19d8a15fbfa 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.31"; name = "xautoclick-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz"; + url = "http://downloads.sourceforge.net/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz"; sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm"; }; buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext pkgconfig ] diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix index 0d1ca29e12c..c28d090e0bd 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "wmsystemtray-1.4"; src = fetchurl { - url = mirror://sourceforge/projects/wmsystemtray/files/wmsystemtray/wmsystemtray-1.4.tar.gz; + url = http://sourceforge.net/projects/wmsystemtray/files/wmsystemtray/wmsystemtray-1.4.tar.gz; sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9"; }; diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix index 27a5903a61b..b75c09d2909 100644 --- a/pkgs/desktops/lxde/core/lxmenu-data.nix +++ b/pkgs/desktops/lxde/core/lxmenu-data.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.1.5"; src = fetchurl { - url = "mirror://sourceforge/lxde/${name}.tar.xz"; + url = "http://downloads.sourceforge.net/lxde/${name}.tar.xz"; sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8"; }; diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix index 2b7dbbb4326..57e670750db 100644 --- a/pkgs/development/compilers/fpc/binary.nix +++ b/pkgs/development/compilers/fpc/binary.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation { src = if stdenv.system == "i686-linux" then fetchurl { - url = "mirror://sourceforge/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.i386-linux.tar"; + url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.i386-linux.tar"; sha256 = "08yklvrfxvk59bxsd4rh1i6s3cjn0q06dzjs94h9fbq3n1qd5zdf"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "mirror://sourceforge/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.x86_64-linux.tar"; + url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.x86_64-linux.tar"; sha256 = "0k9vi75k39y735fng4jc2vppdywp82j4qhzn7x4r6qjkad64d8lx"; } else throw "Not supported on ${stdenv.system}."; diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index 3b8001d563e..c4890c1ca88 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -15,22 +15,22 @@ stdenv.mkDerivation rec { binSrc = if stdenv.system == "i686-linux" then (fetchurl { - url = "mirror://sourceforge/projects/mlton/files/mlton/${version}/${name}-1.x86-linux.tgz"; + url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.x86-linux.tgz"; sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j"; }) else if stdenv.system == "x86_64-linux" then (fetchurl { - url = "mirror://sourceforge/projects/mlton/files/mlton/${version}/${name}-1.amd64-linux.tgz"; + url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.amd64-linux.tgz"; sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn"; }) else if stdenv.system == "x86_64-darwin" then (fetchurl { - url = "mirror://sourceforge/projects/mlton/files/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz"; + url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz"; sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9"; }) else throw "Architecture not supported"; codeSrc = fetchurl { - url = "mirror://sourceforge/projects/mlton/files/mlton/${version}/${name}.src.tgz"; + url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}.src.tgz"; sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11"; }; diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index dc806d52af2..ae040297313 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation { name = "mozart-binary-${version}"; src = fetchurl { - url = "mirror://sourceforge/projects/mozart-oz/files/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz"; + url = "http://sourceforge.net/projects/mozart-oz/files/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz"; sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z"; }; diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index cfe8810d6c1..0fe4b191e50 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/pkgs/development/tools/omniorb/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "4.2.0"; src = fetchurl rec { - url = "mirror://sourceforge/projects/omniorb/files/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; + url = "http://sourceforge.net/projects/omniorb/files/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; sha256 = "1g58xcw4641wyisp9wscrkzaqrz0vf123dgy52qq2a3wk7y77hkl"; }; diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix index c87e6a895c3..161425ad137 100644 --- a/pkgs/tools/filesystems/fuseiso/default.nix +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "fuseiso-20070708"; src = fetchurl { - url = "mirror://sourceforge/projects/fuseiso/files/fuseiso/20070708/fuseiso-20070708.tar.bz2"; + url = "http://sourceforge.net/projects/fuseiso/files/fuseiso/20070708/fuseiso-20070708.tar.bz2"; sha1 = "fe142556ad35dd7e5dc31a16183232a6e2da7692"; }; diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix index b8cee77f947..853a21da73c 100644 --- a/pkgs/tools/networking/srelay/default.nix +++ b/pkgs/tools/networking/srelay/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "srelay-0.4.8b6"; src = fetchurl { - url = "mirror://sourceforge/projects/socks-relay/files/socks-relay/srelay-0.4.8/srelay-0.4.8b6.tar.gz"; + url = "https://sourceforge.net/projects/socks-relay/files/socks-relay/srelay-0.4.8/srelay-0.4.8b6.tar.gz"; sha256 = "1az9ds10hpmpw6bqk7fcd1w70001kz0mm48v3vgg2z6vrbmgn0qj"; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f94a8fa40b..d39c8d85cdd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3308,7 +3308,7 @@ in modules // { disabled = isPy3k; src = pkgs.fetchurl { - url = "mirror://sourceforge/project/cgkit/cgkit/cgkit-${version}/cgkit-${version}-py2k.tar.gz"; + url = "http://downloads.sourceforge.net/project/cgkit/cgkit/cgkit-${version}/cgkit-${version}-py2k.tar.gz"; sha256 = "0vvllc42mdyma3c7yqhahs4bfxymm2kvmc4va7dxqr5x0rzh6rd6"; };