Merge pull request #49897 from nlewo/skopeo-v1.0.32

skopeo: 0.1.31 -> 0.1.32
This commit is contained in:
Vladyslav M 2018-11-09 23:17:36 +02:00 committed by GitHub
commit a214f38477
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5,18 +5,18 @@
with stdenv.lib;
let
version = "0.1.31";
version = "0.1.32";
src = fetchFromGitHub {
rev = "v${version}";
owner = "projectatomic";
owner = "containers";
repo = "skopeo";
sha256 = "02z46wxhms8yph03ksl7i4hbqy15v3y1r43js9dxn0a45vxkm7lb";
sha256 = "0pyii4z9xf23lsdx4d3m5pkdyrsi4v1pbjj8l7fjgyfv8ncrjyn8";
};
defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out";
goPackagePath = "github.com/projectatomic/skopeo";
goPackagePath = "github.com/containers/skopeo";
in
buildGoPackage rec {
@ -32,8 +32,8 @@ buildGoPackage rec {
buildFlagsArray = ''
-ldflags=
-X github.com/projectatomic/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile}
-X github.com/projectatomic/skopeo/vendor/github.com/containers/image/internal/tmpdir.unixTempDirForBigFiles=/tmp
-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
'';
preBuild = ''