cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

k3s: name builder less confusingly

Browse source 
Per PR feedback
This commit is contained in:
Euan Kemp 2023-05-22 17:18:23 +09:00
parent c71ef26ecc
commit 2257ccd544
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/networking/cluster/k3s/builders/1_26.nix → pkgs/applications/networking/cluster/k3s/builder.nix
View file

@ -1,3 +1,9 @@
# builder.nix contains a "builder" expression that, given k3s version and hash
# variables, creates a package for that version.
# Due to variance in k3s's build process, this builder only works for k3s 1.26+
# currently.
# It is likely we will have to split out additional builders for additional
# versions in the future, or customize this one further.
{ lib { lib
, makeWrapper , makeWrapper
, socat , socat

7
pkgs/applications/networking/cluster/k3s/default.nix
View file

@ -1,11 +1,10 @@
{ lib, stdenv, callPackage }: { lib, stdenv, callPackage }:
let let
# The 1_26 builder can compile 1.26, and hopefully newer versions k3s_builder = import ./builder.nix;
k3s_1_26_builder = import ./builders/1_26.nix;
in in
{ {
k3s_1_26 = (callPackage k3s_1_26_builder { }) { k3s_1_26 = (callPackage k3s_builder { }) {
k3sVersion = "1.26.4+k3s1"; k3sVersion = "1.26.4+k3s1";
k3sCommit = "8d0255af07e95b841952563253d27b0d10bd72f0"; k3sCommit = "8d0255af07e95b841952563253d27b0d10bd72f0";
k3sRepoSha256 = "0qlszdnlsvj3hzx2p0wl3zhaw908w8a62z6vlf2g69a3c75f55cs"; k3sRepoSha256 = "0qlszdnlsvj3hzx2p0wl3zhaw908w8a62z6vlf2g69a3c75f55cs";
@ -21,7 +20,7 @@ in
}; };
# 1_27 can be built with the same builder as 1_26 # 1_27 can be built with the same builder as 1_26
k3s_1_27 = (callPackage k3s_1_26_builder { }) (import ./1_27/versions.nix) // { k3s_1_27 = (callPackage k3s_builder { }) (import ./1_27/versions.nix) // {
updateScript = ./1_27/update-script.sh; updateScript = ./1_27/update-script.sh;
}; };
} }