Skip to content

Commit c744775

Browse files
committed
Update all lix references to lruLix
- Update python/default.nix to use lruLix instead of lix - Update environments/cache/default.nix and environments/builder/default.nix to use lruLix - Update liximage.nix to use lruLix for building the container image - Update kubenix/daemonset.nix and kubenix/secret.nix image tags to use lixPackageSets.lix_2_94.lix with comments explaining why - Update kubenix/nixOptions.nix to use lix_2_94.lix instead of lix_2_93.lix with comment - Update demo/pod.nix to use lruLix instead of lixPackageSets.lix_2_93.lix
1 parent d6de67d commit c744775

6 files changed

Lines changed: 13 additions & 10 deletions

File tree

demo/pod.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ let
2727
pkgs.fishMinimal
2828
pkgs.coreutils
2929
pkgs.moreutils
30-
pkgs.lixPackageSets.lix_2_93.lix
30+
pkgs.lruLix
3131
];
3232
};
3333

kubenix/daemonset.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ in
5353
initContainers = lib.mkNumberedList {
5454
"1" = {
5555
name = "initcopy";
56-
image = "ghcr.io/lillecarl/nix-csi/lix:${pkgs.lixPackageSets.lix_2_93.lix.version}";
56+
# 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}";
5758
imagePullPolicy = "Always";
5859
securityContext.privileged = true; # chroot store
5960
env = lib.mkNamedList {

kubenix/nixOptions.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,9 @@ types.submodule (
8383
checkConfig
8484
extraOptions
8585
;
86-
package = pkgs.lixPackageSets.lix_2_93.lix.out;
87-
inherit (pkgs.lixPackageSets.lix_2_93.lix) version;
86+
# 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;
8889
}).generate
8990
"nix.conf"
9091
config.settings;

kubenix/secret.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ in
106106
serviceAccountName = "nix-csi";
107107
containers = lib.mkNamedList {
108108
init = {
109-
image = "ghcr.io/lillecarl/nix-csi/lix:${pkgs.lixPackageSets.lix_2_93.lix.version}";
109+
# 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}";
110111
imagePullPolicy = "Always";
111112
command = [ "init-secrets" ];
112113
volumeMounts = lib.mkNamedList {

liximage.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ rec {
2020
runtimeInputs = [
2121
sysPkgs.coreutils
2222
sysPkgs.gitMinimal
23-
sysPkgs.lixPackageSets.lix_2_93.lix
23+
sysPkgs.lruLix
2424
sysPkgs.rsync
2525
sysPkgs.openssh
2626
sysPkgs.kubectl
@@ -66,7 +66,7 @@ rec {
6666
in
6767
pkgs.dockerTools.streamLayeredImage {
6868
name = "${repo}/lix";
69-
tag = "${sysPkgs.lixPackageSets.lix_2_93.lix.version}-${sysPkgs.stdenv.hostPlatform.system}";
69+
tag = "${sysPkgs.lruLix.version}-${sysPkgs.stdenv.hostPlatform.system}";
7070
architecture = sysPkgs.go.GOARCH;
7171

7272
maxLayers = 125;
@@ -110,7 +110,7 @@ rec {
110110
regctl registry login -u="$REPO_USERNAME" -p="$REPO_TOKEN" ${server}
111111
${copyToRegistry "aarch64-linux"}
112112
${copyToRegistry "x86_64-linux"}
113-
regctl index create ${repo}/lix:${pkgs.lixPackageSets.lix_2_93.lix.version} \
113+
regctl index create ${repo}/lix:${pkgs.lruLix.version} \
114114
--ref ${imageRef "aarch64-linux"} \
115115
--ref ${imageRef "x86_64-linux"}
116116
regctl index create ${repo}/lix:latest \

python/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
gitMinimal, # Lix requires Git since it doesn't use libgit2
99
kr8s, # Kubernetes API
1010
shellous, # subprocessing
11-
lix, # We need a Nix implementation.... :)
11+
lruLix, # We need a Nix implementation.... :)
1212
nix_init_db, # Import from one nix DB to another
1313
openssh, # Copying to cache
1414
rsync, # hardlinking
@@ -31,7 +31,7 @@ buildPythonApplication {
3131
gitMinimal
3232
kr8s
3333
shellous
34-
lix
34+
lruLix
3535
nix_init_db
3636
openssh
3737
rsync

0 commit comments

Comments
 (0)