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

buildah: 1.9.0 -> 1.10.1 

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
This commit is contained in:
Sascha Grunert 2019-08-20 13:44:49 +02:00
parent a92f71964f
commit 8d3dd54f53
No known key found for this signature in database
GPG Key ID: 8CE029DD1A866E52
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,15 +1,15 @@
{ stdenv, buildGoPackage, fetchFromGitHub { stdenv, buildGoPackage, fetchFromGitHub
, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp , gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, ostree, libselinux, libseccomp
, go-md2man }: }:
let let
version = "1.9.0"; version = "1.10.1";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "containers"; owner = "containers";
repo = "buildah"; repo = "buildah";
sha256 = "19yf93pq4vw24h76kl32c6ryvg5fp5mixakw9c6sqydf7m74z9i8"; sha256 = "0dki2v8j2jzbw49sdzcyjqbalbh70m0lgzrldgj6cc92mj896pxk";
}; };
goPackagePath = "github.com/containers/buildah"; goPackagePath = "github.com/containers/buildah";
@ -26,22 +26,18 @@ in buildGoPackage rec {
# Optimizations break compilation of libseccomp c bindings # Optimizations break compilation of libseccomp c bindings
hardeningDisable = [ "fortify" ]; hardeningDisable = [ "fortify" ];
nativeBuildInputs = [ pkgconfig go-md2man.bin ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ]; buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ];
# Copied from the skopeo package, doesn’t seem to make a difference? buildPhase = ''
# If something related to these libs failed, uncomment these lines. pushd go/src/${goPackagePath}
/*preBuild = with lib; '' patchShebangs .
export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include" make GIT_COMMIT="unknown"
export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib" install -Dm755 buildah $bin/bin/buildah
'';*/ '';
postBuild = '' postBuild = ''
# depends on buildGoPackage not changing … make -C docs install PREFIX="$man"
pushd ./go/src/${goPackagePath}/docs
make docs
make install PREFIX="$man"
popd
''; '';
meta = { meta = {