Skip to content

k3s: build with go_1_20 #263780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wegank merged 1 commit into from
Oct 30, 2023
Merged

k3s: build with go_1_20 #263780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions pkgs/applications/networking/cluster/k3s/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 9 additions & 6 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };
Expand Down