Merge branch 'main' into b12f

This commit is contained in:
Benjamin Bädorf 2022-01-06 14:14:57 +01:00
commit 115f41466b
No known key found for this signature in database
GPG key ID: 4406E80E13CD656C

View file

@ -28,7 +28,7 @@ channels: final: prev: {
;
# nix is set to 2.3 in 21.11
nix-direnv = prev.nix-direnv.override { nix = prev.nixUnstable; };
nix-direnv = prev.nix-direnv.override { nix_2_4 = true; };
haskellPackages = prev.haskellPackages.override
(old: {