about summary refs log tree commit diff
path: root/users/glittershark/owothia/shell.nix
diff options
context:
space:
mode:
Diffstat (limited to 'users/glittershark/owothia/shell.nix')
-rw-r--r--users/glittershark/owothia/shell.nix21
1 files changed, 15 insertions, 6 deletions
diff --git a/users/glittershark/owothia/shell.nix b/users/glittershark/owothia/shell.nix
index 53971c97bd..4a89fa0a5d 100644
--- a/users/glittershark/owothia/shell.nix
+++ b/users/glittershark/owothia/shell.nix
@@ -1,14 +1,23 @@
-args@{ pkgs ? (import ../../../. {}).third_party, ... }:
+{ pkgs ? (import ../../../. {}).third_party, ... }:
 
-((import ./packageSet.nix args).extend (pkgs.haskell.lib.packageSourceOverrides {
-  owothia = pkgs.gitignoreSource ./.;
+let
+  inherit (pkgs)
+    haskellPackages
+    haskell
+    gitignoreSource
+    ;
+in
+
+(haskellPackages.extend (haskell.lib.packageSourceOverrides {
+  owothia = gitignoreSource ./.;
 })).shellFor {
-  packages = p: [p.owothia];
+  packages = p: [ p.owothia ];
   withHoogle = true;
   doBenchmark = true;
-  buildInputs = with pkgs.haskellPackages; [
+  buildInputs = with haskellPackages; [
     cabal-install
     hlint
-    pkgs.haskell-language-server.ghc884
+    # TODO(sterni): versions out of sync
+    # pkgs.haskell-language-server.ghc884
   ];
 }