Merge pull request #79487 from zowoq/skopeo

skopeo: 0.1.40 -> 0.1.41
This commit is contained in:
lewo 2020-02-08 08:43:28 +01:00 committed by GitHub
commit 68d1814042

View File

@ -1,17 +1,17 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand
, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux
, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, libselinux
, go-md2man }:
with stdenv.lib;
let
version = "0.1.40";
version = "0.1.41";
src = fetchFromGitHub {
rev = "v${version}";
owner = "containers";
repo = "skopeo";
sha256 = "1bagirzdzjhicn5dr691092ac3q6lhz3xngjzgqiqkxnvpz7p6cn";
sha256 = "0aqw17irj2wn4a8g9hzfm5z5azqq33z6r1dbg1gyn2c8qxy1vfxs";
};
defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out";
@ -29,7 +29,7 @@ buildGoPackage {
excludedPackages = "integration";
nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ];
buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs ostree libselinux ];
buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs libselinux ];
buildFlagsArray = ''
-ldflags=
@ -51,7 +51,7 @@ buildGoPackage {
meta = {
description = "A command line utility for various operations on container images and image repositories";
homepage = https://github.com/projectatomic/skopeo;
homepage = "https://github.com/containers/skopeo";
maintainers = with stdenv.lib.maintainers; [ vdemeester lewo ];
license = stdenv.lib.licenses.asl20;
};