Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging

2018-03-03 22:40:32 +02:00
parent a5913ce272 618ac29687
commit 1e107443ad
101 changed files with 2988 additions and 748 deletions
@@ -1,11 +1,13 @@
 { stdenv, fetchurl, pkgconfig, udev, runtimeShellPackage }:

 stdenv.mkDerivation rec {
-  name = "dhcpcd-7.0.1";
+  # when updating this to >=7, check, see previous reverts:
+  # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix
+  name = "dhcpcd-6.11.5";

  src = fetchurl {
    url = "mirror://roy/dhcpcd/${name}.tar.xz";
-    sha256 = "1j7kyg9gm5d1k6qjdscjz2rjgpqia0dxgk69lswp21y0pizm6dlb";
+    sha256 = "17nnhxmbdcc7k2mh6sgvxisqcqbic5540xbig363ds97gvf795kg";
  };

  nativeBuildInputs = [ pkgconfig ];