diff options
author | lassulus <lassulus@lassul.us> | 2018-03-18 22:28:59 +0100 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2018-03-18 22:28:59 +0100 |
commit | 3b8f52f4f0ae93a5e9818e784e7f4507f72aa11e (patch) | |
tree | da6fa3e2d60ab2025cb3480f3b1621154bbed076 /makefu/source.nix | |
parent | ce32c7b6d4352ac193d60100d632615c25c0198e (diff) | |
parent | 28324a02d902b0ca31a383f162c585fb8f9b2972 (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/source.nix')
-rw-r--r-- | makefu/source.nix | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/makefu/source.nix b/makefu/source.nix index 79a2c535..6b32a1b4 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 ] |