From 70c939c9119778ff60f8e2756c219be6deb811df Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 24 Feb 2015 20:15:00 +0100 Subject: use haskell-ng --- env.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/env.nix b/env.nix index f0f23ce..47a9759 100644 --- a/env.nix +++ b/env.nix @@ -1,8 +1,8 @@ { nixpkgs ? import {} }: let - name = "hack"; - version = "1"; + pname = "hack"; + version = "2"; buildInputs = with pkgs; [ hsEnv @@ -15,10 +15,9 @@ let ''; hsEnv = hsPkgs.ghcWithPackages (self: with self; - login.nativeBuildInputs ++ [ - cabalInstall - dataDefault + cabal-install + data-default lens mtl zippers @@ -27,10 +26,7 @@ let ] ); - hsPkgs = pkgs.haskellPackages_ghc783_profiling.override { - extension = self: super: with self; { - }; - }; + hsPkgs = pkgs.haskellngPackages; pkgs = nixpkgs // staticPkgs; staticPkgs = with nixpkgs; { @@ -49,7 +45,7 @@ let #}}} in pkgs.myEnvFun { - name = "${name}-${version}"; + name = "${pname}-${version}"; inherit buildInputs extraCmds; } # vim: set fdm=marker : -- cgit v1.2.3