diff options
| author | superherointj <5861043+superherointj@users.noreply.github.com> | 2024-02-13 16:27:31 -0300 |
|---|---|---|
| committer | superherointj <5861043+superherointj@users.noreply.github.com> | 2024-02-13 16:33:09 -0300 |
| commit | f74855a4f0f49b212b787aa938b5913c9c647f42 (patch) | |
| tree | 77658008020a5e1c2df7363d38ed2e14ffbdcfc8 /pkgs/applications/networking/cluster/k3s | |
| parent | 49afe6e717b8fa781062c7f75b6046423f174b52 (diff) | |
| download | nixlib-f74855a4f0f49b212b787aa938b5913c9c647f42.tar nixlib-f74855a4f0f49b212b787aa938b5913c9c647f42.tar.gz nixlib-f74855a4f0f49b212b787aa938b5913c9c647f42.tar.bz2 nixlib-f74855a4f0f49b212b787aa938b5913c9c647f42.tar.lz nixlib-f74855a4f0f49b212b787aa938b5913c9c647f42.tar.xz nixlib-f74855a4f0f49b212b787aa938b5913c9c647f42.tar.zst nixlib-f74855a4f0f49b212b787aa938b5913c9c647f42.zip | |
k3s_1_28: 1.28.6+k3s1 -> 1.28.6+k3s2
Fixes #287834
Diffstat (limited to 'pkgs/applications/networking/cluster/k3s')
| -rw-r--r-- | pkgs/applications/networking/cluster/k3s/1_28/versions.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/networking/cluster/k3s/builder.nix | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix index f1d3ea13177a..2b8085795577 100644 --- a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.28.6+k3s1"; - k3sCommit = "39a0001575780fffa6aae0271f4cb4ce7413aac8"; - k3sRepoSha256 = "1bhbpbgs02gh5y7pgn6vmanacrz3p0b2gq3w2kqpb11bijp2alld"; - k3sVendorHash = "sha256-Mo+gZ+NOZqd3CP/Z02LfO4dHyEuRhabZVAU60GofOMo="; + k3sVersion = "1.28.6+k3s2"; + k3sCommit = "c9f49a3b06cd7ebe793f8cc1dcd0293168e743d9"; + k3sRepoSha256 = "0vz5976q58v9x6g1qz6kz3xksgf8gm1f727ccckmpbyxbhw75zsa"; + k3sVendorHash = "sha256-HG4x3N/F5qCFpLxGrUWPkBHHqY7WBRDWN7DNyAcJwyI="; 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 d213354b9109..3f44deb9771d 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -187,7 +187,7 @@ let patches = # Disable: Add runtime checking of golang version - lib.optional (lib.versionAtLeast k3sVersion "1.29") + lib.optional (lib.versionAtLeast k3sVersion "1.28") (fetchpatch { # https://github.com/k3s-io/k3s/pull/9054 url = "https://github.com/k3s-io/k3s/commit/b297996b9252b02e56e9425f55f6becbf6bb7832.patch"; |