diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-08-02 18:28:29 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-08-02 18:30:53 +0200 |
commit | 625f40151b0767cb421999cf988f4eb7bcf8b63d (patch) | |
tree | 629565f6f9efb26ad36b2a6d8e7e266290feb94b /pkgs/tools/networking/iperf/default.nix | |
parent | d239d24a89276cc7ee4bab1343c7e5bb40cbdfd4 (diff) | |
parent | 4fb87e91ffcbf6f6785e32b7e608198401a7155d (diff) | |
download | nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.gz nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.bz2 nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.lz nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.xz nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.zst nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.zip |
Merge branch 'master' into x-updates
Conflicts (a little tricky, I did some cleanup of interacting changes): pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/libpng/default.nix pkgs/tools/package-management/nixops/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/tools/networking/iperf/default.nix')
-rw-r--r-- | pkgs/tools/networking/iperf/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/networking/iperf/default.nix b/pkgs/tools/networking/iperf/default.nix index 1cb984e3d1c4..66f600f76784 100644 --- a/pkgs/tools/networking/iperf/default.nix +++ b/pkgs/tools/networking/iperf/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "iperf-2.0.4"; src = fetchurl { - url = http://garr.dl.sourceforge.net/sourceforge/iperf/iperf-2.0.4.tar.gz; + url = mirror://sourceforge/iperf/iperf-2.0.4.tar.gz; sha256 = "0i3r75prbyxs56rngjbrag8rg480ki3daaa924krrafng30z2liv"; }; |