diff options
| author | superherointj <5861043+superherointj@users.noreply.github.com> | 2024-02-10 11:37:22 -0300 |
|---|---|---|
| committer | superherointj <5861043+superherointj@users.noreply.github.com> | 2024-02-13 16:33:09 -0300 |
| commit | 49afe6e717b8fa781062c7f75b6046423f174b52 (patch) | |
| tree | 65440b993ad8173dda760e3e3b5f90f737c6f7fe /pkgs/applications/networking/cluster/k3s | |
| parent | 4ee752288b1c98d7a01ffaddc71d937e63671f18 (diff) | |
| download | nixlib-49afe6e717b8fa781062c7f75b6046423f174b52.tar nixlib-49afe6e717b8fa781062c7f75b6046423f174b52.tar.gz nixlib-49afe6e717b8fa781062c7f75b6046423f174b52.tar.bz2 nixlib-49afe6e717b8fa781062c7f75b6046423f174b52.tar.lz nixlib-49afe6e717b8fa781062c7f75b6046423f174b52.tar.xz nixlib-49afe6e717b8fa781062c7f75b6046423f174b52.tar.zst nixlib-49afe6e717b8fa781062c7f75b6046423f174b52.zip | |
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')
| -rw-r--r-- | pkgs/applications/networking/cluster/k3s/1_29/versions.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/networking/cluster/k3s/builder.nix | 11 |
2 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix index 00bc1476306d..bfb337a9824b 100644 --- a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.29.0+k3s1"; - k3sCommit = "3190a5faa28d7a0d428c756d67adcab7eb11e6a5"; - k3sRepoSha256 = "1g75a7kz9nnv0vagzhggkw0zqigykimdwsmibgssa8vyjpg7idda"; - k3sVendorHash = "sha256-iHmPVjYR/ZLH9UZ5yNEApyuGQsEwtxVbQw7Pu7WrpaQ="; + k3sVersion = "1.29.1+k3s2"; + k3sCommit = "57482a1c1bb9c67b5f893418a114edca1004258e"; + k3sRepoSha256 = "0pvab3dd6dzgk1zgra4jmdwba5b8xssfjr3mihwq1h0c5bxf1cza"; + k3sVendorHash = "sha256-EkRbdUoYpK7M+Wbc2Cf37bOwdwPB6/xLxULO7Bkpt5c="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index a914cf87102e..d213354b9109 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 ]; |