ma source: use .pass

This commit is contained in:
makefu 2018-04-21 20:52:46 +02:00
parent 6562519e3f
commit b082985421
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225

View File

@ -1,14 +1,16 @@
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 , unstable ? false #unstable channel checked out
, mic92 ? false , mic92 ? false
, nms ? false
, clever_kexec ?false
}: }:
let let
builder = if getEnv "dummy_secrets" == "true" builder = if getEnv "dummy_secrets" == "true"
@ -42,11 +44,15 @@ in
file = "/home/makefu/store/${ref}"; file = "/home/makefu/store/${ref}";
}; };
secrets.file = getAttr builder { secrets = getAttr builder {
buildbot = toString <stockholm/makefu/6tests/data/secrets>; buildbot.file = toString <stockholm/makefu/6tests/data/secrets>;
makefu = "/home/makefu/secrets/${name}"; makefu.pass = {
inherit name;
dir = "${getEnv "HOME"}/.secrets-pass";
};
}; };
stockholm.file = toString <stockholm>; stockholm.file = toString <stockholm>;
stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version"; stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version";
} }
@ -72,9 +78,12 @@ in
}) })
(mkIf ( torrent ) { (mkIf ( torrent ) {
torrent-secrets.file = getAttr builder { torrent-secrets = getAttr builder {
buildbot = toString <stockholm/makefu/6tests/data/secrets>; buildbot.file = toString <stockholm/makefu/6tests/data/secrets>;
makefu = "/home/makefu/secrets/torrent" ; makefu.pass = {
name = "torrent";
dir = "${getEnv "HOME"}/.secrets-pass";
};
}; };
}) })
@ -92,5 +101,19 @@ in
}; };
}) })
(mkIf ( nms ) {
nms.git = {
url = https://github.com/r-raymond/nixos-mailserver;
ref = "v2.1.2";
};
})
(mkIf ( clever_kexec ) {
clever_kexec.git = {
url = https://github.com/cleverca22/nix-tests;
ref = "5a670de7f2decfaafc95c34ffeb0f1896662f3d7";
};
})
override override
] ]