aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/development/tools/buildah/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/tools/buildah/default.nix')
-rw-r--r--nixpkgs/pkgs/development/tools/buildah/default.nix15
1 files changed, 9 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/tools/buildah/default.nix b/nixpkgs/pkgs/development/tools/buildah/default.nix
index d033fe52e6c..d93ec54b3e3 100644
--- a/nixpkgs/pkgs/development/tools/buildah/default.nix
+++ b/nixpkgs/pkgs/development/tools/buildah/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, buildGoModule
, fetchFromGitHub
+, go-md2man
, installShellFiles
, pkg-config
, gpgme
@@ -13,20 +14,22 @@
buildGoModule rec {
pname = "buildah";
- version = "1.14.9";
+ version = "1.16.1";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
- sha256 = "1vp59xp374wr7sbx89aikz4rv8fdg0a40v06saryxww9iqyvk8wp";
+ sha256 = "0nndm936g0i18ly6395y5s4h1f6cfbg602cvlg7c6w007f2j15hq";
};
outputs = [ "out" "man" ];
vendorSha256 = null;
- nativeBuildInputs = [ installShellFiles pkg-config ];
+ doCheck = false;
+
+ nativeBuildInputs = [ go-md2man installShellFiles pkg-config ];
buildInputs = [
btrfs-progs
@@ -39,12 +42,12 @@ buildGoModule rec {
buildPhase = ''
patchShebangs .
- make GIT_COMMIT="unknown"
- make -C docs
+ make bin/buildah GIT_COMMIT="unknown"
+ make -C docs GOMD2MAN="${go-md2man}/bin/go-md2man"
'';
installPhase = ''
- install -Dm755 buildah $out/bin/buildah
+ install -Dm755 bin/buildah $out/bin/buildah
installShellCompletion --bash contrib/completions/bash/buildah
make -C docs install PREFIX="$man"
'';