summaryrefslogtreecommitdiff
path: root/modules/shared
diff options
context:
space:
mode:
authorSeth Flynn <[email protected]>2025-03-21 23:47:45 -0400
committergetchoo-bot[bot] <183349775+getchoo-bot[bot]@users.noreply.github.com>2025-03-22 03:52:31 +0000
commitff88b28193b2218ffd01d5113a65aab9460a5efa (patch)
tree86a9aa6d029672cbb4e6bd567fde688bf74b9806 /modules/shared
parent6bbf206a7507260a250dcb06884c604ebab29cda (diff)
modules/nix: don't use repl-flake with lix >= 2.93
Diffstat (limited to 'modules/shared')
-rw-r--r--modules/shared/defaults/nix.nix5
1 files changed, 4 insertions, 1 deletions
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