Merge pull request #590 from nix-community/misc

Various fixes (macOS, mdns)

Author: zimbatm

darwin/mixins/nix-experimental.nix

@@ -19,7 +19,4 @@
     ++ lib.optional (lib.versionAtLeast (lib.versions.majorMinor config.nix.package.version) "2.19")
       # Allow the use of the impure-env setting.
       "configurable-impure-env";
-
-  # for container in builds support
-  nix.settings.system-features = lib.mkDefault [ "uid-range" ];
 }

nixos/mixins/mdns.nix

@@ -1,22 +1,18 @@
 { config, lib, ... }:
 let
-  # The default value of useDHCP for individual interfaces is null!
-  mapInterfaceEnabled = i: lib.nameValuePair "40-${i.name}" (i.useDHCP == true);
-  mapMDNSConfig = enableMDNS: {
-    networkConfig.MulticastDNS = lib.mkDefault enableMDNS;
-  };
-
-  configs = {
-    "99-ethernet-default-dhcp" = config.networking.useDHCP;
-    "99-wireless-client-dhcp" = config.networking.useDHCP;
-  } // (lib.mapAttrs' (_: mapInterfaceEnabled) config.networking.interfaces);
+  dhcpInterfaces = lib.filterAttrs (i: i.useDHCP == true) config.networking.interfaces;
 in
 {
   # Avahi is an alternative implementation. If it's enabled, than we don't need the code below.
   config = lib.mkIf (!config.services.avahi.enable) {
     networking.firewall.allowedUDPPorts = [ 5353 ]; # Multicast DNS
 
     # Allows to find machines on the local network by name, i.e. useful for printer discovery
-    systemd.network.networks = builtins.mapAttrs (_: mapMDNSConfig) configs;
+    systemd.network.networks =
+      lib.optionalAttrs (config.networking.useDHCP) {
+        "99-ethernet-default-dhcp".networkConfig.MulticastDNS = lib.mkDefault true;
+        "99-wireless-client-dhcp".networkConfig.MulticastDNS = lib.mkDefault true;
+      }
+      // builtins.mapAttrs (_: { networkConfig.MulticastDNS = lib.mkDefault true; }) dhcpInterfaces;
   };
 }

shared/common/flake.nix

@@ -43,11 +43,6 @@ in
 
   };
   config = lib.mkIf (cfg.flake != null) {
-
-    nixpkgs.flake = {
-      source = lib.mkDefault (cfg.flake.inputs.nixpkgs or null);
-    };
-
     nix.registry = lib.optionalAttrs cfg.registerSelf {
       self.to = lib.mkDefault {
         type = "path";