1 files 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; [
+  thermoprintPackages = builtins.attrValues (import ./default.nix {});
-    cabal-install hlint cabal2nix
+  ghc = pkgs.haskell.packages.${compilerName}.ghcWithPackages
-    hspec QuickCheck quickcheck-instances
+    (ps: thermoprintPackages ++ utilities ps ++ testDeps ps);
-    hspec-contrib temporary
+  utilities = (ps: with ps; [ hlint cabal2nix ]);
-  ] ++ (builtins.attrValues (import ./default.nix { inherit pkgs; }));
+  testDeps = (ps: with ps; [ temporary hspec ]);
-  ghc = pkgs.haskell.packages.${compilerName}.ghcWithPackages packages;
 in
 pkgs.stdenv.mkDerivation rec {
  name = "thermoprint-env";

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