From 50b10465361511b4e54dbd84bd99a63c1a5e282e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 9 Mar 2019 17:40:38 -0500 Subject: [PATCH] Expose a haskell package set, don't use inNixStore for shell --- default.nix | 8 +++++--- shell.nix | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 shell.nix diff --git a/default.nix b/default.nix index 8d18953..9614fe3 100644 --- a/default.nix +++ b/default.nix @@ -21,7 +21,6 @@ config.allowBroken = false; } -, returnShellEnv ? pkgs.lib.inNixShell , mkDerivation ? null }: @@ -62,10 +61,13 @@ drv = haskellPackages.developPackage { ++ pkgs.stdenv.lib.optional doOptimize "--flags=optimize" ++ pkgs.stdenv.lib.optional doStrict "--ghc-options=-Werror"; - passthru = { nixpkgs = pkgs; }; + passthru = { + nixpkgs = pkgs; + inherit haskellPackages; + }; }); - inherit returnShellEnv; + returnShellEnv = false; }; in drv diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..0e50343 --- /dev/null +++ b/shell.nix @@ -0,0 +1 @@ +{} @ attrs: (import ./. attrs).env