diff options
author | Peter Hoeg <peter@hoeg.com> | 2019-09-12 17:19:02 +0800 |
---|---|---|
committer | Peter Hoeg <peter@hoeg.com> | 2019-09-12 17:25:57 +0800 |
commit | 0f95f6922de9fcc7e8ca055090f410caca6c4cd6 (patch) | |
tree | 4672336b9703d03bfdaa873f99085a7954d45abc /pkgs/development/tools/buildah | |
parent | 2e47cb88ea081af47df986f17df341ac0265a8a4 (diff) |
buildah: minor cleanups
Was meant to be a part of 1.10.1 -> 1.11.0 but somebody else beat me to that.
Diffstat (limited to 'pkgs/development/tools/buildah')
-rw-r--r-- | pkgs/development/tools/buildah/default.nix | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 4286e37ebef15..9885dce04b205 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -2,31 +2,22 @@ , gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp }: -let +buildGoPackage rec { + pname = "buildah"; version = "1.11.0"; src = fetchFromGitHub { - rev = "v${version}"; owner = "containers"; repo = "buildah"; + rev = "v${version}"; sha256 = "114dmjqacz5hairl1s8qhndzr52lcvh99g565cq5ydscblnzpw1b"; }; - goPackagePath = "github.com/containers/buildah"; - -in buildGoPackage { - pname = "buildah"; - inherit version; - inherit src; - outputs = [ "bin" "man" "out" ]; - inherit goPackagePath; + goPackagePath = "github.com/containers/buildah"; excludedPackages = [ "tests" ]; - # Optimizations break compilation of libseccomp c bindings - hardeningDisable = [ "fortify" ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ]; @@ -40,10 +31,10 @@ in buildGoPackage { make -C docs install PREFIX="$man" ''; - meta = { + meta = with stdenv.lib; { description = "A tool which facilitates building OCI images"; - homepage = https://github.com/containers/buildah; - maintainers = with stdenv.lib.maintainers; [ Profpatsch vdemeester ]; - license = stdenv.lib.licenses.asl20; + homepage = "https://github.com/containers/buildah"; + license = licenses.asl20; + maintainers = with maintainers; [ Profpatsch vdemeester ]; }; } |