From c05ed91d330347bd40cfdf07e8f41bc193ab9489 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 12 Feb 2024 20:46:53 +0100 Subject: [PATCH] hercules-ci-agent: runc -> crun (cherry picked from commit 1e0bfec0a710ead9c235c1f234dca2d976030e1f) --- .../continuous-integration/hercules-ci-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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