diff options
| author | William A. Kennington III <william@wkennington.com> | 2013-11-28 01:37:30 -0600 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2013-11-29 02:08:51 -0600 |
| commit | f18efaf26e88f6f9b50efa4a6b6d154a9369f0b8 (patch) | |
| tree | dce46140409e69f3d65391a86167f9d5786b06e1 /pkgs/os-specific/linux/iproute | |
| parent | c7ae9e39d9064a098787e9fa43d4e2bff8da3027 (diff) | |
| download | nixlib-f18efaf26e88f6f9b50efa4a6b6d154a9369f0b8.tar nixlib-f18efaf26e88f6f9b50efa4a6b6d154a9369f0b8.tar.gz nixlib-f18efaf26e88f6f9b50efa4a6b6d154a9369f0b8.tar.bz2 nixlib-f18efaf26e88f6f9b50efa4a6b6d154a9369f0b8.tar.lz nixlib-f18efaf26e88f6f9b50efa4a6b6d154a9369f0b8.tar.xz nixlib-f18efaf26e88f6f9b50efa4a6b6d154a9369f0b8.tar.zst nixlib-f18efaf26e88f6f9b50efa4a6b6d154a9369f0b8.zip | |
Upgrade iproute2 from 3.8.0 -> 3.12.0
Additionally rmeove the werror patch as it is not needed for the build anymore.
Diffstat (limited to 'pkgs/os-specific/linux/iproute')
| -rw-r--r-- | pkgs/os-specific/linux/iproute/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/iproute/no-werror.patch | 12 |
2 files changed, 3 insertions, 17 deletions
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 4ea4152e30d4..9e8faa6a02e3 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, flex, bison, db4, iptables, pkgconfig }: stdenv.mkDerivation rec { - name = "iproute2-3.8.0"; + name = "iproute2-3.12.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "0kqy30wz2krbg4y7750hjq5218hgy2vj9pm5qzkn1bqskxs4b4ap"; + sha256 = "04gi11gh087bg2nlxhj0lxrk8l9qxkpr88nsiil23917bm3h1xj4"; }; - patches = [ ./vpnc.patch ./no-werror.patch ]; + patch = [ "vpnc.patch" ]; preConfigure = '' @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { 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"; diff --git a/pkgs/os-specific/linux/iproute/no-werror.patch b/pkgs/os-specific/linux/iproute/no-werror.patch deleted file mode 100644 index 593b56b8de09..000000000000 --- a/pkgs/os-specific/linux/iproute/no-werror.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ubr iproute2-3.8.0-orig/Makefile iproute2-3.8.0/Makefile ---- iproute2-3.8.0-orig/Makefile 2013-04-06 00:03:21.072827860 +0200 -+++ iproute2-3.8.0/Makefile 2013-04-06 00:03:25.353837862 +0200 -@@ -30,7 +30,7 @@ - HOSTCC = gcc - DEFINES += -D_GNU_SOURCE - CCOPTS = -O2 --WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes -+WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes - WFLAGS += -Wmissing-declarations -Wold-style-definition - - CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) |