From 6eba471e2426e7e4e7d5c935e3ce973e13fd6b24 Mon Sep 17 00:00:00 2001
From: Griffin Smith <root@gws.fyi>
Date: Sat, 31 Aug 2019 13:15:17 -0400
Subject: Use haskellSrc2nix over explicit cabal2nix

Use the (undocumented!) helper function haskellSrc2nix over having to
explicitly run cabal2nix all the time when rebuilding
---
 shell.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'shell.nix')

diff --git a/shell.nix b/shell.nix
index aefc492d3d44..966ab0bb0857 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,8 +1,8 @@
-{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc865", withHoogle ? true }:
+{ nixpkgs ? import ./nixpkgs.nix {}, compiler ? "ghc865", withHoogle ? true }:
 let
   inherit (nixpkgs) pkgs;
 
-  xan = import ./xanthous.nix;
+  pkg = import ./pkg.nix { inherit nixpkgs; };
 
   packageSet = (
     if compiler == "default"
@@ -21,7 +21,7 @@ let
     else packageSet
   );
 
-  drv = haskellPackages.callPackage xan {};
+  drv = haskellPackages.callPackage pkg {};
 
   inherit (pkgs.haskell.lib) addBuildTools;
 in
-- 
cgit 1.4.1