From 2a42c191d437b0a78dd0cee334ccb32d3703af61 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Mon, 30 Sep 2024 20:48:41 -0500 Subject: [PATCH 1/2] pomerium: move to by-name --- .../0001-envoy-allow-specification-of-external-binary.patch | 0 pkgs/{servers/http => by-name/po}/pomerium/package.json | 0 .../pomerium/default.nix => by-name/po/pomerium/package.nix} | 0 pkgs/{servers/http => by-name/po}/pomerium/updater.sh | 0 pkgs/{servers/http => by-name/po}/pomerium/yarn-hash | 0 pkgs/top-level/all-packages.nix | 1 - 6 files changed, 1 deletion(-) rename pkgs/{servers/http => by-name/po}/pomerium/0001-envoy-allow-specification-of-external-binary.patch (100%) rename pkgs/{servers/http => by-name/po}/pomerium/package.json (100%) rename pkgs/{servers/http/pomerium/default.nix => by-name/po/pomerium/package.nix} (100%) rename pkgs/{servers/http => by-name/po}/pomerium/updater.sh (100%) rename pkgs/{servers/http => by-name/po}/pomerium/yarn-hash (100%) diff --git a/pkgs/servers/http/pomerium/0001-envoy-allow-specification-of-external-binary.patch b/pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch similarity index 100% rename from pkgs/servers/http/pomerium/0001-envoy-allow-specification-of-external-binary.patch rename to pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch diff --git a/pkgs/servers/http/pomerium/package.json b/pkgs/by-name/po/pomerium/package.json similarity index 100% rename from pkgs/servers/http/pomerium/package.json rename to pkgs/by-name/po/pomerium/package.json diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/by-name/po/pomerium/package.nix similarity index 100% rename from pkgs/servers/http/pomerium/default.nix rename to pkgs/by-name/po/pomerium/package.nix diff --git a/pkgs/servers/http/pomerium/updater.sh b/pkgs/by-name/po/pomerium/updater.sh similarity index 100% rename from pkgs/servers/http/pomerium/updater.sh rename to pkgs/by-name/po/pomerium/updater.sh diff --git a/pkgs/servers/http/pomerium/yarn-hash b/pkgs/by-name/po/pomerium/yarn-hash similarity index 100% rename from pkgs/servers/http/pomerium/yarn-hash rename to pkgs/by-name/po/pomerium/yarn-hash diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 131cca72e54e..271c5ee0343d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24898,7 +24898,6 @@ with pkgs; pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { }; - pomerium = callPackage ../servers/http/pomerium { }; pomerium-cli = callPackage ../tools/security/pomerium-cli { }; postgrey = callPackage ../servers/mail/postgrey { }; From 9ab8b25dc8f5d67a493776fcee307d22110aa9de Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Mon, 30 Sep 2024 21:12:09 -0500 Subject: [PATCH 2/2] pomerium: 0.26.1 -> 0.27.1 --- ...-envoy-allow-specification-of-external-binary.patch | 8 ++++---- pkgs/by-name/po/pomerium/package.nix | 10 +++++----- pkgs/by-name/po/pomerium/yarn-hash | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch b/pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch index d595dc6ccae2..d43242b6cc14 100644 --- a/pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch +++ b/pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch @@ -1,4 +1,4 @@ -From fa51c56049a99ef17d86b0327bcf66f47338da45 Mon Sep 17 00:00:00 2001 +From e82f2949b86d127aec908d90d872dfd6feb509e5 Mon Sep 17 00:00:00 2001 From: Morgan Helton 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 diff --git a/pkgs/by-name/po/pomerium/package.nix b/pkgs/by-name/po/pomerium/package.nix index 8e78b8f07287..75c13df48390 100644 --- a/pkgs/by-name/po/pomerium/package.nix +++ b/pkgs/by-name/po/pomerium/package.nix @@ -1,4 +1,4 @@ -{ 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; diff --git a/pkgs/by-name/po/pomerium/yarn-hash b/pkgs/by-name/po/pomerium/yarn-hash index a631334cc391..6f871e034fe3 100644 --- a/pkgs/by-name/po/pomerium/yarn-hash +++ b/pkgs/by-name/po/pomerium/yarn-hash @@ -1 +1 @@ -1xkn1zbhg4q35azlhcgc1bk1sykrawngq1fcb5r5ghgh3m2kmz76 +0bdrczn8mj5iidmba7xzkcyvsnwmbvcvrc1vgks2x4pxqbfyxaiv