about summary refs log tree commit diff
path: root/pkgs/development/tools
diff options
context:
space:
mode:
authorDaniel Gorin <daniel.gorin@habito.com>2020-03-10 14:33:25 +0000
committerDaniel Gorin <daniel.gorin@habito.com>2020-03-10 14:33:25 +0000
commita646f4b45436bd16aa390b22e0548efd3c7a118f (patch)
treeb7554e37420089215235331625c85eabe2a67afc /pkgs/development/tools
parent8cc3a22dd47f998d0e4e865de723c053006239bd (diff)
downloadnixlib-a646f4b45436bd16aa390b22e0548efd3c7a118f.tar
nixlib-a646f4b45436bd16aa390b22e0548efd3c7a118f.tar.gz
nixlib-a646f4b45436bd16aa390b22e0548efd3c7a118f.tar.bz2
nixlib-a646f4b45436bd16aa390b22e0548efd3c7a118f.tar.lz
nixlib-a646f4b45436bd16aa390b22e0548efd3c7a118f.tar.xz
nixlib-a646f4b45436bd16aa390b22e0548efd3c7a118f.tar.zst
nixlib-a646f4b45436bd16aa390b22e0548efd3c7a118f.zip
Fix missing default-policy.json in skopeo
We started having issues with `pkgs.dockerTools.pullImage`, were it
would fail with:

```
FATA[0000] Error loading trust policy: open /etc/containers/policy.json: no such file or directory
```

It turns out that since `skopeo` was bumped to `0.1.40`, it was
accidentally no longer being built with a default policy.

This may happen again, see https://github.com/containers/skopeo/issues/787
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r--pkgs/development/tools/skopeo/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index 957f691d2250..c065629018c9 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -33,8 +33,8 @@ buildGoPackage {
 
   buildFlagsArray = ''
     -ldflags=
-    -X github.com/containers/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile}
-    -X github.com/containers/skopeo/vendor/github.com/containers/image/internal/tmpdir.unixTempDirForBigFiles=/tmp
+    -X github.com/containers/skopeo/vendor/github.com/containers/image/v5/signature.systemDefaultPolicyPath=${defaultPolicyFile}
+    -X github.com/containers/skopeo/vendor/github.com/containers/image/v5/internal/tmpdir.unixTempDirForBigFiles=/tmp
   '';
 
   preBuild = ''