summaryrefslogtreecommitdiffstats
path: root/makefu/source.nix
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2018-03-22 11:42:05 +0100
committerjeschli <jeschli@gmail.com>2018-03-22 11:42:05 +0100
commit9bb628406d001fbf9070bf533f1b81f43f4c96a8 (patch)
treea0b95f82f3c3a0b52ebc87f6c7756de70d646bfb /makefu/source.nix
parent87528e2ab6085a1a0fadcd1aa00870834c878c27 (diff)
parentbd4def24bfbd8f034032e3a6e89ce4dd88d6930e (diff)
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'makefu/source.nix')
-rw-r--r--makefu/source.nix38
1 files changed, 28 insertions, 10 deletions
diff --git a/makefu/source.nix b/makefu/source.nix
index 79a2c535f..6b32a1b40 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -1,12 +1,14 @@
with import <stockholm/lib>;
host@{ name,
- override ? {},
- secure ? false,
- full ? false,
- torrent ? false,
- hw ? false,
- musnix ? false,
- python ? false
+ override ? {}
+, secure ? false
+, full ? false
+, torrent ? false
+, hw ? false
+, musnix ? false
+, python ? false
+, unstable ? false #unstable channel checked out
+, mic92 ? false
}:
let
builder = if getEnv "dummy_secrets" == "true"
@@ -19,7 +21,7 @@ let
];
};
# 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
# + signal: 0f19beef3
@@ -59,21 +61,37 @@ in
(mkIf ( hw ) {
nixos-hardware.git = {
url = https://github.com/nixos/nixos-hardware.git;
- ref = "8a05dc9";
+ ref = "30fdd53";
};
})
(mkIf ( python ) {
python.git = {
url = https://github.com/garbas/nixpkgs-python;
- ref = "cac319b";
+ ref = "cac319b7";
};
})
+
(mkIf ( torrent ) {
torrent-secrets.file = getAttr builder {
buildbot = toString <stockholm/makefu/6tests/data/secrets>;
makefu = "/home/makefu/secrets/torrent" ;
};
})
+
+ (mkIf ( unstable ) {
+ nixpkgs-unstable.git = {
+ url = https://github.com/nixos/nixpkgs-channels;
+ ref = "nixos-unstable";
+ };
+ })
+
+ (mkIf ( mic92 ) {
+ mic92.git = {
+ url = https://github.com/Mic92/dotfiles/;
+ ref = "48a1f49";
+ };
+ })
+
override
]