diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-07 18:00:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-07 18:00:55 +0000 |
| commit | b9f10d0e3e2e4b8805b265497a086fdd0a164e10 (patch) | |
| tree | 4dd58b8560100d9f2b7f283cc2b37f39a3a033c9 /pkgs/development/tools | |
| parent | 1371fe63278d856490bf9dc0b0634828d2e01483 (diff) | |
| parent | 48a8aef2f34c46081f181f28f7790569f1149c85 (diff) | |
| download | nixlib-b9f10d0e3e2e4b8805b265497a086fdd0a164e10.tar nixlib-b9f10d0e3e2e4b8805b265497a086fdd0a164e10.tar.gz nixlib-b9f10d0e3e2e4b8805b265497a086fdd0a164e10.tar.bz2 nixlib-b9f10d0e3e2e4b8805b265497a086fdd0a164e10.tar.lz nixlib-b9f10d0e3e2e4b8805b265497a086fdd0a164e10.tar.xz nixlib-b9f10d0e3e2e4b8805b265497a086fdd0a164e10.tar.zst nixlib-b9f10d0e3e2e4b8805b265497a086fdd0a164e10.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/continuous-integration/hci/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/continuous-integration/hci/default.nix b/pkgs/development/tools/continuous-integration/hci/default.nix index 1acafb10eabc..0fac1dfc04c6 100644 --- a/pkgs/development/tools/continuous-integration/hci/default.nix +++ b/pkgs/development/tools/continuous-integration/hci/default.nix @@ -1,8 +1,8 @@ -{ haskell, haskellPackages, lib, makeWrapper, runc, stdenv, emptyDirectory }: +{ crun, haskell, haskellPackages, lib, makeWrapper, stdenv, emptyDirectory }: let inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables appendConfigureFlags; inherit (lib) makeBinPath; - bundledBins = lib.optional stdenv.isLinux runc; + bundledBins = lib.optional stdenv.isLinux crun; overrides = old: { hercules-ci-agent = diff --git a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix index c5c52d29d3aa..8d4805341d55 100644 --- a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix @@ -1,4 +1,5 @@ { + crun, git, gnutar, gzip, @@ -8,14 +9,13 @@ makeBinaryWrapper, nixos, openssh, - runc, stdenv, testers, }: let inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables; inherit (lib) makeBinPath; - bundledBins = [ gnutar gzip git openssh ] ++ lib.optional stdenv.isLinux runc; + bundledBins = [ gnutar gzip git openssh ] ++ lib.optional stdenv.isLinux crun; pkg = # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 |