Skip to content

Commit 18bcdf7

Browse files
committed
Expose K3s package from dedicated nixpkgs input
1 parent ea037e3 commit 18bcdf7

2 files changed

Lines changed: 25 additions & 2 deletions

File tree

flake.lock

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
inputs = {
55
nixpkgs.url = "github:NixOS/nixpkgs/c23fa0ff46bbbfc4026e2f54cf4facf713dae7da";
6+
k3s-nixpkgs.url = "github:NixOS/nixpkgs/c23fa0ff46bbbfc4026e2f54cf4facf713dae7da";
67
rust-overlay.url = "github:oxalica/rust-overlay";
78
flake-utils.url = "github:numtide/flake-utils";
89
sift = {
@@ -38,6 +39,7 @@
3839
outputs = {
3940
self,
4041
nixpkgs,
42+
k3s-nixpkgs,
4143
rust-overlay,
4244
flake-utils,
4345
sift,
@@ -66,6 +68,8 @@
6668
let
6769
overlays = [ (import rust-overlay) ];
6870
pkgs = import nixpkgs { inherit system overlays; };
71+
k3sPkgs = import k3s-nixpkgs { inherit system; };
72+
k3sPkg = k3sPkgs.k3s_1_35;
6973
rust = pkgs.rust-bin.stable.latest.default.override {
7074
extensions = [ "rust-src" "rust-analyzer" "llvm-tools" ];
7175
};
@@ -84,7 +88,7 @@
8488
pkgs.gzip
8589
pkgs.curl
8690
] ++ pkgs.lib.optionals isLinux [
87-
pkgs.k3s
91+
k3sPkg
8892
awsPvmHostKitPkg
8993
pkgs.firecracker
9094
pkgs.iproute2
@@ -208,7 +212,7 @@
208212
keelPkg
209213
pkgs.curl
210214
] ++ pkgs.lib.optionals isLinux [
211-
pkgs.k3s
215+
k3sPkg
212216
];
213217
linuxRuntimeInputs = pkgs.lib.optionals isLinux [
214218
pkgs.firecracker
@@ -228,6 +232,8 @@
228232
keel = keelPkg;
229233
default = portPkg;
230234
} // pkgs.lib.optionalAttrs isLinux {
235+
k3s = k3sPkg;
236+
k3s-airgap-images = k3sPkg.airgap-images;
231237
firecracker-pvm = awsPvmFirecrackerPkg;
232238
firecracker-pvm-host-kit = awsPvmHostKitPkg;
233239
};

0 commit comments

Comments
 (0)