Merge pull request #77715 from marsam/update-buildah
buildah: 1.12.0 -> 1.13.1
This commit is contained in:
commit
312edfe6e6
|
@ -4,13 +4,13 @@
|
||||||
|
|
||||||
buildGoPackage rec {
|
buildGoPackage rec {
|
||||||
pname = "buildah";
|
pname = "buildah";
|
||||||
version = "1.12.0";
|
version = "1.13.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "containers";
|
owner = "containers";
|
||||||
repo = "buildah";
|
repo = "buildah";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0lsjsfp6ls38vlgibbnsyd1m7jvmjwdmpyrd0qigp4aa2abwi4dg";
|
sha256 = "0swhpdr970ik6fhvmj45r84lsp1n6rxm0bgv9i1lvrxy1mdv7r9x";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "bin" "man" "out" ];
|
outputs = [ "bin" "man" "out" ];
|
||||||
|
@ -18,10 +18,6 @@ buildGoPackage rec {
|
||||||
goPackagePath = "github.com/containers/buildah";
|
goPackagePath = "github.com/containers/buildah";
|
||||||
excludedPackages = [ "tests" ];
|
excludedPackages = [ "tests" ];
|
||||||
|
|
||||||
# Disable module-mode, because Go 1.13 automatically enables it if there is
|
|
||||||
# go.mod file. Remove after https://github.com/NixOS/nixpkgs/pull/73380
|
|
||||||
GO111MODULE = "off";
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ];
|
buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ];
|
||||||
|
|
||||||
|
@ -31,6 +27,7 @@ buildGoPackage rec {
|
||||||
pushd go/src/${goPackagePath}
|
pushd go/src/${goPackagePath}
|
||||||
make GIT_COMMIT="unknown"
|
make GIT_COMMIT="unknown"
|
||||||
install -Dm755 buildah $bin/bin/buildah
|
install -Dm755 buildah $bin/bin/buildah
|
||||||
|
install -Dm444 contrib/completions/bash/buildah $bin/share/bash-completion/completions/buildah
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
|
@ -40,6 +37,7 @@ buildGoPackage rec {
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "A tool which facilitates building OCI images";
|
description = "A tool which facilitates building OCI images";
|
||||||
homepage = "https://github.com/containers/buildah";
|
homepage = "https://github.com/containers/buildah";
|
||||||
|
changelog = "https://github.com/containers/buildah/releases/tag/v${version}";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ Profpatsch vdemeester saschagrunert ];
|
maintainers = with maintainers; [ Profpatsch vdemeester saschagrunert ];
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue