Always use same compiler in shell.nix and default.nix

This commit is contained in:
Luc Tielen 2019-12-08 17:28:05 +01:00
parent 835678650c
commit 0784573cac
No known key found for this signature in database
GPG Key ID: 30A4D06ACE9EBD3C
2 changed files with 8 additions and 4 deletions

View File

@ -1,8 +1,8 @@
{ pkgs ? import nix/pkgs.nix }:
{ compiler ? "ghc865", pkgs ? import nix/pkgs.nix }:
let
hlib = pkgs.haskell.lib;
hpkg = pkgs.haskell.packages.ghc865;
hpkg = pkgs.haskell.packages."${compiler}";
llvm-hs = import ./nix/llvm-hs.nix;
in

View File

@ -1,7 +1,11 @@
{ pkgs ? import nix/pkgs.nix }:
let grin = import ./. { inherit pkgs; };
in pkgs.haskell.packages.ghc865.shellFor {
let
compiler = "ghc865";
grin = import ./. { inherit compiler pkgs; };
in
pkgs.haskell.packages."${compiler}".shellFor {
withHoogle = true;
packages = p: [ grin ];
inherit (grin.env) nativeBuildInputs;