pin nixpkgs to 20.03, fix broken readline dep

1 files changed, 14 insertions, 13 deletions

diff --git a/shell.nix b/shell.nix
index b1a597f..15334f5 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,19 +1,21 @@
 let
+  sources = import ./nix/sources.nix;
+  pkgs = import sources.nixpkgs {};
 
-  all-hies = fetchTarball {
-    url = "https://github.com/infinisil/all-hies/tarball/534ac517b386821b787d1edbd855b9966d0c0775";
-    sha256 = "0bw1llpwxbh1dnrnbxkj2l0j58s523hjivszf827c3az5i4py1i2";
+  inherit (pkgs) haskellPackages;
+  all-hls = pkgs.fetchFromGitHub {
+    owner = "masaeedu";
+    repo = "all-hls";
+    rev = "155e57d7ca9f79ce293360f98895e9bd68d12355";
+    sha256 = "04s3mrxjdr7gmd901l1z23qglqmn8i39v7sdf2fv4zbv6hz24ydb";
   };
 
-  pkgs = import <nixpkgs> {
-    # Pass no config for purity
-    config = {};
-    overlays = [
-      (import all-hies {}).overlay
-    ];
-  };
+  hls = import all-hls {
+    platform = "Linux";
+    version = "0.4.0";
+    ghc = "8.6.5";
+  }; # All parameters are optional. The default values are shown here.
 
-  inherit (pkgs) haskellPackages;
 
   haskellDeps = ps: with ps; [
     base
@@ -30,11 +32,10 @@ let
     pkgs.gdb
     pkgs.cabal2nix
     haskellPackages.cabal-install
-    haskellPackages.hie
     haskellPackages.hoogle
   ];
 in
 pkgs.stdenv.mkDerivation {
   name = "env";
-  buildInputs = externalPackages;
+  buildInputs = externalPackages ++ [ hls ];
 }