Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ma source: bump nixpkgs

Browse Source
This commit is contained in:
makefu 2018-03-07 01:48:44 +01:00
parent 0170701ee6
commit 194e7011d4
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
makefu/source.nix
View File

@ -1,12 +1,13 @@
with import <stockholm/lib>; with import <stockholm/lib>;
host@{ name, host@{ name,
override ? {}, override ? {}
secure ? false, , secure ? false
full ? false, , full ? false
torrent ? false, , torrent ? false
hw ? false, , hw ? false
musnix ? false, , musnix ? false
python ? false , python ? false
, unstable ? false #unstable channel checked out
}: }:
let let
builder = if getEnv "dummy_secrets" == "true" builder = if getEnv "dummy_secrets" == "true"
@ -14,7 +15,7 @@ let
else "makefu"; else "makefu";
_file = <stockholm> + "/makefu/1systems/${name}/source.nix"; _file = <stockholm> + "/makefu/1systems/${name}/source.nix";
# TODO: automate updating of this ref + cherry-picks # TODO: automate updating of this ref + cherry-picks
ref = "51810e0"; # nixos-17.09 @ 2018-02-14 ref = "6b6e72b"; # nixos-17.09 @ 2018-03-07
# + do_sqlite3 ruby: 55a952be5b5 # + do_sqlite3 ruby: 55a952be5b5
# + signal: 0f19beef3 # + signal: 0f19beef3
@ -53,21 +54,30 @@ in
(mkIf ( hw ) { (mkIf ( hw ) {
nixos-hardware.git = { nixos-hardware.git = {
url = https://github.com/nixos/nixos-hardware.git; url = https://github.com/nixos/nixos-hardware.git;
ref = "8a05dc9"; ref = "30fdd53";
}; };
}) })
(mkIf ( python ) { (mkIf ( python ) {
python.git = { python.git = {
url = https://github.com/garbas/nixpkgs-python; url = https://github.com/garbas/nixpkgs-python;
ref = "cac319b"; ref = "cac319b7";
}; };
}) })
(mkIf ( torrent ) { (mkIf ( torrent ) {
torrent-secrets.file = getAttr builder { torrent-secrets.file = getAttr builder {
buildbot = toString <stockholm/makefu/6tests/data/secrets>; buildbot = toString <stockholm/makefu/6tests/data/secrets>;
makefu = "/home/makefu/secrets/torrent" ; makefu = "/home/makefu/secrets/torrent" ;
}; };
}) })
(mkIf ( unstable ) {
nixpkgs-unstable.git = {
url = https://github.com/nixos/nixpkgs-channels;
ref = "nixos-unstable";
};
})
override override
] ]