Merge remote-tracking branch 'upstream/master' into staging

2018-09-18 16:55:42 -04:00
parent ce6e72a11c 35378f0141
commit 7319013ea1
850 changed files with 49899 additions and 16989 deletions
@@ -32,10 +32,11 @@ stdenv.mkDerivation rec {
  # Check that the udev plugin got built.
  postInstall = stdenv.lib.optional (udev != null) "[ -e $out/lib/dhcpcd/dev/udev.so ]";

-  meta = {
+  meta = with stdenv.lib; {
    description = "A client for the Dynamic Host Configuration Protocol (DHCP)";
    homepage = https://roy.marples.name/projects/dhcpcd;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ eelco fpletz ];
+    platforms = platforms.linux;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ eelco fpletz ];
  };
 }