From 7f360c65330444f8a5aafc6f4e36f12e3a4c94bd Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Tue, 7 Dec 2021 18:42:36 +0000 Subject: [PATCH] 3p/nixpkgs: add --no-block pomerium patch --- third_party/nixpkgs/patches/pomerium-fix2.patch | 12 ++++++++++++ third_party/nixpkgs/patches/series | 1 + 2 files changed, 13 insertions(+) create mode 100644 third_party/nixpkgs/patches/pomerium-fix2.patch diff --git a/third_party/nixpkgs/patches/pomerium-fix2.patch b/third_party/nixpkgs/patches/pomerium-fix2.patch new file mode 100644 index 0000000000..6939b2fc88 --- /dev/null +++ b/third_party/nixpkgs/patches/pomerium-fix2.patch @@ -0,0 +1,12 @@ +diff --git a/nixos/modules/services/web-servers/pomerium.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/pomerium.nix +--- a/nixos/modules/services/web-servers/pomerium.nix ++++ b/nixos/modules/services/web-servers/pomerium.nix +@@ -128,7 +128,7 @@ in + Type = "oneshot"; + TimeoutSec = 60; + ExecCondition = "/run/current-system/systemd/bin/systemctl -q is-active pomerium.service"; +- ExecStart = "/run/current-system/systemd/bin/systemctl restart pomerium.service"; ++ ExecStart = "/run/current-system/systemd/bin/systemctl --no-block restart pomerium.service"; + }; + }; + }); diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index 14e579c7a6..7b14c65fcc 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1,3 +1,4 @@ patch-cherrypy.patch pomerium-fix.patch +pomerium-fix2.patch 0001-nixos-systemd-boot-create-boot-entries-for-specialis.patch