diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-10-30 13:58:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-30 13:58:32 +0100 |
commit | 18ff78f9552463abf95c76c2554ce5493ba0d799 (patch) | |
tree | 912e7c8a740b7bfe8e25bd0a7b8921acecd1524b /pkgs/applications | |
parent | b35bdab9614045e935b601ab95a6ad142313417a (diff) | |
parent | d30bd8a8cc0e11b873367dc37e24af7755a357a2 (diff) |
Merge pull request #263780 from euank/k3s-go-1-20
k3s: build with go_1_20
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/cluster/k3s/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 503a4ff0c0d13..e2ba162b75812 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; } |