diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:57:50 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-13 20:57:50 +0200 |
| commit | ded9a4b1aa68b8645271a63e9543ef56177ae642 (patch) | |
| tree | d351102a17ab05c6e263e970f43ab3b30561112e /pkgs/build-support | |
| parent | 98df4f635136e63644cb0ab646b55d60cbb444a4 (diff) | |
| parent | 5b0398dc36ce5746d8d54e04a1dfcab25939484a (diff) | |
| download | nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.gz nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.bz2 nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.lz nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.xz nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.tar.zst nixpkgs-ded9a4b1aa68b8645271a63e9543ef56177ae642.zip | |
Merge branch 'staging-next' into staging
Commits from master, conflict resolutions, etc.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/fetchdocker/credentials.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/fetchdocker/credentials.nix b/pkgs/build-support/fetchdocker/credentials.nix index 001693501cc..6d084d3c77e 100644 --- a/pkgs/build-support/fetchdocker/credentials.nix +++ b/pkgs/build-support/fetchdocker/credentials.nix @@ -32,7 +32,7 @@ let pathParts = (builtins.filter - ({prefix}: "DOCKER_CREDENTIALS" == prefix) + ({prefix, path}: "DOCKER_CREDENTIALS" == prefix) builtins.nixPath); in if (pathParts != []) then (builtins.head pathParts).path else "" |