Merge remote-tracking branch 'origin/main'

This commit is contained in:
Harald Hoyer 2024-06-27 15:48:41 +02:00
commit 5a5f282f72

View file

@ -7,8 +7,7 @@
}; };
outputs = outputs =
{ self { flake-utils
, flake-utils
, nix , nix
, nixpkgs , nixpkgs
, ... , ...
@ -18,9 +17,8 @@
pkgs = (import nixpkgs) { pkgs = (import nixpkgs) {
inherit system; inherit system;
}; };
lib = pkgs.lib;
in in
rec { {
packages = rec { packages = rec {
# a modified version of the nixos/nix image # a modified version of the nixos/nix image
# re-using the upstream nix docker image generation code # re-using the upstream nix docker image generation code
@ -30,6 +28,7 @@
maxLayers = 10; maxLayers = 10;
extraPkgs = with pkgs; [ extraPkgs = with pkgs; [
nodejs_20 # nodejs is needed for running most 3rdparty actions nodejs_20 # nodejs is needed for running most 3rdparty actions
docker-client
# add any other pre-installed packages here # add any other pre-installed packages here
]; ];
# change this is you want # change this is you want
@ -60,7 +59,7 @@
copyToRoot = pkgs.buildEnv { copyToRoot = pkgs.buildEnv {
name = "image-root"; name = "image-root";
paths = [ pkgs.coreutils-full pkgs.docker-client ]; paths = [ pkgs.coreutils-full ];
pathsToLink = [ "/bin" ]; # add coreutuls (which includes sleep) to /bin pathsToLink = [ "/bin" ]; # add coreutuls (which includes sleep) to /bin
}; };
}; };