diff options
author | lassulus <lassulus@lassul.us> | 2017-12-15 09:51:09 +0100 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2017-12-15 09:51:09 +0100 |
commit | ed6ae28e2de446bc4a56aa3eec133e1f0476b0ad (patch) | |
tree | bc5fe985bf327a8791a68cf30f135ad5e847c8de /krebs | |
parent | 68274e48c9c38286d1e4e7c73bcd3c1103d47a87 (diff) | |
parent | 7f10d9526c3418197e198578eb5c4d8e7eadfc2e (diff) |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs')
-rw-r--r-- | krebs/5pkgs/simple/populate/default.nix | 9 | ||||
-rw-r--r-- | krebs/source.nix | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/krebs/5pkgs/simple/populate/default.nix b/krebs/5pkgs/simple/populate/default.nix index 0880b1d38..62e3ab216 100644 --- a/krebs/5pkgs/simple/populate/default.nix +++ b/krebs/5pkgs/simple/populate/default.nix @@ -1,24 +1,27 @@ -{ coreutils, fetchgit, git, gnused, jq, openssh, rsync, stdenv, ... }: +{ coreutils, fetchgit, findutils, git, gnused, jq, openssh, pass, rsync, stdenv +}: let PATH = stdenv.lib.makeBinPath [ coreutils + findutils git gnused jq openssh + pass rsync ]; in stdenv.mkDerivation rec { name = "populate"; - version = "2.0.0"; + version = "2.1.0"; src = fetchgit { url = http://cgit.ni.krebsco.de/populate; rev = "refs/tags/v${version}"; - sha256 = "01cvrg3m2ypg59in1qlr3rd8yzpf002k6pzjls2qb68jwkyf0h2n"; + sha256 = "0cr50y6h6nps0qgpmi01h0z9wzpv2704y5zgx2salk1grkmvcfmh"; }; phases = [ diff --git a/krebs/source.nix b/krebs/source.nix index 73e216900..8fbdce284 100644 --- a/krebs/source.nix +++ b/krebs/source.nix @@ -7,9 +7,12 @@ host@{ name, secure ? false }: let in evalSource (toString _file) { nixos-config.symlink = "stockholm/krebs/1systems/${name}/config.nix"; - secrets.file = getAttr builder { - buildbot = toString <stockholm/krebs/6tests/data/secrets>; - krebs = "${getEnv "HOME"}/secrets/krebs/${host.name}"; + secrets = getAttr builder { + buildbot.file = toString <stockholm/krebs/6tests/data/secrets>; + krebs.pass = { + dir = "${getEnv "HOME"}/brain"; + name = "krebs-secrets/${name}"; + }; }; stockholm.file = toString <stockholm>; nixpkgs.git = { |