public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-02-14 11:35:50 +01:00
parent ecfa775439 53a73b0914
commit a25d48cd4f
67 changed files with 3152 additions and 2951 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/customisation.nix
View File

@@ -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;