diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
| commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
| tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/development/tools/buildah | |
| parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
| parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
| download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip | |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/development/tools/buildah')
| -rw-r--r-- | pkgs/development/tools/buildah/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/development/tools/buildah/wrapper.nix | 6 |
2 files changed, 17 insertions, 10 deletions
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 95e38e3a0f5..c92b229f05a 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -1,6 +1,7 @@ -{ stdenv +{ lib , buildGoModule , fetchFromGitHub +, go-md2man , installShellFiles , pkg-config , gpgme @@ -13,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.15.1"; + version = "1.21.4"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "15pnyi6gay287vkcrgsirsyyps3ya2lsih1ljkcsqdxzr596mcv3"; + sha256 = "sha256-eVXNkQJ3/T4KFiGeE8o4kFBOONfHc6v+tNEOsOnEYRA="; }; outputs = [ "out" "man" ]; @@ -28,7 +29,7 @@ buildGoModule rec { doCheck = false; - nativeBuildInputs = [ installShellFiles pkg-config ]; + nativeBuildInputs = [ go-md2man installShellFiles pkg-config ]; buildInputs = [ btrfs-progs @@ -40,18 +41,22 @@ buildGoModule rec { ]; buildPhase = '' + runHook preBuild patchShebangs . - make GIT_COMMIT="unknown" - make -C docs + make bin/buildah GIT_COMMIT="unknown" + make -C docs GOMD2MAN="${go-md2man}/bin/go-md2man" + runHook postBuild ''; installPhase = '' - install -Dm755 buildah $out/bin/buildah + runHook preInstall + install -Dm755 bin/buildah $out/bin/buildah installShellCompletion --bash contrib/completions/bash/buildah make -C docs install PREFIX="$man" + runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool which facilitates building OCI images"; homepage = "https://buildah.io/"; changelog = "https://github.com/containers/buildah/releases/tag/v${version}"; diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix index bdc48bd6b1f..a31dece7df5 100644 --- a/pkgs/development/tools/buildah/wrapper.nix +++ b/pkgs/development/tools/buildah/wrapper.nix @@ -9,7 +9,7 @@ , conmon # Container runtime monitor , slirp4netns # User-mode networking for unprivileged namespaces , fuse-overlayfs # CoW for images, much faster than default vfs -, utillinux # nsenter +, util-linux # nsenter , cni-plugins # not added to path , iptables }: @@ -17,13 +17,15 @@ let buildah = buildah-unwrapped; + preferLocalBuild = true; + binPath = lib.makeBinPath ([ runc crun conmon slirp4netns fuse-overlayfs - utillinux + util-linux iptables ] ++ extraPackages); |