improve shell.nix some

input-output-hk · Jun 30, 2017 · c5a11ae · c5a11ae
1 parent 825d0dd
commit c5a11ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/default.nix b/default.nix
@@ -58,4 +58,5 @@ in ((import pkgs/default.nix { inherit pkgs compiler; }).override {
 }) // {
   # extra packages to expose, that have no relation to pkgs/default.nix
   stack2nix = compiler.callPackage ./pkgs/stack2nix.nix {};
+  iohk-ops  = compiler.callPackage (import ./iohk) {};
 }
diff --git a/shell.nix b/shell.nix
@@ -3,7 +3,6 @@
 , nixpkgs  ? lib.fetchNixPkgs
 , pkgs     ? import nixpkgs {}
 , iohkpkgs ? import ./default.nix { inherit pkgs; }
-, stack2nix ? iohkpkgs.callPackage ./pkgs/stack2nix.nix {}
 }: let
 
 compiler      = pkgs.haskell.packages."${ghcVer}";
@@ -24,8 +23,6 @@ ghc           = ghcOrig.override (oldArgs: {
   in with new; parent // {
       # intero         = overGithub  old.intero "commercialhaskell/intero"
       #                  "e546ea086d72b5bf8556727e2983930621c3cb3c" "1qv7l5ri3nysrpmnzfssw8wvdvz0f6bmymnz1agr66fplazid4pn" { doCheck = false; };
-      inherit stack2nix;
-      iohk-ops       = iohkpkgs.callPackage (import ./iohk) {};
     };
   });
 
@@ -59,6 +56,6 @@ mkDerivation {
   license      = stdenv.lib.licenses.mit;
 };
 
-drv = ghc.callPackage drvf {};
+drv = pkgs.haskellPackages.callPackage drvf { inherit (iohkpkgs) stack2nix iohk-ops; };
 
 in if pkgs.lib.inNixShell then drv.env else drv