Commit 3a3eac67 authored by Robert Rose's avatar Robert Rose
Browse files

k3s: move go_runc_require.patch to top-level directory 

The patch will be needed in all versions later than 1.34
parent d739341b

pkgs/applications/networking/cluster/k3s/default.nix

+1 −6
Original line number Diff line number Diff line
@@ -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 ];

      };

}

pkgs/applications/networking/cluster/k3s/1_34/go_runc_require.patch→pkgs/applications/networking/cluster/k3s/go_runc_require.patch

+3 −0
Original line number Diff line number Diff line 
# 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