BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #287792 from superherointj/k3s-1.29.1+k3s2

Browse source 
k3s_1_29: 1.29.0+k3s1 -> 1.29.1+k3s2
This commit is contained in:
Pol Dellaiera 2024-02-18 17:37:09 +01:00 committed by GitHub
commit bac766c367
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/networking/cluster/k3s/1_28/versions.nix
View file

@ -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";

8
pkgs/applications/networking/cluster/k3s/1_29/versions.nix
View file

@ -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";

11
pkgs/applications/networking/cluster/k3s/builder.nix
View file

@ -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.28")
(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 ];