From adbb6de170e6a3215b461798e5cfdd823bd01e45 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 24 Feb 2015 21:54:52 +0100 Subject: use haskell-ng --- env.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'env.nix') diff --git a/env.nix b/env.nix index 303f718..b0f5c05 100644 --- a/env.nix +++ b/env.nix @@ -1,8 +1,8 @@ { pkgs ? import {} }: let - name = "cgserver"; - version = "1"; + pname = "cgserver"; + version = "2"; buildInputs = with pkgs; [ hsEnv @@ -12,15 +12,15 @@ let $(grep export ${hsEnv.outPath}/bin/ghc) ''; - hsEnv = pkgs.haskellPackages_ghc783_profiling.ghcWithPackages + hsEnv = pkgs.haskellngPackages.ghcWithPackages (self: with self; (callPackage ./cgserver.nix {}).nativeBuildInputs ++ [ - cabalInstall + cabal-install ] ); in pkgs.myEnvFun { - name = "${name}-${version}"; + name = "${pname}-${version}"; inherit buildInputs extraCmds; } -- cgit v1.2.3