From ff88b28193b2218ffd01d5113a65aab9460a5efa Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Fri, 21 Mar 2025 23:47:45 -0400 Subject: modules/nix: don't use repl-flake with lix >= 2.93 --- modules/shared/defaults/nix.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/shared/defaults/nix.nix b/modules/shared/defaults/nix.nix index 2692932..8c6b5f2 100644 --- a/modules/shared/defaults/nix.nix +++ b/modules/shared/defaults/nix.nix @@ -11,7 +11,10 @@ let # TODO: Remove this nonsense when all implementations remove repl-flake hasReplFlake = lib.versionOlder config.nix.package.version "2.22.0" # repl-flake was removed in nix 2.22.0 - || lib.versionAtLeast config.nix.package.version "2.90.0"; # but not in lix (yet, https://gerrit.lix.systems/c/lix/+/2147) + || ( + lib.versionAtLeast config.nix.package.version "2.90.0" # but not in Lix + && lib.versionOlder config.nix.package.version "2.93.0" # until 2.93 + ); hasAlwaysAllowSubstitutes = lib.versionAtLeast config.nix.package.version "2.19.0"; in -- cgit v1.2.3