diff options
| author | Alex James <git@alextjam.es> | 2024-12-03 22:53:36 -0600 |
|---|---|---|
| committer | Alex James <git@alextjam.es> | 2024-12-04 02:06:23 -0600 |
| commit | 0f9576cedc9b23ec8b01302daae919bc6018c3ca (patch) | |
| tree | 7e3fedbde57ac7087564ffc0d9533eca06d9a004 | |
| parent | c6b65d946097baf3915dd51373251de98199280d (diff) | |
nix: fix Lix version detection in auto-optimise-store assertion
| -rw-r--r-- | modules/nix/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 09e6e50..41398fa 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -763,8 +763,8 @@ in { # Should be fixed in Lix by https://gerrit.lix.systems/c/lix/+/2100 - # As `isNixAtLeast "2.92.0" "2.92.0-devpre20241107" == false`, we need to explicitly check if the user is running Lix 2.92.0 - assertion = cfg.settings.auto-optimise-store -> (cfg.package.pname == "lix" && (isNixAtLeast "2.92.0-devpre20241107" || cfg.package.version == "2.92.0")); + # Lix 2.92.0 will set `VERSION_SUFFIX` to `""`; `lib.versionAtLeast "" "pre20241107"` will return `true`. + assertion = cfg.settings.auto-optimise-store -> (cfg.package.pname == "lix" && (isNixAtLeast "2.92.0" && versionAtLeast (strings.removePrefix "-" cfg.package.VERSION_SUFFIX) "pre20241107")); message = "`nix.settings.auto-optimise-store` is known to corrupt the Nix Store, please use `nix.optimise.automatic` instead."; } ]; |