From 2d16ad6786e6047fc61b34e6bd7e59e794a9d5a3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 18 Feb 2016 21:58:28 +0000
Subject: ghc version bump & cleanup

---
 shell.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/shell.nix b/shell.nix
index 1e9307e..d6f2e43 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,14 +1,13 @@
 { pkgs ? (import <nixpkgs> {})
-, compilerName ? "ghc7102"
+, compilerName ? "ghc7103"
 }:
 
 let
-  packages = ps: with ps; [
-    cabal-install hlint cabal2nix
-    hspec QuickCheck quickcheck-instances
-    hspec-contrib temporary
-  ] ++ (builtins.attrValues (import ./default.nix { inherit pkgs; }));
-  ghc = pkgs.haskell.packages.${compilerName}.ghcWithPackages packages;
+  thermoprintPackages = builtins.attrValues (import ./default.nix {});
+  ghc = pkgs.haskell.packages.${compilerName}.ghcWithPackages
+    (ps: thermoprintPackages ++ utilities ps ++ testDeps ps);
+  utilities = (ps: with ps; [ hlint cabal2nix ]);
+  testDeps = (ps: with ps; [ temporary hspec ]);
 in
 pkgs.stdenv.mkDerivation rec {
   name = "thermoprint-env";
-- 
cgit v1.2.3