mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-23 22:23:15 +00:00
pomerium: 0.27.2 -> 0.28.0 (#357536)
This commit is contained in:
commit
95f1023aa9
@ -1,4 +1,4 @@
|
||||
From e82f2949b86d127aec908d90d872dfd6feb509e5 Mon Sep 17 00:00:00 2001
|
||||
From 54e426127a35ea6c88bf0ba882f97f0712533ef5 Mon Sep 17 00:00:00 2001
|
||||
From: Morgan Helton <mhelton@gmail.com>
|
||||
Date: Sun, 26 May 2024 12:17:01 -0500
|
||||
Subject: [PATCH] envoy: allow specification of external binary
|
||||
@ -8,7 +8,7 @@ Subject: [PATCH] envoy: allow specification of external binary
|
||||
1 file changed, 10 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/pkg/envoy/envoy.go b/pkg/envoy/envoy.go
|
||||
index 6639d4bd..c6ca198f 100644
|
||||
index 66cf71ae..8d81090e 100644
|
||||
--- a/pkg/envoy/envoy.go
|
||||
+++ b/pkg/envoy/envoy.go
|
||||
@@ -8,9 +8,9 @@ import (
|
||||
@ -40,7 +40,7 @@ index 6639d4bd..c6ca198f 100644
|
||||
// NewServer creates a new server with traffic routed by envoy.
|
||||
func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Builder) (*Server, error) {
|
||||
- if err := preserveRlimitNofile(); err != nil {
|
||||
- log.Debug(ctx).Err(err).Msg("couldn't preserve RLIMIT_NOFILE before starting Envoy")
|
||||
- log.Ctx(ctx).Debug().Err(err).Msg("couldn't preserve RLIMIT_NOFILE before starting Envoy")
|
||||
- }
|
||||
+ envoyPath := OverrideEnvoyPath
|
||||
+ wd := filepath.Join(os.TempDir(), workingDirectoryName)
|
||||
@ -59,5 +59,5 @@ index 6639d4bd..c6ca198f 100644
|
||||
grpcPort: src.GetConfig().GRPCPort,
|
||||
httpPort: src.GetConfig().HTTPPort,
|
||||
--
|
||||
2.46.0
|
||||
2.47.0
|
||||
|
||||
|
@ -13,15 +13,15 @@ let
|
||||
in
|
||||
buildGo123Module rec {
|
||||
pname = "pomerium";
|
||||
version = "0.27.2";
|
||||
version = "0.28.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pomerium";
|
||||
repo = "pomerium";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-t1j5usgr/SO3Ev3JpCJWb3Ys8wgZUTGQVb6mo0oIsEc=";
|
||||
hash = "sha256-Uj/mVklFRaoDNQjCFS5NW/AhSU+7V1XxPiZBAUuly7s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nTEFSLP0/GUVgtujVG6lQIxnj6DOEifc0MVh9CNxt8s=";
|
||||
vendorHash = "sha256-s6EZUZoGNBpy5RaLAPiCCCVFli+YzZ0PHJ/aH3s4APA=";
|
||||
|
||||
ui = mkYarnPackage {
|
||||
inherit version;
|
||||
|
Loading…
Reference in New Issue
Block a user