From 559f5be07d33ed423f04c2b6dd88b0f9b95093b0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Sun, 2 Feb 2014 11:27:41 +0100 Subject: [PATCH] dhcpcd: Update to 6.2.1 Dhcpcd now has integration with udev, so it should no longer be a problem if udev renames an interface while dhcpcd is running. --- nixos/modules/services/networking/dhcpcd.nix | 1 - pkgs/tools/networking/dhcpcd/default.nix | 11 ++++++++--- pkgs/tools/networking/openresolv/default.nix | 4 +++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 08a5d6de6a2b..d4ec96a18f6f 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -106,7 +106,6 @@ in { description = "DHCP Client"; wantedBy = [ "network.target" ]; - after = [ "systemd-udev-settle.service" ]; # Stopping dhcpcd during a reconfiguration is undesirable # because it brings down the network interfaces configured by diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index ad0b62d19f81..fe683c382853 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-5.6.8"; + name = "dhcpcd-6.2.1"; src = fetchurl { url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2"; - sha256 = "1i7fv1l0n7q1mnia7g0789ch63x5zhwk5gsrwvs78dv2f2kmvcd3"; + sha256 = "1gs23zwhzml2aam4j6rdncaqfv3z5n1ifx6lq4b8ccifqa87gbga"; }; patches = [ ./lxc_ro_promote_secondaries.patch ]; + buildInputs = [ pkgconfig udev ]; + configureFlags = "--sysconfdir=/etc"; makeFlags = "PREFIX=\${out}"; @@ -18,6 +20,9 @@ stdenv.mkDerivation rec { # at runtime. installFlags = "DBDIR=\${TMPDIR}/db SYSCONFDIR=$(out)/etc"; + # Check that the udev plugin got built. + postInstall = "[ -e $out/lib/dhcpcd/dev/udev.so ]"; + meta = { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; homepage = http://roy.marples.name/projects/dhcpcd; diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 3271941f884b..36d3bfeca56f 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -23,9 +23,11 @@ stdenv.mkDerivation rec { installFlags = "SYSCONFDIR=$(out)/etc"; - meta = { + meta = { description = "A program to manage /etc/resolv.conf"; homepage = http://roy.marples.name/projects/openresolv; license = "bsd"; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; }; }