Skip to content

Commit 66d2670

Browse files
committed
alias selected standard Lix version
1 parent 8aa484c commit 66d2670

5 files changed

Lines changed: 6 additions & 5 deletions

File tree

environments/cache/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ let
2222
intervalSeconds = 3600;
2323
};
2424
# services.nix-serve-ng = {
25-
# command = "${lib.getExe pkgs.lixPackageSets.lix_2_93.nix-serve-ng}";
25+
# command = "${lib.getExe pkgs.lixPackageSets.lix_2_94.nix-serve-ng}";
2626
# log-type = "file";
2727
# logfile = "/var/log/nix-serve-ng.log";
2828
# };

kubenix/daemonset.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ in
5454
"1" = {
5555
name = "initcopy";
5656
# Use normal lix so we don't have to build lruLix locally
57-
image = "ghcr.io/lillecarl/nix-csi/lix:${pkgs.lixPackageSets.lix_2_94.lix.version}";
57+
image = "ghcr.io/lillecarl/nix-csi/lix:${pkgs.stdLix.version}";
5858
imagePullPolicy = "Always";
5959
securityContext.privileged = true; # chroot store
6060
env = lib.mkNamedList {

kubenix/nixOptions.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ types.submodule (
8484
extraOptions
8585
;
8686
# Use normal lix so we don't have to build lruLix locally
87-
package = pkgs.lixPackageSets.lix_2_94.lix.out;
88-
inherit (pkgs.lixPackageSets.lix_2_94.lix) version;
87+
package = pkgs.stdLix.out;
88+
inherit (pkgs.stdLix.lix) version;
8989
}).generate
9090
"nix.conf"
9191
config.settings;

kubenix/secret.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ in
107107
containers = lib.mkNamedList {
108108
init = {
109109
# Use normal lix so we don't have to build lruLix locally
110-
image = "ghcr.io/lillecarl/nix-csi/lix:${pkgs.lixPackageSets.lix_2_94.lix.version}";
110+
image = "ghcr.io/lillecarl/nix-csi/lix:${pkgs.stdLix.version}";
111111
imagePullPolicy = "Always";
112112
command = [ "init-secrets" ];
113113
volumeMounts = lib.mkNamedList {

pkgs/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ self: pkgs: {
1717
inherit (self) csi-proto-python kr8s;
1818
};
1919

20+
stdLix = pkgs.lixPackageSets.lix_2_94.lix;
2021
lruLix = pkgs.lixPackageSets.lix_2_94.lix.overrideAttrs (oldAttrs: {
2122
src = builtins.fetchTree {
2223
type = "github";

0 commit comments

Comments
 (0)