From 3bc2738ef6c45adf41990dced40d1dab4e4fcea5 Mon Sep 17 00:00:00 2001
From: Mats Rauhala <mats.rauhala@iki.fi>
Date: Thu, 18 Aug 2022 10:37:28 +0300
Subject: [PATCH] Replace easy-hls with haskell-language-server

---
 flake.lock | 21 ---------------------
 flake.nix  |  9 ++-------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/flake.lock b/flake.lock
index c02a406..1aaf40e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,25 +1,5 @@
 {
   "nodes": {
-    "easy-hls": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1637250802,
-        "narHash": "sha256-/crlHEVB148PGQLZCsHOR9L5qgvCAfRSocIoKgmMAhA=",
-        "owner": "jkachmar",
-        "repo": "easy-hls-nix",
-        "rev": "7c123399ef8a67dc0e505d9cf7f2c7f64f1cd847",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jkachmar",
-        "repo": "easy-hls-nix",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "locked": {
         "lastModified": 1637014545,
@@ -53,7 +33,6 @@
     },
     "root": {
       "inputs": {
-        "easy-hls": "easy-hls",
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
diff --git a/flake.nix b/flake.nix
index 92a5d91..3b6c50c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,13 +4,9 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
-    easy-hls = {
-      url = "github:jkachmar/easy-hls-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
-  outputs = { self, nixpkgs, flake-utils, easy-hls }:
+  outputs = { self, nixpkgs, flake-utils }:
   {
     overlay = final: prev: {
       deploy-rauhala-info = with final; runCommand "deploy-rauhala-info.sh" { inherit bash ipfs; }
@@ -38,7 +34,6 @@
     let
       pkgs = import nixpkgs { inherit system; overlays = [ self.overlay ]; };
       hp = pkgs.haskellPackages;
-      hls = easy-hls.defaultPackage.${system};
     in
     rec {
       packages = { inherit (pkgs) build-rauhala-info rauhala-info deploy-rauhala-info; };
@@ -59,7 +54,7 @@
           cabal-install
           stylish-haskell
           entr
-          hls
+          haskell-language-server
           ipfs
         ];
       };