mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 16:03:23 +00:00
buildah: 1.13.1 -> 1.13.2
https://github.com/containers/buildah/blob/v1.13.2/CHANGELOG.md#v1132-2020-01-29
This commit is contained in:
parent
f206eea2cf
commit
eaea88814f
@ -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" ];
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user