diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-10-11 15:38:54 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-10-11 15:38:54 -0400 |
| commit | e117d037e39ac185327cf86282331185f19268c2 (patch) | |
| tree | dc826f7ee025226e81f736c43bef9509e2bfb9e4 /pkgs/os-specific/linux/iproute | |
| parent | bf5967e77e9c4cfc69501cc12a626cb5c6f22537 (diff) | |
| download | nixpkgs-e117d037e39ac185327cf86282331185f19268c2.tar nixpkgs-e117d037e39ac185327cf86282331185f19268c2.tar.gz nixpkgs-e117d037e39ac185327cf86282331185f19268c2.tar.bz2 nixpkgs-e117d037e39ac185327cf86282331185f19268c2.tar.lz nixpkgs-e117d037e39ac185327cf86282331185f19268c2.tar.xz nixpkgs-e117d037e39ac185327cf86282331185f19268c2.tar.zst nixpkgs-e117d037e39ac185327cf86282331185f19268c2.zip | |
iproute: Update to 3.6.0
Diffstat (limited to 'pkgs/os-specific/linux/iproute')
| -rw-r--r-- | pkgs/os-specific/linux/iproute/default.nix | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index cc5339ba900..c97c7416de1 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,11 +1,11 @@ -{fetchurl, stdenv, flex, bison, db4, iptables}: +{ fetchurl, stdenv, flex, bison, db4, iptables, pkgconfig }: stdenv.mkDerivation rec { - name = "iproute2-2.6.35"; + name = "iproute2-3.6.0"; src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/iproute/iproute2-2.6.35.tar.bz2/b0f281b3124bf04669e18f5fe16d4934/iproute2-2.6.35.tar.bz2"; - sha256 = "18why1wy0v859axgrlfxn80zmskss0410hh9rf5gn9cr29zg9cla"; + url = http://kernel.org/pub/linux/utils/net/iproute2/iproute2-3.6.0.tar.xz; + sha256 = "0d05av2s7p552yszgj6glz6d74jlmg392s7n74hicgqfl16m85rd"; }; patches = [ ./vpnc.patch ]; @@ -15,20 +15,25 @@ stdenv.mkDerivation rec { patchShebangs ./configure sed -e '/ARPDDIR/d' -i Makefile ''; + postConfigure = "cat Config"; makeFlags = "DESTDIR= LIBDIR=$(out)/lib SBINDIR=$(out)/sbin" - + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}" - + " MANDIR=$(out)/share/man"; + + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}" + + " MANDIR=$(out)/share/man"; + + buildInputs = [ db4 iptables ]; + buildNativeInputs = [ bison flex pkgconfig ]; + + enableParallelBuilding = true; - buildInputs = [db4 iptables]; - buildNativeInputs = [bison flex db4]; + # Get rid of useless TeX/SGML docs. + postInstall = "rm -rf $out/share/doc"; meta = { - homepage = - http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2; - description = "A collection of utilities for controlling TCP / IP" - + " networking and traffic control in Linux"; + homepage = http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2; + description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux"; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } |