Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

buildah: 1.13.1 -> 1.13.2 #78970

Merged
merged 1 commit into from Feb 1, 2020
Merged

buildah: 1.13.1 -> 1.13.2 #78970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/development/tools/buildah/default.nix
View file
Open in desktop
Expand Up @@ -4,13 +4,13 @@

buildGoPackage rec {
pname = "buildah";
version = "1.13.1";
version = "1.13.2";

src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
sha256 = "0swhpdr970ik6fhvmj45r84lsp1n6rxm0bgv9i1lvrxy1mdv7r9x";
sha256 = "0860ynv93gbicpczfapvrd558dzbqicy9rv4ivyjhb6yyfgy4qai";
};

outputs = [ "bin" "man" "out" ];
Expand Down
11 changes: 5 additions & 6 deletions pkgs/development/tools/buildah/disable-go-module-mode.patch
View file
Open in desktop
Expand Up @@ -12,22 +12,21 @@ buildGoPackage may lead to inconsistencies.
1 file changed, 5 deletions(-)

diff --git a/Makefile b/Makefile
index 9d04177d..4cf9b6a2 100644
index 07724ce4..6383646e 100644
--- a/Makefile
+++ b/Makefile
@@ -15,12 +15,7 @@ BUILDAH := buildah
@@ -15,14 +15,8 @@ BUILDAH := buildah
GO := go
GO110 := 1.10
GOVERSION := $(findstring $(GO110),$(shell go version))
-# test for go module support
-ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true)
-export GO_BUILD=GO111MODULE=on $(GO) build -mod=vendor
-export GO_TEST=GO111MODULE=on $(GO) test -mod=vendor
-else
export GO_BUILD=$(GO) build
export GO_TEST=$(GO) test
-endif

GIT_COMMIT ?= $(if $(shell git rev-parse --short HEAD),$(shell git rev-parse --short HEAD),$(error "git failed"))
SOURCE_DATE_EPOCH ?= $(if $(shell date +%s),$(shell date +%s),$(error "date failed"))
--
2.24.0