Nix upgrades (#102)

Switches the default Nix build to use GHC 8.10.7 and NixOS 21.05
This commit is contained in:
Ollie Charles 2021-09-14 02:58:39 +01:00 committed by GitHub
parent 259ffbff48
commit 76ce7bb569
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,12 +4,12 @@ haskellNix ? (import (import ./nix/sources.nix)."haskell.nix" { })
# haskell.nix provides access to the nixpkgs pins which are used by our CI, # haskell.nix provides access to the nixpkgs pins which are used by our CI,
# hence you will be more likely to get cache hits when using these. # hence you will be more likely to get cache hits when using these.
# But you can also just use your own, e.g. '<nixpkgs>'. # But you can also just use your own, e.g. '<nixpkgs>'.
, nixpkgsSrc ? haskellNix.sources.nixpkgs-2009 , nixpkgsSrc ? haskellNix.sources.nixpkgs-2105
# haskell.nix provides some arguments to be passed to nixpkgs, including some # haskell.nix provides some arguments to be passed to nixpkgs, including some
# patches and also the haskell.nix functionality itself as an overlay. # patches and also the haskell.nix functionality itself as an overlay.
, nixpkgsArgs ? haskellNix.nixpkgsArgs , nixpkgsArgs ? haskellNix.nixpkgsArgs
, compiler-nix-name ? "ghc884" , compiler-nix-name ? "ghc8107"
}: }:
let let
pkgs = import nixpkgsSrc nixpkgsArgs; pkgs = import nixpkgsSrc nixpkgsArgs;