diff options
| author | Shea Levy <shea@shealevy.com> | 2018-05-22 16:42:02 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-05-22 16:42:02 -0400 |
| commit | 6da6accd303be776bb4e958da52046da86f9cb5c (patch) | |
| tree | d6cd95529b829d4fa8d592c8cd5209b34f68d90a /pkgs/build-support/fetchdocker/default.nix | |
| parent | 74083c8cd71071739712213410a6733c98f0af33 (diff) | |
| download | nixpkgs-6da6accd303be776bb4e958da52046da86f9cb5c.tar nixpkgs-6da6accd303be776bb4e958da52046da86f9cb5c.tar.gz nixpkgs-6da6accd303be776bb4e958da52046da86f9cb5c.tar.bz2 nixpkgs-6da6accd303be776bb4e958da52046da86f9cb5c.tar.lz nixpkgs-6da6accd303be776bb4e958da52046da86f9cb5c.tar.xz nixpkgs-6da6accd303be776bb4e958da52046da86f9cb5c.tar.zst nixpkgs-6da6accd303be776bb4e958da52046da86f9cb5c.zip | |
treewide: Remove uses of builtins.toPath.
toPath has confusing semantics and is never necessary; it can always either just be omitted or replaced by pre-concatenating `/.`. It has been marked as "!!! obsolete?" for more than 10 years in a C++ comment, hopefully removing it will let us properly deprecate and, eventually, remove it.
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 ae3ae4185e0..b54e4141afc 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; |