podman: 0.12.1 -> 0.12.1.2

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

2 files changed, 2 insertions, 53 deletions

diff --git a/pkgs/applications/virtualization/podman/0001-No-need-to-use-i-in-go-build-with-go-1.10-and-above.patch b/pkgs/applications/virtualization/podman/0001-No-need-to-use-i-in-go-build-with-go-1.10-and-above.patch
deleted file mode 100644
index e2305bd80a54b..0000000000000
--- a/pkgs/applications/virtualization/podman/0001-No-need-to-use-i-in-go-build-with-go-1.10-and-above.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0b0096382c8346d463ce019714fcc46256bc4af3 Mon Sep 17 00:00:00 2001
-From: Vincent Demeester <vdemeest@redhat.com>
-Date: Tue, 11 Dec 2018 15:26:01 +0100
-Subject: [PATCH] No need to use `-i` in go build (with go 1.10 and above)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-> The go build command now maintains a cache of recently built
-  packages, separate from the installed packages in $GOROOT/pkg or
-  $GOPATH/pkg. The effect of the cache should be to speed builds that
-  do not explicitly install packages or when switching between
-  different copies of source code (for example, when changing back and
-  forth between different branches in a version control system). The
-  old advice to add the -i flag for speed, as in go build -i or go
-  test -i, is no longer necessary: builds run just as fast without -i.
-
-This should also fix podman builds for NixOS, snap-installed go, …
-
-Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index f99aaaec..55f34bcc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -108,7 +108,7 @@ test/goecho/goecho: .gopathok $(wildcard test/goecho/*.go)
- 	$(GO) build -ldflags '$(LDFLAGS)' -o $@ $(PROJECT)/test/goecho
- 
- podman: .gopathok $(PODMAN_VARLINK_DEPENDENCIES)
--	$(GO) build -i -ldflags '$(LDFLAGS_PODMAN)' -tags "$(BUILDTAGS)" -o bin/$@ $(PROJECT)/cmd/podman
-+	$(GO) build -ldflags '$(LDFLAGS_PODMAN)' -tags "$(BUILDTAGS)" -o bin/$@ $(PROJECT)/cmd/podman
- 
- local-cross: $(CROSS_BUILD_TARGETS)
- 
-@@ -116,7 +116,7 @@ bin/podman.cross.%: .gopathok
- 	TARGET="$*"; \
- 	GOOS="$${TARGET%%.*}" \
- 	GOARCH="$${TARGET##*.}" \
--	$(GO) build -i -ldflags '$(LDFLAGS_PODMAN)' -tags '$(BUILDTAGS_CROSS)' -o "$@" $(PROJECT)/cmd/podman
-+	$(GO) build -ldflags '$(LDFLAGS_PODMAN)' -tags '$(BUILDTAGS_CROSS)' -o "$@" $(PROJECT)/cmd/podman
- 
- python:
- ifdef HAS_PYTHON3
--- 
-2.19.1
-
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index 9b74982369a50..8dd1a0ab9e4a2 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -6,12 +6,12 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "podman-${version}";
-  version = "0.12.1";
+  version = "0.12.1.2";
   src = fetchFromGitHub {
     owner = "containers";
     repo = "libpod";
     rev = "v${version}";
-    sha256 = "18vmzq9nqjndxa3gkc7y1rrfsyrbcrpglipp38jmn7m45w1g8dj7";
+    sha256 = "1gz7vci273bgrihrxbks2zxlb2lsmlj3lisw7s3d54ci0zr7avv3";
   };
   
   # Optimizations break compilation of libseccomp c bindings
@@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
     go btrfs-progs libseccomp gpgme lvm2
   ];
 
-  patches = [ ./0001-No-need-to-use-i-in-go-build-with-go-1.10-and-above.patch ];
-
   buildPhase = ''
     patchShebangs .
     mkdir -p .gopath/src/github.com/containers