axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

nix-direnv: rm enableFlakes and pass nixUnstable

Browse source 
>        Failed assertions:
       - The option definition `programs.direnv.nix-direnv.enableFlakes' in `/nix/store/pv3vi4n7x83r4sc3ljqdgg9qifr4n5gp-source/users/profiles/direnv' no longer has any effect; please remove it.
       Flake support is now always enabled.
This commit is contained in:
David Arnold 2021-11-29 18:07:21 -05:00 committed by Parthiv Seetharaman
parent 6151d02b8d
commit 838bcd1f51
3 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
overlays/overrides.nix
View file

@ -15,6 +15,8 @@ channels: final: prev: {
deploy-rs
;
# nix is set to 2.3 in 21.11
nix-direnv = prev.nix-direnv.override { nix = prev.nixUnstable; };
haskellPackages = prev.haskellPackages.override
(old: {

11
overlays/various-flake-fixes.nix
View file

@ -1,11 +0,0 @@
final: prev: {
# Since: https://github.com/NixOS/nixpkgs/pull/126137
nix-direnv =
if builtins.hasAttr "enableFlakes" prev.nix-direnv.override.__functionArgs
then
prev.nix-direnv.override
{
enableFlakes = true;
}
else prev.nix-direnv;
}

1
users/profiles/direnv/default.nix
View file

@ -3,7 +3,6 @@
enable = true;
nix-direnv = {
enable = true;
enableFlakes = true;
};
};
}