diff options
author | lassulus <lass@aidsballs.de> | 2015-10-02 18:30:07 +0200 |
---|---|---|
committer | lassulus <lass@aidsballs.de> | 2015-10-02 18:30:07 +0200 |
commit | 400002b10a01ddfd3d95be7428de14e5b6994f93 (patch) | |
tree | 19a68e3cf1b277b928ef7687e5a2ad62595eb744 /default.nix | |
parent | 29aa827a9596645362b8db47fb494696303fcf8f (diff) | |
parent | 5b719cfd5e75f105a10b3fe6827f8d2aceb95693 (diff) |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'default.nix')
-rw-r--r-- | default.nix | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/default.nix b/default.nix index c6a635c29..f14329d40 100644 --- a/default.nix +++ b/default.nix @@ -11,7 +11,21 @@ let user-modules-path = ./. + "/${current-user-name}/3modules"; user-pkgs-path = ./. + "/${current-user-name}/5pkgs"; + # XXX This is only used interactively, e.g. using get. + pkgs = + let + pkgs = import <nixpkgs> {}; + args = { + inherit pkgs; + lib = pkgs.lib; + }; + in + pkgs // + import krebs-pkgs-path args // + import user-pkgs-path args; + out = + { inherit pkgs; } // lib.mapAttrs (_: builtins.getAttr "main") (lib.filterAttrs (_: builtins.hasAttr "main") (lib.mapAttrs |