Merge master into staging-next

2019-02-16 09:29:54 +01:00
parent 5a322693f4 039f359a7d
commit 6fe10d2779
202 changed files with 4386 additions and 3640 deletions
@@ -121,7 +121,7 @@ rec {
      auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs;
      origArgs = auto // args;
      pkgs = f origArgs;
-      mkAttrOverridable = name: pkg: makeOverridable (newArgs: (f newArgs).${name}) origArgs;
+      mkAttrOverridable = name: _: makeOverridable (newArgs: (f newArgs).${name}) origArgs;
    in lib.mapAttrs mkAttrOverridable pkgs;