Unverified Commit 34c3e4bf authored by Luke Granger-Brown's avatar Luke Granger-Brown Committed by GitHub
Browse files

pomerium: 0.26.1 -> 0.27.1 (#345627)

parents b7e838f0 9ab8b25d

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

+4 −4
Original line number Diff line number Diff line 
From fa51c56049a99ef17d86b0327bcf66f47338da45 Mon Sep 17 00:00:00 2001

From e82f2949b86d127aec908d90d872dfd6feb509e5 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 62f2d34c..879001cd 100644

index 6639d4bd..c6ca198f 100644

--- a/pkg/envoy/envoy.go

+++ b/pkg/envoy/envoy.go

@@ -8,9 +8,9 @@ import (
@@ -35,7 +35,7 @@ index 62f2d34c..879001cd 100644 
 type serverOptions struct {

 	services string

 	logLevel config.LogLevel

@@ -58,17 +62,16 @@ type Server struct {

@@ -59,17 +63,16 @@ type Server struct {

 

 // NewServer creates a new server with traffic routed by envoy.

 func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Builder) (*Server, error) {
@@ -59,5 +59,5 @@ index 62f2d34c..879001cd 100644 
 		grpcPort:  src.GetConfig().GRPCPort,

 		httpPort:  src.GetConfig().HTTPPort,

-- 

2.44.1

2.46.0

pkgs/servers/http/pomerium/default.nix→pkgs/by-name/po/pomerium/package.nix

+5 −5
Original line number Diff line number Diff line 
{ buildGoModule

{ buildGo123Module

, fetchFromGitHub

, lib

, envoy
@@ -11,17 +11,17 @@ 
let

  inherit (lib) concatStringsSep concatMap id mapAttrsToList;

in

buildGoModule rec {

buildGo123Module rec {

  pname = "pomerium";

  version = "0.26.1";

  version = "0.27.1";

  src = fetchFromGitHub {

    owner = "pomerium";

    repo = "pomerium";

    rev = "v${version}";

    hash = "sha256-lMI6dVCTInqHsz4N0HsOVUQo8TkheAwr54FW46r+DUA=";

    hash = "sha256-+RKWl/weUYktS7jUB1lYpZCBKEfh7RMfKgRDbYV8Bjs=";

  };



  vendorHash = "sha256-AHlnhAh4RBz8aJoFJjbX/MUDHq81xK7b7gvCyuV3gjU=";

  vendorHash = "sha256-/iYUZp6EASDGApLymNuR10395PH8D3zPU+TlmmAN8Zc=";



  ui = mkYarnPackage {

    inherit version;

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

0 → 100644
+1 −0
Original line number Diff line number Diff line 
0bdrczn8mj5iidmba7xzkcyvsnwmbvcvrc1vgks2x4pxqbfyxaiv