From 3a3eac6705c68acc5c46f305ee14198281e92df7 Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Tue, 6 Jan 2026 23:03:15 +0100 Subject: [PATCH] k3s: move go_runc_require.patch to top-level directory The patch will be needed in all versions later than 1.34 --- pkgs/applications/networking/cluster/k3s/default.nix | 7 +------ .../cluster/k3s/{1_34 => }/go_runc_require.patch | 3 +++ 2 files changed, 4 insertions(+), 6 deletions(-) rename pkgs/applications/networking/cluster/k3s/{1_34 => }/go_runc_require.patch (68%) diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 7825f8173191..710f46f59ee4 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -43,11 +43,6 @@ in } ) extraArgs).overrideAttrs { - patches = [ - # Adds explicit require of opencontainers/runc to go.mod before version.sh is called and - # removes it afterwards so that later build commands don't complain about inconsistent - # vendoring. - ./1_34/go_runc_require.patch - ]; + patches = [ ./go_runc_require.patch ]; }; } diff --git a/pkgs/applications/networking/cluster/k3s/1_34/go_runc_require.patch b/pkgs/applications/networking/cluster/k3s/go_runc_require.patch similarity index 68% rename from pkgs/applications/networking/cluster/k3s/1_34/go_runc_require.patch rename to pkgs/applications/networking/cluster/k3s/go_runc_require.patch index 15a0cbb28137..8d8d5912afd1 100644 --- a/pkgs/applications/networking/cluster/k3s/1_34/go_runc_require.patch +++ b/pkgs/applications/networking/cluster/k3s/go_runc_require.patch @@ -1,3 +1,6 @@ +# Adds explicit require of opencontainers/runc to go.mod before version.sh is called and +# removes it afterwards so that later build commands don't complain about inconsistent +# vendoring. diff --git a/scripts/package-cli b/scripts/package-cli index a15d754926..bc450dbe4e 100755 --- a/scripts/package-cli