Update nix flake

Doing a nixpkgs update gains ghc 8.10.6 support. lsp-types needed updating to satisfy bounds so I did that.
haskell · Sep 4, 2021 · 31ad908 · 31ad908
1 parent b1d3dce
commit 31ad908
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 29 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -79,23 +79,13 @@
                   sha256 = "byehvdxQxhNk5ZQUXeFHjAZpAze4Ct9261ro4c5acZk=";
                 }) { };
 
-              lsp = hself.callCabal2nix "lsp"
-                (builtins.fetchTarball {
-                  url = "https://hackage.haskell.org/package/lsp-1.2.0.1/lsp-1.2.0.1.tar.gz";
-                  sha256 = "1lhzsraiw11ldxvxn8ax11hswpyzsvw2da2qmp3p6fc9rfpz4pj5";
-                }) { };
+              lsp = hself.lsp_1_2_0_1;
 
-              lsp-types = hself.callCabal2nix "lsp-types"
-                (builtins.fetchTarball {
-                  url = "https://hackage.haskell.org/package/lsp-types-1.3.0.0/lsp-types-1.3.0.0.tar.gz";
-                  sha256 = "0qajyyj2d51daa4y0pqaa87n4nny0i920ivvzfnrk9gq9386iac7";
-                }) { };
+              lsp-types = hself.lsp-types_1_3_0_1;
 
-              lsp-test = hself.callCabal2nix "lsp-test"
-                (builtins.fetchTarball {
-                  url = "https://hackage.haskell.org/package/lsp-test-0.14.0.1/lsp-test-0.14.0.1.tar.gz";
-                  sha256 = "10lnyg7nlbd3ymgvjjlrkfndyy7ay9cwnsk684p08k2gzlric4yq";
-                }) { };
+              lsp-test = hself.lsp-test_0_14_0_1;
+
+              ormolu = hself.ormolu_0_2_0_0;
             };
 
           hlsSources =
@@ -177,7 +167,7 @@
           + pkgs.lib.replaceStrings [ "." ] [ "" ]
           pkgs.haskellPackages.ghc.version);
         ghc884 = pkgs.hlsHpkgs "ghc884";
-        ghc8104 = pkgs.hlsHpkgs "ghc8104";
+        ghc8106 = pkgs.hlsHpkgs "ghc8106";
         ghc901 = ghc901Config.tweakHpkgs (pkgs.hlsHpkgs "ghc901");
 
         # For markdown support
@@ -252,15 +242,13 @@
           # dev shell
           haskell-language-server-dev = mkDevShell ghcDefault;
           haskell-language-server-884-dev = mkDevShell ghc884;
-          haskell-language-server-8104-dev = mkDevShell ghc8104;
-          haskell-language-server-8105-dev = builtins.throw "GHC 8.10.5 is not available in nixpkgs";
+          haskell-language-server-8106-dev = mkDevShell ghc8106;
           haskell-language-server-901-dev = mkDevShell ghc901;
 
           # hls package
           haskell-language-server = mkExe ghcDefault;
           haskell-language-server-884 = mkExe ghc884;
-          haskell-language-server-8104 = mkExe ghc8104;
-          haskell-language-server-8105 = builtins.throw "GHC 8.10.5 is not available in nixpkgs";
+          haskell-language-server-8106 = mkExe ghc8106;
           haskell-language-server-901 = mkExe ghc901;
 
           # docs