diff options
Diffstat (limited to 'pkgs/development/tools/buildah/default.nix')
| -rw-r--r-- | pkgs/development/tools/buildah/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index bc723152178..6810a053a80 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -4,13 +4,13 @@ buildGoPackage rec { pname = "buildah"; - version = "1.11.5"; + version = "1.11.6"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "09bfv2pypd66dnqvrhgcg35fsahi2k0kn5dnnbfqc39g0vfz29r7"; + sha256 = "0slhq11nmqsp2rjfwldvcwlpj823ckfpipggkaxhcb66dv8ymm7n"; }; outputs = [ "bin" "man" "out" ]; @@ -18,9 +18,15 @@ buildGoPackage rec { goPackagePath = "github.com/containers/buildah"; excludedPackages = [ "tests" ]; + # Disable module-mode, because Go 1.13 automatically enables it if there is + # go.mod file. Remove after https://github.com/NixOS/nixpkgs/pull/73380 + GO111MODULE = "off"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ]; + patches = [ ./disable-go-module-mode.patch ]; + buildPhase = '' pushd go/src/${goPackagePath} make GIT_COMMIT="unknown" |