summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorseth <[email protected]>2024-06-30 19:45:01 -0400
committerseth <[email protected]>2024-06-30 19:45:01 -0400
commit7ec0a0df8772fddc03dcccd56e476c8d96973f81 (patch)
treec98e5eb6907516c72d1b3743302302a39fa47752
parent2bcb767941c31e4c13e194526ead941695529245 (diff)
modules/nix: enable `repl-flake` when using lix
-rw-r--r--modules/shared/base/nix.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/shared/base/nix.nix b/modules/shared/base/nix.nix
index f54076e..4b0c2ae 100644
--- a/modules/shared/base/nix.nix
+++ b/modules/shared/base/nix.nix
@@ -30,9 +30,10 @@ in
"flakes"
"auto-allocate-uids"
]
- # TODO: remove when nix >= 2.22.0 is the default in nixpkgs
- # repl-flake was removed in nix 2.22.0
- ++ lib.optional (lib.versionOlder config.nix.package.version "2.22.0") "repl-flake";
+ ++ lib.optional (
+ 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-rc1" # but not in lix yet
+ ) "repl-flake";
trusted-substituters = [ "https://getchoo.cachix.org" ];
trusted-public-keys = [ "getchoo.cachix.org-1:ftdbAUJVNaFonM0obRGgR5+nUmdLMM+AOvDOSx0z5tE=" ];