Skip to content

Commit 17c94ca

Browse files
authored
Merge pull request #13469 from drupol/push-nnwkpwsowkqm
docker: set default parameters values
2 parents 1272c49 + 3e9a100 commit 17c94ca

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

docker.nix

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
# Core dependencies
3-
pkgs,
4-
lib,
5-
dockerTools,
6-
runCommand,
7-
buildPackages,
3+
pkgs ? import <nixpkgs> { },
4+
lib ? pkgs.lib,
5+
dockerTools ? pkgs.dockerTools,
6+
runCommand ? pkgs.runCommand,
7+
buildPackages ? pkgs.buildPackages,
88
# Image configuration
99
name ? "nix",
1010
tag ? "latest",
@@ -28,24 +28,24 @@
2828
},
2929
Cmd ? [ (lib.getExe bashInteractive) ],
3030
# Default Packages
31-
nix,
32-
bashInteractive,
33-
coreutils-full,
34-
gnutar,
35-
gzip,
36-
gnugrep,
37-
which,
38-
curl,
39-
less,
40-
wget,
41-
man,
42-
cacert,
43-
findutils,
44-
iana-etc,
45-
gitMinimal,
46-
openssh,
31+
nix ? pkgs.nix,
32+
bashInteractive ? pkgs.bashInteractive,
33+
coreutils-full ? pkgs.coreutils-full,
34+
gnutar ? pkgs.gnutar,
35+
gzip ? pkgs.gzip,
36+
gnugrep ? pkgs.gnugrep,
37+
which ? pkgs.which,
38+
curl ? pkgs.curl,
39+
less ? pkgs.less,
40+
wget ? pkgs.wget,
41+
man ? pkgs.man,
42+
cacert ? pkgs.cacert,
43+
findutils ? pkgs.findutils,
44+
iana-etc ? pkgs.iana-etc,
45+
gitMinimal ? pkgs.gitMinimal,
46+
openssh ? pkgs.openssh,
4747
# Other dependencies
48-
shadow,
48+
shadow ? pkgs.shadow,
4949
}:
5050
let
5151
defaultPkgs = [

0 commit comments

Comments
 (0)