diff options
author | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2017-04-01 13:48:02 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-01 13:48:02 -0400 |
commit | 9e1537cd2130ab929e94bfccaff7d8808d468919 (patch) | |
tree | 8f32dc2505724d6b44e5f534bfd927f104484ae1 /pkgs | |
parent | ed5d80d74b46a2ce5ad8346a0d65cc0c4f2b5713 (diff) | |
parent | 552045db8025a9269ae1d33294ebc3ebe5c56ea6 (diff) | |
download | nixpkgs-9e1537cd2130ab929e94bfccaff7d8808d468919.tar nixpkgs-9e1537cd2130ab929e94bfccaff7d8808d468919.tar.gz nixpkgs-9e1537cd2130ab929e94bfccaff7d8808d468919.tar.bz2 nixpkgs-9e1537cd2130ab929e94bfccaff7d8808d468919.tar.lz nixpkgs-9e1537cd2130ab929e94bfccaff7d8808d468919.tar.xz nixpkgs-9e1537cd2130ab929e94bfccaff7d8808d468919.tar.zst nixpkgs-9e1537cd2130ab929e94bfccaff7d8808d468919.zip |
Merge pull request #24511 from holidaycheck/update-skopeo
skopeo: 0.1.16 -> 0.1.18
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/skopeo/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index e724d00e4d3..6a5faa68ced 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,22 +1,29 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme, libgpgerror, devicemapper, btrfs-progs }: + +with stdenv.lib; buildGoPackage rec { name = "skopeo-${version}"; - version = "0.1.16"; + version = "0.1.18"; rev = "v${version}"; goPackagePath = "github.com/projectatomic/skopeo"; excludedPackages = "integration"; - buildInputs = [ gpgme ]; + buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ]; src = fetchFromGitHub { inherit rev; owner = "projectatomic"; repo = "skopeo"; - sha256 = "11na7imx6yc1zijb010hx6fjh6v0m3wm5r4sa2nkclm5lkjq259b"; + sha256 = "13k29i5hx909hvddl2xkyw4qzxq2q20ay9bkal3xi063s6l0sh0z"; }; + preBuild = '' + export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include" + export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib" + ''; + meta = { description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/projectatomic/skopeo"; |