take nixpkgs default compiler

diff --git a/.gitignore b/.gitignore
index f0cc27bc4332f3f383bae7203c50fd2e3981efee..c74bad5c201c1341c7ce6a2b2a9438d5e59003e1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,6 @@
 .cabal*
 .ghc*
 dist
+dist-newstyle
 result
 Setup

diff --git a/default.nix b/default.nix
index c0ddec809fbf4fd00138bd128b1a7bc6b1166eca..09c2b5faaf004f72a3bff31215220dfac54dd050 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,6 @@
-{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc864" }:
+{ nixpkgs ? import <nixpkgs> {}, compiler ? "" }:
 with nixpkgs.pkgs;
-with haskell.packages.${compiler};
+with (if haskell.packages ? ${compiler} then haskell.packages.${compiler} else haskellPackages);
 callPackage ./amqp-utils.nix {
   amqp = haskell.lib.dontCheck (callPackage (import ./amqp.nix) {});
 }

diff --git a/shell.nix b/shell.nix
index cc9781933ccf30823d14a44ff62f8b43a98ea5ba..257e2559cb374095e4ba75656a4ddea3f3282567 100644 (file)
--- a/shell.nix
+++ b/shell.nix
@@ -1,2 +1,2 @@
-{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc864" }:
+{ nixpkgs ? import <nixpkgs> {}, compiler ? "" }:
 (import ./default.nix { inherit nixpkgs compiler; }).env