diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 8c5896561fc..8154816ab86 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.6.7"; + name = "dhcpcd-6.8.0"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.bz2"; - sha256 = "1aydp26xsn9y6acg5zmcz6pp6parywnmhcvp9ipf54vbac53mya3"; + sha256 = "0h52rkzw87fyq5vj8zscbgf0ig9c881xz7i0rn3hvk28li7la0cb"; }; - patches = [ /* ./lxc_ro_promote_secondaries.patch */ ]; - buildInputs = [ pkgconfig udev ]; - configureFlags = "--sysconfdir=/etc"; + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; makeFlags = "PREFIX=\${out}"; diff --git a/pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch b/pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch deleted file mode 100644 index 066ea67db9e..00000000000 --- a/pkgs/tools/networking/dhcpcd/lxc_ro_promote_secondaries.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN dhcpcd-6.1.0-old/if-linux.c dhcpcd-6.1.0/if-linux.c ---- dhcpcd-6.1.0-old/if-linux.c 2013-09-20 12:27:24.000000000 +0200 -+++ dhcpcd-6.1.0/if-linux.c 2013-12-13 09:50:24.183694744 +0100 -@@ -86,7 +86,7 @@ if_init(struct interface *iface) - - fp = fopen(path, "w"); - if (fp == NULL) -- return errno == ENOENT ? 0 : -1; -+ return (errno == ENOENT || errno == EROFS) ? 0 : -1; - n = fprintf(fp, "1"); - fclose(fp); - return n == -1 ? -1 : 0;