diff options
| author | Vincent Demeester <vincent@sbr.pm> | 2018-01-02 10:40:22 +0100 |
|---|---|---|
| committer | Vincent Demeester <vincent@sbr.pm> | 2018-01-02 10:40:22 +0100 |
| commit | eb1baf2f10c9b79201dbfd5bb3f2203a0ba78ce9 (patch) | |
| tree | 4ffa9801753f72bef939757cfb09be85e5acab86 /pkgs/development/tools/skopeo | |
| parent | a0be858835267656ac634386cabc946e5bec0fef (diff) | |
| download | nixlib-eb1baf2f10c9b79201dbfd5bb3f2203a0ba78ce9.tar nixlib-eb1baf2f10c9b79201dbfd5bb3f2203a0ba78ce9.tar.gz nixlib-eb1baf2f10c9b79201dbfd5bb3f2203a0ba78ce9.tar.bz2 nixlib-eb1baf2f10c9b79201dbfd5bb3f2203a0ba78ce9.tar.lz nixlib-eb1baf2f10c9b79201dbfd5bb3f2203a0ba78ce9.tar.xz nixlib-eb1baf2f10c9b79201dbfd5bb3f2203a0ba78ce9.tar.zst nixlib-eb1baf2f10c9b79201dbfd5bb3f2203a0ba78ce9.zip | |
skopeo: 0.1.23 to 0.1.27
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat (limited to 'pkgs/development/tools/skopeo')
| -rw-r--r-- | pkgs/development/tools/skopeo/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/skopeo/path.patch | 13 |
2 files changed, 2 insertions, 15 deletions
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index d05706a7fadf..0f720f1f7e32 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; buildGoPackage rec { name = "skopeo-${version}"; - version = "0.1.23"; + version = "0.1.27"; rev = "v${version}"; goPackagePath = "github.com/projectatomic/skopeo"; @@ -17,7 +17,7 @@ buildGoPackage rec { inherit rev; owner = "projectatomic"; repo = "skopeo"; - sha256 = "1axxnm87fpsd7q28v951ilhmzd42k8wyh741gdfdcajjwglfj0nn"; + sha256 = "1xwwzxjczz8qdk1rf0h78qd3vk9mxxb8yi6f8kfqvcdcsvkajd5g"; }; patches = [ diff --git a/pkgs/development/tools/skopeo/path.patch b/pkgs/development/tools/skopeo/path.patch index eb3c54ae66c4..fe456b58e548 100644 --- a/pkgs/development/tools/skopeo/path.patch +++ b/pkgs/development/tools/skopeo/path.patch @@ -22,17 +22,4 @@ index 50e29b2..7108df5 100644 if c.GlobalBool("insecure-policy") { policy = &signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}} } else if policyPath == "" { -diff --git a/vendor/github.com/containers/image/docker/docker_client.go b/vendor/github.com/containers/image/docker/docker_client.go -index b989770..697d2ee 100644 ---- a/vendor/github.com/containers/image/docker/docker_client.go -+++ b/vendor/github.com/containers/image/docker/docker_client.go -@@ -154,6 +154,9 @@ func setupCertificates(dir string, tlsc *tls.Config) error { - if os.IsNotExist(err) { - return nil - } -+ if os.IsPermission(err) { -+ return nil -+ } - return err - } |