summary refs log tree commit diff
path: root/pkgs/build-support/docker/default.nix
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2022-12-07 14:07:47 +0100
committerRobert Hensing <robert@roberthensing.nl>2022-12-08 20:29:10 +0100
commit3e28f972fc389b9a4659cc70de7257dfd9022546 (patch)
tree377e4abd990370f0dfed5b3806c52a51fe55ee68 /pkgs/build-support/docker/default.nix
parentf6ae4479ea712a7f478a4e0dce92bd06b6f75370 (diff)
downloadnixpkgs-3e28f972fc389b9a4659cc70de7257dfd9022546.tar
nixpkgs-3e28f972fc389b9a4659cc70de7257dfd9022546.tar.gz
nixpkgs-3e28f972fc389b9a4659cc70de7257dfd9022546.tar.bz2
nixpkgs-3e28f972fc389b9a4659cc70de7257dfd9022546.tar.lz
nixpkgs-3e28f972fc389b9a4659cc70de7257dfd9022546.tar.xz
nixpkgs-3e28f972fc389b9a4659cc70de7257dfd9022546.tar.zst
nixpkgs-3e28f972fc389b9a4659cc70de7257dfd9022546.zip
dockerTools: refactor, rename internal variable
> has to fit its domain, which is the OCI spec, which uses
> `architecture`. The `defaultArch` and `GOARCH` names are irrelevant.
Diffstat (limited to 'pkgs/build-support/docker/default.nix')
-rw-r--r--pkgs/build-support/docker/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index bc1b58a684f..48c780e2dbe 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -74,7 +74,7 @@ let
   # Reference: https://github.com/opencontainers/image-spec/blob/master/config.md#properties
   # For the mapping from Nixpkgs system parameters to GOARCH, we can reuse the
   # mapping from the go package.
-  defaultArch = go.GOARCH;
+  defaultArchitecture = go.GOARCH;
 
 in
 rec {
@@ -102,7 +102,7 @@ rec {
     , sha256
     , os ? "linux"
     , # Image architecture, defaults to the architecture of the `hostPlatform` when unset
-      arch ? defaultArch
+      arch ? defaultArchitecture
       # This is used to set name to the pulled image
     , finalImageName ? imageName
       # This used to set a tag to the pulled image
@@ -515,7 +515,7 @@ rec {
     , # Docker config; e.g. what command to run on the container.
       config ? null
     , # Image architecture, defaults to the architecture of the `hostPlatform` when unset
-      architecture ? defaultArch
+      architecture ? defaultArchitecture
     , # Optional bash script to run on the files prior to fixturizing the layer.
       extraCommands ? ""
     , uid ? 0
@@ -840,7 +840,7 @@ rec {
     , # Docker config; e.g. what command to run on the container.
       config ? { }
     , # Image architecture, defaults to the architecture of the `hostPlatform` when unset
-      architecture ? defaultArch
+      architecture ? defaultArchitecture
     , # Time of creation of the image. Passing "now" will make the
       # created date be the time of building.
       created ? "1970-01-01T00:00:01Z"