3p/nixpkgs: remove pr134071.patch
This commit is contained in:
parent
dbcaa51968
commit
f8235d0468
2 changed files with 0 additions and 35 deletions
34
third_party/nixpkgs/patches/pr134071.patch
vendored
34
third_party/nixpkgs/patches/pr134071.patch
vendored
|
@ -1,34 +0,0 @@
|
||||||
From dbe9bf9848d7789b8d89fd2b0a43e3ca91f51357 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Luke Granger-Brown <git@lukegb.com>
|
|
||||||
Date: Sat, 14 Aug 2021 21:21:26 +0000
|
|
||||||
Subject: [PATCH] dockerTools.pullImage: fix for skopeo 1.4.x
|
|
||||||
|
|
||||||
skopeo 1.4.x doesn't accept --src-tls-verify as a flag to the *program*,
|
|
||||||
only as a flag to copy; we must pass it after the "copy" verb, or it
|
|
||||||
will fail with:
|
|
||||||
|
|
||||||
> FATA[0000] unknown flag: --src-tls-verify
|
|
||||||
---
|
|
||||||
pkgs/build-support/docker/default.nix | 5 +++--
|
|
||||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
|
|
||||||
index 091984585459f3..d76efac55b1a58 100644
|
|
||||||
--- a/pkgs/build-support/docker/default.nix
|
|
||||||
+++ b/pkgs/build-support/docker/default.nix
|
|
||||||
@@ -111,12 +111,13 @@ rec {
|
|
||||||
destNameTag = "${finalImageName}:${finalImageTag}";
|
|
||||||
} ''
|
|
||||||
skopeo \
|
|
||||||
- --src-tls-verify=${lib.boolToString tlsVerify} \
|
|
||||||
--insecure-policy \
|
|
||||||
--tmpdir=$TMPDIR \
|
|
||||||
--override-os ${os} \
|
|
||||||
--override-arch ${arch} \
|
|
||||||
- copy "$sourceURL" "docker-archive://$out:$destNameTag" \
|
|
||||||
+ copy \
|
|
||||||
+ --src-tls-verify=${lib.boolToString tlsVerify} \
|
|
||||||
+ "$sourceURL" "docker-archive://$out:$destNameTag" \
|
|
||||||
| cat # pipe through cat to force-disable progress bar
|
|
||||||
'';
|
|
||||||
|
|
1
third_party/nixpkgs/patches/series
vendored
1
third_party/nixpkgs/patches/series
vendored
|
@ -1,3 +1,2 @@
|
||||||
patch-cherrypy.patch
|
patch-cherrypy.patch
|
||||||
pomerium-fix.patch
|
pomerium-fix.patch
|
||||||
pr134071.patch
|
|
||||||
|
|
Loading…
Reference in a new issue