Merge branch 'master' of prism:stockholm

This commit is contained in:
makefu 2018-01-09 23:59:43 +01:00
commit 44d12e0037
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 2 additions and 2 deletions

View File

@ -28,7 +28,7 @@ with import <stockholm/lib>;
URxvt*scrollBar: false
URxvt*urgentOnBell: true
URxvt*font: xft:DejaVu Sans Mono:pixelsize=20
URxvt*font: xft:DejaVu Sans Mono:pixelsize=12
URXvt*faceSize: 12
'';
}

View File

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