diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 20a797dd2f..005506946d 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -57,8 +57,8 @@ jobs:
         skipPush: true
     - if: ${{ needs.pre_job.outputs.should_skip_develop != 'true' }}
       run: |
-        nix develop --command cabal update
-        nix develop --command cabal build
+        nix develop --print-build-logs --command cabal update
+        nix develop --print-build-logs --command cabal build
 
   # Build and then push HLS binaries with developmet shell to cachix
   # This job runs when
@@ -91,16 +91,16 @@ jobs:
         name: haskell-language-server
         authToken: ${{ secrets.HLS_CACHIX_AUTH_TOKEN }}
     - name: Build development shell
-      run: nix develop --profile dev
+      run: nix develop --print-build-logs --profile dev
     - name: Build development shell (GHC 9.0.1)
-      run: nix develop .#haskell-language-server-901-dev --profile dev
+      run: nix develop --print-build-logs .#haskell-language-server-901-dev --profile dev
     - name: Push development shell
       if: ${{ env.HAS_TOKEN == 'true' }}
       run: cachix push haskell-language-server dev
     - name: Build binaries
-      run: nix build
+      run: nix build --print-build-logs
     - name: Build binaries (GHC 9.0.1)
-      run: nix build .#haskell-language-server-901
+      run: nix build --print-build-logs .#haskell-language-server-901
     - name: Push binaries
       if: ${{ env.HAS_TOKEN == 'true' }}
       run: nix path-info --json | jq -r '.[].path' | cachix push haskell-language-server
diff --git a/configuration-ghc-901.nix b/configuration-ghc-901.nix
index 7f3d38554c..36777ad92b 100644
--- a/configuration-ghc-901.nix
+++ b/configuration-ghc-901.nix
@@ -69,6 +69,8 @@ let
 
       ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_0_0_4;
 
+      ormolu = hself.ormolu_0_2_0_0;
+
       operational = hself.callCabal2nix "operational" (pkgs.fetchFromGitHub {
         owner = "HeinrichApfelmus";
         repo = "operational";
diff --git a/flake.lock b/flake.lock
index e3939fd59d..ed2b424993 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1627832136,
-        "narHash": "sha256-OUBMZeJ01AdzGjJ9ZkY5rh1bQircBoPoV2anXSE+luI=",
+        "lastModified": 1627913399,
+        "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "bef1b74164e238c530aec28335e761372dafe4c4",
+        "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
         "type": "github"
       },
       "original": {
@@ -18,11 +18,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1623875721,
-        "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
+        "lastModified": 1629481132,
+        "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
+        "rev": "997f7efcb746a9c140ce1f13c72263189225f482",
         "type": "github"
       },
       "original": {
@@ -49,11 +49,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1627814220,
-        "narHash": "sha256-P+MDgdZw2CBk9X1ZZaUgHgN+32pTfLFf3XVIBOXirI4=",
+        "lastModified": 1630887066,
+        "narHash": "sha256-0ecIlrLsNIIa+zrNmzXXmbMBLZlmHU/aWFsa4bq99Hk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ab5b6828af26215bf2646c31961da5d3749591ef",
+        "rev": "5e47a07e9f2d7ed999f2c7943b0896f5f7321ca3",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index ca6559feba..e7409c385a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -79,23 +79,11 @@
                   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;
             };
 
           hlsSources =
@@ -177,7 +165,7 @@
           + pkgs.lib.replaceStrings [ "." ] [ "" ]
           pkgs.haskellPackages.ghc.version);
         ghc884 = pkgs.hlsHpkgs "ghc884";
-        ghc8104 = pkgs.hlsHpkgs "ghc8104";
+        ghc8107 = pkgs.hlsHpkgs "ghc8107";
         ghc901 = ghc901Config.tweakHpkgs (pkgs.hlsHpkgs "ghc901");
 
         # For markdown support
@@ -252,15 +240,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-8107-dev = mkDevShell ghc8107;
           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-8107 = mkExe ghc8107;
           haskell-language-server-901 = mkExe ghc901;
 
           # docs