From 5d891d74193408baca6dea9e68363f82d5b32b4a Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 12 Nov 2025 22:47:31 +0900 Subject: [PATCH 1/4] prow: add updateScript --- pkgs/by-name/pr/prow/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/pr/prow/package.nix b/pkgs/by-name/pr/prow/package.nix index 55e138ccfcd6..4971b66ac639 100644 --- a/pkgs/by-name/pr/prow/package.nix +++ b/pkgs/by-name/pr/prow/package.nix @@ -3,6 +3,7 @@ buildGoModule, fetchFromGitHub, git, + nix-update-script, }: buildGoModule rec { @@ -64,6 +65,12 @@ buildGoModule rec { nativeCheckInputs = [ git ]; + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + }; + meta = { description = "Kubernetes based CI/CD system developed to serve the Kubernetes community"; longDescription = '' From 2040d1b2bedc9685fd30abfbf56fed9e083808d0 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 12 Nov 2025 22:50:45 +0900 Subject: [PATCH 2/4] prow: 0-unstable-2024-08-27 -> 0-unstable-2025-11-09 Diff: https://github.com/kubernetes-sigs/prow/compare/195f38540f39dd3ec95ca2d7086487ec19922e61...98a0c9d48d175803e1c616b856f39362011abef3 --- pkgs/by-name/pr/prow/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pr/prow/package.nix b/pkgs/by-name/pr/prow/package.nix index 4971b66ac639..33c831bf7619 100644 --- a/pkgs/by-name/pr/prow/package.nix +++ b/pkgs/by-name/pr/prow/package.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "prow"; - version = "0-unstable-2024-08-27"; - rev = "195f38540f39dd3ec95ca2d7086487ec19922e61"; + version = "0-unstable-2025-11-09"; + rev = "98a0c9d48d175803e1c616b856f39362011abef3"; src = fetchFromGitHub { inherit rev; owner = "kubernetes-sigs"; repo = "prow"; - hash = "sha256-/OhlJdxPa4rTuT7XIklx8vxprbENfasJYwiJxD4CeXY="; + hash = "sha256-ypSIWTktqTzi/BIx2IqMhpwjPxz06YNCfryzY5PwdTs="; }; - vendorHash = "sha256-bJ0P/rHp+0zB/Dtp3F3n4AN3xF/A5qoq3lCQVBK+L4w="; + vendorHash = "sha256-J/DQbAWKHQdE+V/uRuo6rAwGGpEq4OeV1NUpB27xJTg="; # doCheck = false; From 245acfc7af9bab1e89ed6578c8322371686f5ea9 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 12 Nov 2025 23:02:41 +0900 Subject: [PATCH 3/4] prow: prefer gitMinimal over git --- pkgs/by-name/pr/prow/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prow/package.nix b/pkgs/by-name/pr/prow/package.nix index 33c831bf7619..b9b9bdcb1eb4 100644 --- a/pkgs/by-name/pr/prow/package.nix +++ b/pkgs/by-name/pr/prow/package.nix @@ -2,7 +2,7 @@ lib, buildGoModule, fetchFromGitHub, - git, + gitMinimal, nix-update-script, }: @@ -63,7 +63,7 @@ buildGoModule rec { "cmd/webhook-server" ]; - nativeCheckInputs = [ git ]; + nativeCheckInputs = [ gitMinimal ]; passthru = { updateScript = nix-update-script { From 218aa059684dd81dae50f94f5f71fd4b84b6266c Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 12 Nov 2025 23:25:42 +0900 Subject: [PATCH 4/4] prow: fix checkPhase on darwin sandbox --- pkgs/by-name/pr/prow/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/pr/prow/package.nix b/pkgs/by-name/pr/prow/package.nix index b9b9bdcb1eb4..663149931fae 100644 --- a/pkgs/by-name/pr/prow/package.nix +++ b/pkgs/by-name/pr/prow/package.nix @@ -65,6 +65,10 @@ buildGoModule rec { nativeCheckInputs = [ gitMinimal ]; + # Workaround for: panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted + # ref: https://github.com/NixOS/nix/pull/1646 + __darwinAllowLocalNetworking = true; + passthru = { updateScript = nix-update-script { extraArgs = [ "--version=branch" ];