about summary refs log tree commit diff
path: root/pkgs/applications/networking/cluster/k3s/builder.nix
diff options
context:
space:
mode:
authorsuperherointj <5861043+superherointj@users.noreply.github.com>2024-02-10 11:37:22 -0300
committersuperherointj <5861043+superherointj@users.noreply.github.com>2024-02-13 16:33:09 -0300
commit49afe6e717b8fa781062c7f75b6046423f174b52 (patch)
tree65440b993ad8173dda760e3e3b5f90f737c6f7fe /pkgs/applications/networking/cluster/k3s/builder.nix
parent4ee752288b1c98d7a01ffaddc71d937e63671f18 (diff)
k3s_1_29: 1.29.0+k3s1 -> 1.29.1+k3s2
Release: https://github.com/k3s-io/k3s/releases/tag/v1.29.1%2Bk3s2

Closes #286072
Diffstat (limited to 'pkgs/applications/networking/cluster/k3s/builder.nix')
-rw-r--r--pkgs/applications/networking/cluster/k3s/builder.nix11
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix
index a914cf87102ea..d213354b91095 100644
--- a/pkgs/applications/networking/cluster/k3s/builder.nix
+++ b/pkgs/applications/networking/cluster/k3s/builder.nix
@@ -30,6 +30,7 @@ lib:
 # It is likely we will have to split out additional builders for additional
 # versions in the future, or customize this one further.
 { lib
+, fetchpatch
 , makeWrapper
 , socat
 , iptables
@@ -184,6 +185,16 @@ let
     src = k3sRepo;
     vendorHash = k3sVendorHash;
 
+    patches =
+      # Disable: Add runtime checking of golang version
+      lib.optional (lib.versionAtLeast k3sVersion "1.29")
+        (fetchpatch {
+          # https://github.com/k3s-io/k3s/pull/9054
+          url = "https://github.com/k3s-io/k3s/commit/b297996b9252b02e56e9425f55f6becbf6bb7832.patch";
+          hash = "sha256-xBOY2jnLhT9dtVKtq26V9QUnuX1q6E/9UcO9IaU719U=";
+          revert = true;
+        });
+
     nativeBuildInputs = [ pkg-config ];
     buildInputs = [ libseccomp sqlite.dev ];