diff options
| author | Shea Levy <shea@shealevy.com> | 2018-09-06 08:09:53 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-09-06 08:09:53 -0400 |
| commit | 18337f3ece325ac0b0b26d05e2ccbe5f6398c937 (patch) | |
| tree | 401b66e49052817f7042406b51a71e1597dbbf3e /pkgs/build-support/fetchdocker/default.nix | |
| parent | 0af9072e74c9e70af62e828ba4fb21391df2e601 (diff) | |
| parent | 6da6accd303be776bb4e958da52046da86f9cb5c (diff) | |
| download | nixpkgs-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.tar nixpkgs-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.tar.gz nixpkgs-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.tar.bz2 nixpkgs-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.tar.lz nixpkgs-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.tar.xz nixpkgs-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.tar.zst nixpkgs-18337f3ece325ac0b0b26d05e2ccbe5f6398c937.zip | |
Merge branch 'no-toPath'
Diffstat (limited to 'pkgs/build-support/fetchdocker/default.nix')
| -rw-r--r-- | pkgs/build-support/fetchdocker/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix index 3556df32d92..bbd2bae46df 100644 --- a/pkgs/build-support/fetchdocker/default.nix +++ b/pkgs/build-support/fetchdocker/default.nix @@ -22,8 +22,8 @@ assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters repository assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters imageName); let - # Abuse `builtins.toPath` to collapse possible double slashes - repoTag0 = builtins.toString (builtins.toPath "/${stripScheme registry}/${repository}/${imageName}"); + # Abuse paths to collapse possible double slashes + repoTag0 = builtins.toString (/. + "/${stripScheme registry}/${repository}/${imageName}"); repoTag1 = lib.removePrefix "/" repoTag0; layers = builtins.map stripNixStore imageLayers; |