public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dhcpcd: Update to 6.2.1

Browse Source 
Dhcpcd now has integration with udev, so it should no longer be a
problem if udev renames an interface while dhcpcd is running.
This commit is contained in:
Eelco Dolstra 2014-02-02 11:27:41 +01:00
parent 14a6a059f5
commit 559f5be07d
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/networking/dhcpcd.nix
View File

@ -106,7 +106,6 @@ in
{ description = "DHCP Client"; { description = "DHCP Client";
wantedBy = [ "network.target" ]; wantedBy = [ "network.target" ];
after = [ "systemd-udev-settle.service" ];
# Stopping dhcpcd during a reconfiguration is undesirable # Stopping dhcpcd during a reconfiguration is undesirable
# because it brings down the network interfaces configured by # because it brings down the network interfaces configured by

11
pkgs/tools/networking/dhcpcd/default.nix
View File

@ -1,15 +1,17 @@
{ stdenv, fetchurl }: { stdenv, fetchurl, pkgconfig, udev }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dhcpcd-5.6.8"; name = "dhcpcd-6.2.1";
src = fetchurl { src = fetchurl {
url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2"; url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2";
sha256 = "1i7fv1l0n7q1mnia7g0789ch63x5zhwk5gsrwvs78dv2f2kmvcd3"; sha256 = "1gs23zwhzml2aam4j6rdncaqfv3z5n1ifx6lq4b8ccifqa87gbga";
}; };
patches = [ ./lxc_ro_promote_secondaries.patch ]; patches = [ ./lxc_ro_promote_secondaries.patch ];
buildInputs = [ pkgconfig udev ];
configureFlags = "--sysconfdir=/etc"; configureFlags = "--sysconfdir=/etc";
makeFlags = "PREFIX=\${out}"; makeFlags = "PREFIX=\${out}";
@ -18,6 +20,9 @@ stdenv.mkDerivation rec {
# at runtime. # at runtime.
installFlags = "DBDIR=\${TMPDIR}/db SYSCONFDIR=$(out)/etc"; installFlags = "DBDIR=\${TMPDIR}/db SYSCONFDIR=$(out)/etc";
# Check that the udev plugin got built.
postInstall = "[ -e $out/lib/dhcpcd/dev/udev.so ]";
meta = { meta = {
description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; description = "A client for the Dynamic Host Configuration Protocol (DHCP)";
homepage = http://roy.marples.name/projects/dhcpcd; homepage = http://roy.marples.name/projects/dhcpcd;

2
pkgs/tools/networking/openresolv/default.nix
View File

@ -27,5 +27,7 @@ stdenv.mkDerivation rec {
description = "A program to manage /etc/resolv.conf"; description = "A program to manage /etc/resolv.conf";
homepage = http://roy.marples.name/projects/openresolv; homepage = http://roy.marples.name/projects/openresolv;
license = "bsd"; license = "bsd";
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.linux;
}; };
} }