diff options
| author | Antoine Eiche <lewo@abesis.fr> | 2018-05-24 10:33:18 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-05-24 15:33:52 +0200 |
| commit | 8f71ce7e80caad32bfd4e85fb67c4e9fbca5a82d (patch) | |
| tree | 2768137c1eab68839f69472e8c4ba46ea3cef51b /pkgs/development/tools/skopeo | |
| parent | e22d072c641bdd4f615932b8afb06aed518867d5 (diff) | |
| download | nixlib-8f71ce7e80caad32bfd4e85fb67c4e9fbca5a82d.tar nixlib-8f71ce7e80caad32bfd4e85fb67c4e9fbca5a82d.tar.gz nixlib-8f71ce7e80caad32bfd4e85fb67c4e9fbca5a82d.tar.bz2 nixlib-8f71ce7e80caad32bfd4e85fb67c4e9fbca5a82d.tar.lz nixlib-8f71ce7e80caad32bfd4e85fb67c4e9fbca5a82d.tar.xz nixlib-8f71ce7e80caad32bfd4e85fb67c4e9fbca5a82d.tar.zst nixlib-8f71ce7e80caad32bfd4e85fb67c4e9fbca5a82d.zip | |
skopeo: 0.1.29 -> 0.1.30
Skopeo used by our docker tools was patched to work in the build sandbox (it used /var/tmp which is not available in the sandbox). Since this temporary directory can now be set at build time, we remove the patch from our docker tools.
Diffstat (limited to 'pkgs/development/tools/skopeo')
| -rw-r--r-- | pkgs/development/tools/skopeo/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index bb99e887ac6f..0535a11e0ceb 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; let - version = "0.1.29"; + version = "0.1.30"; src = fetchFromGitHub { rev = "v${version}"; owner = "projectatomic"; repo = "skopeo"; - sha256 = "1lhzbyj2mm25x12s7g2jx4v8w19izjwlgx4lml13r5yy1spn65k2"; + sha256 = "10lpiiki7mlhrp4bid40wys3lch7fars1whxsa5gy0frfgp89ghn"; }; defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; @@ -30,7 +30,11 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ]; buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux ]; - buildFlagsArray = "-ldflags= -X github.com/projectatomic/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile}"; + 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 + ''; preBuild = '' export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include" |