Merge branch 'systemd-update'

2014-04-20 19:31:01 +02:00
parent cb83796abb a0c0dfb647
commit 4e8c2f0ff9
78 changed files with 947 additions and 1242 deletions
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, udev }:

 stdenv.mkDerivation rec {
-  name = "dhcpcd-6.2.1";
+  name = "dhcpcd-6.3.2";

  src = fetchurl {
    url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2";
-    sha256 = "1gs23zwhzml2aam4j6rdncaqfv3z5n1ifx6lq4b8ccifqa87gbga";
+    sha256 = "1v2m5wdr6x5cz6i0n1y63am9dhj5j7ylrk717scjgwwjdbq1x75n";
  };

  patches = [ ./lxc_ro_promote_secondaries.patch ];