From 232ee28724c2bcd513d462d98af6653e0b905a17 Mon Sep 17 00:00:00 2001 From: Joshua Zander Date: Tue, 5 Aug 2025 20:24:58 -0600 Subject: [PATCH 1/2] oauth2-proxy: 7.9.0 -> 7.11.0 https://github.com/oauth2-proxy/oauth2-proxy/releases/tag/v7.10.0 https://github.com/oauth2-proxy/oauth2-proxy/releases/tag/v7.11.0 --- pkgs/by-name/oa/oauth2-proxy/fix-tests-go-1.24.diff | 13 ------------- pkgs/by-name/oa/oauth2-proxy/package.nix | 12 ++++-------- 2 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 pkgs/by-name/oa/oauth2-proxy/fix-tests-go-1.24.diff diff --git a/pkgs/by-name/oa/oauth2-proxy/fix-tests-go-1.24.diff b/pkgs/by-name/oa/oauth2-proxy/fix-tests-go-1.24.diff deleted file mode 100644 index 47162b625f41..000000000000 --- a/pkgs/by-name/oa/oauth2-proxy/fix-tests-go-1.24.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pkg/apis/options/load_test.go b/pkg/apis/options/load_test.go -index 32d52fb8..ef343fd1 100644 ---- a/pkg/apis/options/load_test.go -+++ b/pkg/apis/options/load_test.go -@@ -470,7 +470,7 @@ func(in loadYAMLTableInput) { - configFile: []byte(`stringSliceOption: "a"`), - input: &TestOptions{}, - expectedOutput: &TestOptions{}, -- expectedErr: errors.New("error unmarshalling config: error unmarshaling JSON: while decoding JSON: json: cannot unmarshal string into Go struct field TestOptions.StringSliceOption of type []string"), -+ expectedErr: errors.New("error unmarshalling config: error unmarshaling JSON: while decoding JSON: json: cannot unmarshal string into Go struct field TestOptions.TestOptionSubStruct.StringSliceOption of type []string"), - }), - Entry("with a config file containing environment variable references", loadYAMLTableInput{ - configFile: []byte("stringOption: ${TESTUSER}"), diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix index 52f525b83bab..05c8a4dc5428 100644 --- a/pkgs/by-name/oa/oauth2-proxy/package.nix +++ b/pkgs/by-name/oa/oauth2-proxy/package.nix @@ -6,23 +6,19 @@ buildGoModule rec { pname = "oauth2-proxy"; - version = "7.9.0"; + version = "7.11.0"; src = fetchFromGitHub { repo = "oauth2-proxy"; owner = "oauth2-proxy"; - sha256 = "sha256-ykC29q7/rTv7POGETMiypj9CQYdYVo7rjT5B+3nfj/U="; + sha256 = "sha256-rZoD1H4YeVs9q8406gpYnWOyOEi2me/KkvSenzL/rA8="; rev = "v${version}"; }; - patches = [ - ./fix-tests-go-1.24.diff - ]; - - vendorHash = "sha256-KIu/NSKaXLutlY8757haAlsyuHUZjkDZ6D10lJ08uCM="; + vendorHash = "sha256-6Asydomg4Xz0JciRnODJSqVBtFAmpfMjDnr1JKr222o="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile - ldflags = [ "-X main.VERSION=${version}" ]; + ldflags = [ "-X github.com/oauth2-proxy/oauth2-proxy/v7/pkg/version.VERSION=v${version}" ]; meta = with lib; { description = "Reverse proxy that provides authentication with Google, Github, or other providers"; From b756a8161c35032974931cbd011d06f225afa900 Mon Sep 17 00:00:00 2001 From: Joshua Zander Date: Sat, 16 Aug 2025 13:49:42 -0600 Subject: [PATCH 2/2] oauth2-proxy: add versionCheckHook --- pkgs/by-name/oa/oauth2-proxy/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix index 05c8a4dc5428..8e229d675238 100644 --- a/pkgs/by-name/oa/oauth2-proxy/package.nix +++ b/pkgs/by-name/oa/oauth2-proxy/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + versionCheckHook, }: buildGoModule rec { @@ -20,6 +21,10 @@ buildGoModule rec { # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile ldflags = [ "-X github.com/oauth2-proxy/oauth2-proxy/v7/pkg/version.VERSION=v${version}" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + meta = with lib; { description = "Reverse proxy that provides authentication with Google, Github, or other providers"; homepage = "https://github.com/oauth2-proxy/oauth2-proxy/";