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

Merge pull request #78970 from zowoq/buildah

Browse Source 
buildah: 1.13.1 -> 1.13.2
This commit is contained in:
Mario Rodas 2020-01-31 20:38:55 -05:00 committed by GitHub
commit fb6d39cbde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,13 +4,13 @@
buildGoPackage rec { buildGoPackage rec {
pname = "buildah"; pname = "buildah";
version = "1.13.1"; version = "1.13.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = "buildah"; repo = "buildah";
rev = "v${version}"; rev = "v${version}";
sha256 = "0swhpdr970ik6fhvmj45r84lsp1n6rxm0bgv9i1lvrxy1mdv7r9x"; sha256 = "0860ynv93gbicpczfapvrd558dzbqicy9rv4ivyjhb6yyfgy4qai";
}; };
outputs = [ "bin" "man" "out" ]; outputs = [ "bin" "man" "out" ];

11
pkgs/development/tools/buildah/disable-go-module-mode.patch
View File

@ -12,22 +12,21 @@ buildGoPackage may lead to inconsistencies.
1 file changed, 5 deletions(-) 1 file changed, 5 deletions(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 9d04177d..4cf9b6a2 100644 index 07724ce4..6383646e 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -15,12 +15,7 @@ BUILDAH := buildah @@ -15,14 +15,8 @@ BUILDAH := buildah
GO := go GO := go
GO110 := 1.10 GO110 := 1.10
GOVERSION := $(findstring $(GO110),$(shell go version)) GOVERSION := $(findstring $(GO110),$(shell go version))
-# test for go module support -# test for go module support
-ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true) -ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true)
-export GO_BUILD=GO111MODULE=on $(GO) build -mod=vendor -export GO_BUILD=GO111MODULE=on $(GO) build -mod=vendor
-export GO_TEST=GO111MODULE=on $(GO) test -mod=vendor
-else -else
export GO_BUILD=$(GO) build export GO_BUILD=$(GO) build
export GO_TEST=$(GO) test
-endif -endif
GIT_COMMIT ?= $(if $(shell git rev-parse --short HEAD),$(shell git rev-parse --short HEAD),$(error "git failed")) 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")) SOURCE_DATE_EPOCH ?= $(if $(shell date +%s),$(shell date +%s),$(error "date failed"))
--
2.24.0