summaryrefslogtreecommitdiffstats
path: root/env.nix
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-02-24 21:54:52 +0100
committertv <tv@shackspace.de>2015-02-24 22:06:00 +0100
commitadbb6de170e6a3215b461798e5cfdd823bd01e45 (patch)
tree1419fd45bd7f704b2131e6e65d8809364ca2697e /env.nix
parent75e3d1e803826cd433b41fb3ecde8eb892f42bf7 (diff)
Diffstat (limited to 'env.nix')
-rw-r--r--env.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/env.nix b/env.nix
index 303f718..b0f5c05 100644
--- a/env.nix
+++ b/env.nix
@@ -1,8 +1,8 @@
{ pkgs ? import <nixpkgs> {} }:
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;
}