Merge branch 'master' of prism.r:stockholm

This commit is contained in:
jeschli 2018-01-09 18:31:15 +01:00
commit f49137353e

View File

@ -10,7 +10,7 @@ in
nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix"; nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix";
nixpkgs.git = { nixpkgs.git = {
url = https://github.com/nixos/nixpkgs; url = https://github.com/nixos/nixpkgs;
ref = "0653b73"; ref = "d202e30";
}; };
secrets = getAttr builder { secrets = getAttr builder {
buildbot.file = toString <stockholm/lass/2configs/tests/dummy-secrets>; buildbot.file = toString <stockholm/lass/2configs/tests/dummy-secrets>;