diff options
author | Euan Kemp <euank@euank.com> | 2023-10-26 21:41:54 +0900 |
---|---|---|
committer | Euan Kemp <euank@euank.com> | 2023-10-29 21:49:52 +0900 |
commit | d30bd8a8cc0e11b873367dc37e24af7755a357a2 (patch) | |
tree | fd503d146fb17f78e7dcd287ba296eef47154c14 /pkgs | |
parent | 1ce5a446bb17c4d440c1159660eff6cdea7f66a4 (diff) | |
download | nixlib-d30bd8a8cc0e11b873367dc37e24af7755a357a2.tar nixlib-d30bd8a8cc0e11b873367dc37e24af7755a357a2.tar.gz nixlib-d30bd8a8cc0e11b873367dc37e24af7755a357a2.tar.bz2 nixlib-d30bd8a8cc0e11b873367dc37e24af7755a357a2.tar.lz nixlib-d30bd8a8cc0e11b873367dc37e24af7755a357a2.tar.xz nixlib-d30bd8a8cc0e11b873367dc37e24af7755a357a2.tar.zst nixlib-d30bd8a8cc0e11b873367dc37e24af7755a357a2.zip |
k3s: build with go_1_20
k3s upstream does not support go 1.21, so we're stuck on 1.20 for now. Fixes #263580
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/cluster/k3s/default.nix | 13 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 15 |
2 files changed, 19 insertions, 9 deletions
diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 503a4ff0c0d1..e2ba162b7581 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -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; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32606f11a506..031122ad6258 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |