Merge pull request #109044 from zowoq/skopeo

skopeo: 1.2.0 -> 1.2.1

authored by Benjamin Hipple and committed by GitHub dc04eb3e 57292d75

+7 -6
+7 -6
pkgs/development/tools/skopeo/default.nix
··· 1 - { lib, stdenv 1 + { lib 2 + , stdenv 2 3 , buildGoModule 3 4 , fetchFromGitHub 4 5 , gpgme ··· 13 14 14 15 buildGoModule rec { 15 16 pname = "skopeo"; 16 - version = "1.2.0"; 17 + version = "1.2.1"; 17 18 18 19 src = fetchFromGitHub { 19 20 rev = "v${version}"; 20 21 owner = "containers"; 21 22 repo = "skopeo"; 22 - sha256 = "1v7k3ki10i6082r7zswblyirx6zck674y6bw3plssw4p1l2611rd"; 23 + sha256 = "1y9pmijazbgxzriymrm7zrifmkd1x1wad9b3zjcj7zwr6c999dhg"; 23 24 }; 24 25 25 26 outputs = [ "out" "man" ]; ··· 31 32 nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; 32 33 33 34 buildInputs = [ gpgme ] 34 - ++ stdenv.lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; 35 + ++ lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; 35 36 36 37 buildPhase = '' 37 38 patchShebangs . ··· 42 43 install -Dm755 bin/skopeo -t $out/bin 43 44 installManPage docs/*.[1-9] 44 45 installShellCompletion --bash completions/bash/skopeo 45 - '' + stdenv.lib.optionalString stdenv.isLinux '' 46 + '' + lib.optionalString stdenv.isLinux '' 46 47 wrapProgram $out/bin/skopeo \ 47 - --prefix PATH : ${stdenv.lib.makeBinPath [ fuse-overlayfs ]} 48 + --prefix PATH : ${lib.makeBinPath [ fuse-overlayfs ]} 48 49 ''; 49 50 50 51 meta = with lib; {