tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

hercules-ci-agent: runc -> crun

(cherry picked from commit 1e0bfec0a710ead9c235c1f234dca2d976030e1f)

Robert Hensing c05ed91d 9bcf319a

+2 -2
unified split
+2 -2
pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix
··· 1 { 2 git, 3 gnutar, 4 gzip, ··· 8 makeBinaryWrapper, 9 nixos, 10 openssh, 11 - runc, 12 stdenv, 13 testers, 14 }: 15 let 16 inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables; 17 inherit (lib) makeBinPath; 18 - bundledBins = [ gnutar gzip git openssh ] ++ lib.optional stdenv.isLinux runc; 19 20 pkg = 21 # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
··· 1 { 2 + crun, 3 git, 4 gnutar, 5 gzip, ··· 9 makeBinaryWrapper, 10 nixos, 11 openssh, 12 stdenv, 13 testers, 14 }: 15 let 16 inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables; 17 inherit (lib) makeBinPath; 18 + bundledBins = [ gnutar gzip git openssh ] ++ lib.optional stdenv.isLinux crun; 19 20 pkg = 21 # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990