summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-10-21 00:02:17 +0000
committerGitHub <noreply@github.com>2023-10-21 00:02:17 +0000
commitfb3e2499b78f73e27cc256bc3516abeb822654bd (patch)
tree33661efdde0b77c97aa36ef32eccf6d2174a0573 /pkgs/build-support
parentcfc75eec4603c06503ae750f88cf397e00796ea8 (diff)
parent28eb936285ed02bbd53e3771f1e0153ced640c44 (diff)
downloadnixpkgs-fb3e2499b78f73e27cc256bc3516abeb822654bd.tar
nixpkgs-fb3e2499b78f73e27cc256bc3516abeb822654bd.tar.gz
nixpkgs-fb3e2499b78f73e27cc256bc3516abeb822654bd.tar.bz2
nixpkgs-fb3e2499b78f73e27cc256bc3516abeb822654bd.tar.lz
nixpkgs-fb3e2499b78f73e27cc256bc3516abeb822654bd.tar.xz
nixpkgs-fb3e2499b78f73e27cc256bc3516abeb822654bd.tar.zst
nixpkgs-fb3e2499b78f73e27cc256bc3516abeb822654bd.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/fetchdocker/credentials.nix1
-rw-r--r--pkgs/build-support/fetchdocker/generic-fetcher.nix2
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/fetchdocker/credentials.nix b/pkgs/build-support/fetchdocker/credentials.nix
index da198483268..f8a229ccb6b 100644
--- a/pkgs/build-support/fetchdocker/credentials.nix
+++ b/pkgs/build-support/fetchdocker/credentials.nix
@@ -1,3 +1,4 @@
+{ lib }:
 # We provide three paths to get the credentials into the builder's
 # environment:
 #
diff --git a/pkgs/build-support/fetchdocker/generic-fetcher.nix b/pkgs/build-support/fetchdocker/generic-fetcher.nix
index 6a7b977db29..95b193490a8 100644
--- a/pkgs/build-support/fetchdocker/generic-fetcher.nix
+++ b/pkgs/build-support/fetchdocker/generic-fetcher.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, haskellPackages, writeText, gawk }:
 let
   awk                   = "${gawk}/bin/awk";
-  dockerCredentialsFile = import ./credentials.nix;
+  dockerCredentialsFile = import ./credentials.nix { inherit lib; };
 in
 { fetcher
 , name