public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildah: minor cleanups

Browse Source 
Was meant to be a part of 1.10.1 -> 1.11.0 but somebody else beat me to that.
This commit is contained in:
Peter Hoeg 2019-09-12 17:19:02 +08:00
parent 2e47cb88ea
commit 0f95f6922d
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/development/tools/buildah/default.nix
View File

@ -2,31 +2,22 @@
, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp , gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp
}: }:
let buildGoPackage rec {
pname = "buildah";
version = "1.11.0"; version = "1.11.0";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}";
owner = "containers"; owner = "containers";
repo = "buildah"; repo = "buildah";
rev = "v${version}";
sha256 = "114dmjqacz5hairl1s8qhndzr52lcvh99g565cq5ydscblnzpw1b"; sha256 = "114dmjqacz5hairl1s8qhndzr52lcvh99g565cq5ydscblnzpw1b";
}; };
goPackagePath = "github.com/containers/buildah";
in buildGoPackage {
pname = "buildah";
inherit version;
inherit src;
outputs = [ "bin" "man" "out" ]; outputs = [ "bin" "man" "out" ];
inherit goPackagePath; goPackagePath = "github.com/containers/buildah";
excludedPackages = [ "tests" ]; excludedPackages = [ "tests" ];
# Optimizations break compilation of libseccomp c bindings
hardeningDisable = [ "fortify" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ]; buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ];
@ -40,10 +31,10 @@ in buildGoPackage {
make -C docs install PREFIX="$man" make -C docs install PREFIX="$man"
''; '';
meta = { 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";
maintainers = with stdenv.lib.maintainers; [ Profpatsch vdemeester ]; license = licenses.asl20;
license = stdenv.lib.licenses.asl20; maintainers = with maintainers; [ Profpatsch vdemeester ];
}; };
} }