Skip to content

Commit 803f7b0

Browse files
authored
pomerium: 0.29.4 -> 0.30.3 (NixOS#425976)
2 parents 4140722 + 4d0a905 commit 803f7b0

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From dfb6e2797e7c9166c8dd3dc0d87a4d91474244c7 Mon Sep 17 00:00:00 2001
1+
From 640d11fae5bcf1fa8c1a54facbe168a256cacc1b Mon Sep 17 00:00:00 2001
22
From: Morgan Helton <mhelton@gmail.com>
33
Date: Sun, 26 May 2024 12:17:01 -0500
44
Subject: [PATCH] envoy: allow specification of external binary
@@ -8,7 +8,7 @@ Subject: [PATCH] envoy: allow specification of external binary
88
1 file changed, 16 insertions(+), 4 deletions(-)
99

1010
diff --git a/pkg/envoy/envoy.go b/pkg/envoy/envoy.go
11-
index 8224f364..bb8b6506 100644
11+
index 85c725629..4a726a44b 100644
1212
--- a/pkg/envoy/envoy.go
1313
+++ b/pkg/envoy/envoy.go
1414
@@ -8,9 +8,9 @@ import (
@@ -21,8 +21,8 @@ index 8224f364..bb8b6506 100644
2121
- "path"
2222
"path/filepath"
2323
"regexp"
24-
"strconv"
25-
@@ -35,8 +35,17 @@ import (
24+
"runtime"
25+
@@ -36,8 +36,17 @@ import (
2626

2727
const (
2828
configFileName = "envoy-config.yaml"
@@ -40,7 +40,7 @@ index 8224f364..bb8b6506 100644
4040
// A Server is a pomerium proxy implemented via envoy.
4141
type Server struct {
4242
ServerOptions
43-
@@ -94,14 +103,17 @@ func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Buil
43+
@@ -95,14 +104,17 @@ func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Buil
4444
log.Ctx(ctx).Debug().Err(err).Msg("couldn't preserve RLIMIT_NOFILE before starting Envoy")
4545
}
4646

@@ -62,5 +62,5 @@ index 8224f364..bb8b6506 100644
6262
grpcPort: src.GetConfig().GRPCPort,
6363
httpPort: src.GetConfig().HTTPPort,
6464
--
65-
2.48.1
65+
2.49.0
6666

pkgs/by-name/po/pomerium/package.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
buildGo123Module,
2+
buildGoModule,
33
fetchFromGitHub,
44
lib,
55
envoy,
@@ -17,17 +17,17 @@ let
1717
mapAttrsToList
1818
;
1919
in
20-
buildGo123Module rec {
20+
buildGoModule rec {
2121
pname = "pomerium";
22-
version = "0.29.4";
22+
version = "0.30.3";
2323
src = fetchFromGitHub {
2424
owner = "pomerium";
2525
repo = "pomerium";
2626
rev = "v${version}";
27-
hash = "sha256-Oj/wC3rr7CAw2iB0H8yUvzv5VCEIo8kc5sZrxFX6NrI=";
27+
hash = "sha256-Rjv4GjyUs9sH+P5kYimxFnE2SBosEWbc7PbKIaVFxsI=";
2828
};
2929

30-
vendorHash = "sha256-K9LcGvANajoVKEDIswahD0mT5845qGZzafmWMKkVn8Q=";
30+
vendorHash = "sha256-+SvKF54rkBY2wBZOYKuIV30BVqRqICuiPya+HApne1s=";
3131

3232
ui = mkYarnPackage {
3333
inherit version;

pkgs/by-name/po/pomerium/yarn-hash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1fqb1bcsg0k6xazr6v19jav11fl99mm3p9w53hl5xflb974m2lg0
1+
07zzvqfinl7qqmwh00izvfc0xch2rjr4s8b1ca9ay26krd4d4sap

0 commit comments

Comments
 (0)