public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'no-toPath'

Browse Source
This commit is contained in:
Shea Levy
2018-09-06 08:09:53 -04:00
parent 0af9072e74 6da6accd30
commit 18337f3ece
11 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/fetchdocker/default.nix
+2 -2
View File
@@ -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;