diff options
| author | lassulus <git@lassul.us> | 2023-06-21 16:01:33 +0200 |
|---|---|---|
| committer | lassulus <git@lassul.us> | 2023-06-21 16:01:33 +0200 |
| commit | a0c4427c0baa94603fa10c1248944e7837e72642 (patch) | |
| tree | caa4053366d62b683e6f6e746e9df0317de88c80 /krebs/3modules/ci | |
| parent | c6593fdb393a585e631b9824e2bb3857ba2f90c6 (diff) | |
| parent | fdc364520238a38883d28bbfa05ac966e792ed8b (diff) | |
Merge remote-tracking branch 'ni/flakify'
Diffstat (limited to 'krebs/3modules/ci')
| -rw-r--r-- | krebs/3modules/ci/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/krebs/3modules/ci/default.nix b/krebs/3modules/ci/default.nix index 022da5884..5035a11a8 100644 --- a/krebs/3modules/ci/default.nix +++ b/krebs/3modules/ci/default.nix @@ -1,6 +1,5 @@ { config, lib, pkgs, ... }: - -with import <stockholm/lib>; +with import ../../../lib/pure.nix { inherit lib; }; let cfg = config.krebs.ci; @@ -25,7 +24,7 @@ let }; hostname = config.networking.hostName; - getJobs = pkgs.writeDash "get_jobs" '' + getJobs = pkgs.writers.writeDash "get_jobs" '' set -efu ${pkgs.nix}/bin/nix-build --no-out-link --quiet --show-trace -Q ./ci.nix >&2 json="$(${pkgs.nix}/bin/nix-instantiate --quiet -Q --eval --strict --json ./ci.nix)" @@ -116,7 +115,7 @@ let build_script = stages[stage], ), timeout = 3600, - command="${pkgs.writeDash "build.sh" '' + command="${pkgs.writers.writeDash "build.sh" '' set -xefu profile=${shell.escape profileRoot}/$build_name result=$("$build_script") |