diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-21 00:02:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-21 00:02:49 +0000 |
| commit | 613d60266a74ea96bddceed8edd396199107ab6b (patch) | |
| tree | a220a0b1f6bef23989f10141ec7f7465fbdfa41d /pkgs/build-support | |
| parent | 02a21c89b8fcee7f83d40ba03983d2971960fd90 (diff) | |
| parent | fb3e2499b78f73e27cc256bc3516abeb822654bd (diff) | |
| download | nixpkgs-613d60266a74ea96bddceed8edd396199107ab6b.tar nixpkgs-613d60266a74ea96bddceed8edd396199107ab6b.tar.gz nixpkgs-613d60266a74ea96bddceed8edd396199107ab6b.tar.bz2 nixpkgs-613d60266a74ea96bddceed8edd396199107ab6b.tar.lz nixpkgs-613d60266a74ea96bddceed8edd396199107ab6b.tar.xz nixpkgs-613d60266a74ea96bddceed8edd396199107ab6b.tar.zst nixpkgs-613d60266a74ea96bddceed8edd396199107ab6b.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/fetchdocker/credentials.nix | 1 | ||||
| -rw-r--r-- | pkgs/build-support/fetchdocker/generic-fetcher.nix | 2 |
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 |