diff --git a/shell.nix b/shell.nix index df2997a61..c5b561eaa 100644 --- a/shell.nix +++ b/shell.nix @@ -1,4 +1,4 @@ -{ nixpkgs ? import {}, compiler ? null }: +{ nixpkgs ? import {}, compiler ? "ghc802" }: let inherit (nixpkgs) pkgs; @@ -22,7 +22,7 @@ let ''; override = oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ (with pkgs; [ postgresql ]) ++ (with haskellPackages; [ stack stack-run yesod-bin ]); + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ (with pkgs; [ postgresql ]) ++ (with haskellPackages; [ stack yesod-bin ]); shellHook = '' ${oldAttrs.shellHook} export PROMPT_INFO="${oldAttrs.name}" @@ -44,5 +44,10 @@ let exit ''${ret} ''; }; -in - pkgs.stdenv.lib.overrideDerivation drv.env override + + dummy = pkgs.stdenv.mkDerivation { + name = "interactive-uniworx-environment"; + shellHook = ""; + }; +in pkgs.stdenv.lib.overrideDerivation dummy override + #pkgs.stdenv.lib.overrideDerivation drv.env override diff --git a/stack.nix b/stack.nix index 6c8243ee9..720dc860f 100644 --- a/stack.nix +++ b/stack.nix @@ -5,7 +5,9 @@ let in haskell.lib.buildStackProject { inherit ghc; name = "stackenv"; - buildInputs = with pkgs; + buildInputs = (with pkgs; [ postgresql zlib openldap cyrus_sasl.dev - ]; + ]) ++ (with haskell.packages."ghc${builtins.replaceStrings ["."] [""] ghc.version}"; + [ yesod-bin + ]); }