Merge pull request #109044 from zowoq/skopeo

skopeo: 1.2.0 -> 1.2.1
This commit is contained in:
Benjamin Hipple 2021-01-11 21:46:18 -05:00 committed by GitHub
commit dc04eb3eeb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, buildGoModule
, fetchFromGitHub
, gpgme
@ -13,13 +14,13 @@
buildGoModule rec {
pname = "skopeo";
version = "1.2.0";
version = "1.2.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "containers";
repo = "skopeo";
sha256 = "1v7k3ki10i6082r7zswblyirx6zck674y6bw3plssw4p1l2611rd";
sha256 = "1y9pmijazbgxzriymrm7zrifmkd1x1wad9b3zjcj7zwr6c999dhg";
};
outputs = [ "out" "man" ];
@ -31,7 +32,7 @@ buildGoModule rec {
nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ];
buildInputs = [ gpgme ]
++ stdenv.lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ];
++ lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ];
buildPhase = ''
patchShebangs .
@ -42,9 +43,9 @@ buildGoModule rec {
install -Dm755 bin/skopeo -t $out/bin
installManPage docs/*.[1-9]
installShellCompletion --bash completions/bash/skopeo
'' + stdenv.lib.optionalString stdenv.isLinux ''
'' + lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/skopeo \
--prefix PATH : ${stdenv.lib.makeBinPath [ fuse-overlayfs ]}
--prefix PATH : ${lib.makeBinPath [ fuse-overlayfs ]}
'';
meta = with lib; {