nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 01:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

k3s: build with go_1_20

Browse Source 
k3s upstream does not support go 1.21, so we're stuck on 1.20 for now.

Fixes #263580
This commit is contained in:
Euan Kemp 2023-10-26 21:41:54 +09:00
parent 1ce5a446bb
commit d30bd8a8cc
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/networking/cluster/k3s/default.nix
View File

@ -1,16 +1,23 @@
{ lib, stdenv, callPackage }:
{ lib, callPackage, ... }@args:
let
k3s_builder = import ./builder.nix lib;
common = opts: callPackage (k3s_builder opts);
# extraArgs is the extra arguments passed in by the caller to propogate downward.
# This is to allow all-packages.nix to do:
#
# let k3s_1_23 = (callPackage ./path/to/k3s {
# commonK3sArg = ....
# }).k3s_1_23;
extraArgs = builtins.removeAttrs args [ "callPackage" ];
in
{
k3s_1_26 = common ((import ./1_26/versions.nix) // {
updateScript = [ ./update-script.sh "26" ];
}) { };
}) extraArgs;
# 1_27 can be built with the same builder as 1_26
k3s_1_27 = common ((import ./1_27/versions.nix) // {
updateScript = [ ./update-script.sh "27" ];
}) { };
}) extraArgs;
}

15
pkgs/top-level/all-packages.nix
View File

@ -32999,12 +32999,15 @@ with pkgs;
jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { };
k3s_1_24 = callPackage ../applications/networking/cluster/k3s/1_24 { };
k3s_1_25 = callPackage ../applications/networking/cluster/k3s/1_25 { };
inherit (callPackage ../applications/networking/cluster/k3s { })
k3s_1_26
k3s_1_27
;
k3s_1_24 = callPackage ../applications/networking/cluster/k3s/1_24 {
buildGoModule = buildGo120Module;
};
k3s_1_25 = callPackage ../applications/networking/cluster/k3s/1_25 {
buildGoModule = buildGo120Module;
};
inherit (callPackage ../applications/networking/cluster/k3s {
buildGoModule = buildGo120Module;
}) k3s_1_26 k3s_1_27;
k3s = k3s_1_27;
k3sup = callPackage ../applications/networking/cluster/k3sup { };