diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-02-22 00:37:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-22 00:37:13 +0100 |
| commit | 5b14e91717f78d0fbcf831f0501950cc9e71f9a6 (patch) | |
| tree | 4bfb3501a7b21388a22255d51b31e1486ee56d05 /pkgs/os-specific | |
| parent | 2cd286b3cfb5b437c9057bb0413361f532f174ff (diff) | |
| parent | 45719174c3a82af6e0df27812d51edc323ccc897 (diff) | |
Merge pull request #22822 from Mic92/iputils
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/iputils/default.nix | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 3e2eb93d2137..1b6be8e4aa1b 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchurl, libsysfs, gnutls, openssl, libcap, sp, docbook_sgml_dtd_31 +{ stdenv, fetchurl +, libsysfs, gnutls, openssl +, libcap, sp, docbook_sgml_dtd_31 +, libidn, nettle , SGMLSpm, libgcrypt }: assert stdenv ? glibc; let - time = "20151218"; + time = "20161105"; in stdenv.mkDerivation rec { name = "iputils-${time}"; src = fetchurl { - url = "http://www.skbuff.net/iputils/iputils-s${time}.tar.bz2"; - sha256 = "189592jlkhxdgy8jc07m4bsl41ik9r6i6aaqb532prai37bmi7sl"; + url = "https://github.com/iputils/iputils/archive/s${time}.tar.gz"; + sha256 = "12mdmh4qbf5610csaw3rkzhpzf6djndi4jsl4gyr8wni0cphj4zq"; }; prePatch = '' @@ -21,27 +24,24 @@ stdenv.mkDerivation rec { makeFlags = "USE_GNUTLS=no"; buildInputs = [ - libsysfs openssl libcap sp docbook_sgml_dtd_31 SGMLSpm libgcrypt + libsysfs openssl libcap sp docbook_sgml_dtd_31 SGMLSpm libgcrypt libidn nettle ]; buildFlags = "man all ninfod"; installPhase = '' - mkdir -p $out/sbin $out/bin - cp -p ping ping6 tracepath tracepath6 traceroute6 $out/bin/ - cp -p clockdiff arping rdisc ninfod/ninfod $out/sbin/ + mkdir -p $out/bin + cp -p ping tracepath clockdiff arping rdisc ninfod/ninfod $out/bin/ mkdir -p $out/share/man/man8 - cp -p doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 \ - doc/tracepath.8 doc/ninfod.8 doc/traceroute6.8 \ + cp -p \ + doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 doc/tracepath.8 doc/ninfod.8 \ $out/share/man/man8 - ln -s $out/share/man/man8/{ping,ping6}.8 - ln -s $out/share/man/man8/{tracepath,tracepath6}.8 ''; meta = { - homepage = http://www.skbuff.net/iputils/; + homepage = https://github.com/iputils/iputils; description = "A set of small useful utilities for Linux networking"; platforms = stdenv.lib.platforms.linux; }; |