mirror/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-29 23:52:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #33319 from vdemeester/update-skopeo

Browse Source 
skopeo: 0.1.23 to 0.1.27
This commit is contained in:
adisbladis 2018-01-02 11:33:10 +01:00 committed by GitHub
commit 37b76f9d1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/skopeo/default.nix
View File

@ -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 = [

13
pkgs/development/tools/skopeo/path.patch
View File

@ -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
}