diff options
author | makefu <github@syntax-fehler.de> | 2016-02-15 17:07:48 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2016-02-15 17:07:48 +0100 |
commit | 3ceff0ec29a36119ea83f02c8943752d91b250e9 (patch) | |
tree | 7b179bc972ea01c9305ea64697e14237346885d8 /makefu/2configs/default.nix | |
parent | 9a4071b66ff45e99a30e9a314eb43c6efc7e921f (diff) | |
parent | 372f2d77f301719e396a6f943657325e2f8b2cf4 (diff) |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'makefu/2configs/default.nix')
-rw-r--r-- | makefu/2configs/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index f7f70de3b..83018e9f8 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with lib; +with config.krebs.lib; { system.stateVersion = "15.09"; @@ -20,7 +20,7 @@ with lib; build = { user = config.krebs.users.makefu; source = mapAttrs (_: mkDefault) { - upstream-nixpkgs = { + nixpkgs = { url = https://github.com/nixos/nixpkgs; rev = "77f8f35d57618c1ba456d968524f2fb2c3448295"; # unstable @ 2015-01-27, tested on wry }; @@ -29,8 +29,6 @@ with lib; # Defaults for all stockholm users? nixos-config = "symlink:stockholm/${config.krebs.build.user.name}/1systems/${config.krebs.build.host.name}.nix"; - nixpkgs = symlink:stockholm/nixpkgs; - stockholm-user = "symlink:stockholm/${config.krebs.build.user.name}"; }; }; }; |