nix flake update & bump ghc 921 -> 922 (nix only)

.github/workflows/nix.yml

@@ -113,8 +113,10 @@ jobs:
       run: cachix push haskell-language-server dev
     - name: Build binaries
       run: nix build --print-build-logs
-    - name: Build all binaries
-      run: nix build --print-build-logs .#all-haskell-language-server
+    # smunix: "Build all binaries" takes too long to run and doesn't contribute
+    # to caching to cachix for now; so I'm disabling it for now.
+    # - name: Build all binaries
+    #   run: nix build --print-build-logs .#all-haskell-language-server
     - name: Push binaries
       if: ${{ env.HAS_TOKEN == 'true' }}
       run: nix path-info --json | jq -r '.[].path' | cachix push haskell-language-server

.gitignore

@@ -31,7 +31,7 @@ test/testdata/**/hie.yaml
 .shake/
 
 # pre-commit-hook.nix
-#.pre-commit-config.yaml
+.pre-commit-config.yaml
 
 # direnv
 /.direnv/

.gitlab-ci.yml

@@ -16,7 +16,7 @@ variables:
     - GHC_VERSION: 8.10.7
       CABAL_PROJECT: cabal.project
     - GHC_VERSION: 9.0.2
-      CABAL_PROJECT: cabal-ghc90.project
+      CABAL_PROJECT: cabal.project
     - GHC_VERSION: 9.2.2
       CABAL_PROJECT: cabal-ghc92.project
     - GHC_VERSION: 9.2.1

bindist/ghcs

@@ -1,6 +1,6 @@
 8.6.5,cabal.project
 8.8.4,cabal.project
 8.10.7,cabal.project
-9.0.2,cabal-ghc90.project
+9.0.2,cabal.project
 9.2.1,cabal-ghc92.project
 9.2.2,cabal-ghc92.project

bindist/ghcs-FreeBSD

@@ -1,2 +1,2 @@
 8.10.7,cabal.project
-9.0.2,cabal-ghc90.project
+9.0.2,cabal.project

bindist/ghcs-Msys

@@ -1,4 +1,4 @@
 8.10.7,cabal.project
-9.0.2,cabal-ghc90.project
+9.0.2,cabal.project
 9.2.2,cabal-ghc92.project
 9.2.1,cabal-ghc92.project

cabal-ghc92.project

@@ -39,7 +39,7 @@ package *
 
 write-ghc-environment-files: never
 
-index-state: 2022-04-27T09:22:49Z
+index-state: 2022-04-30T21:02:45Z
 
 constraints:
   -- These plugins don't build/work on GHC92 yet

cabal.project

@@ -37,21 +37,15 @@ optional-packages: vendored/*/*.cabal
 tests: true
 
 package *
-  -- ghc 8.10 cannot build ghc-lib 9.2 with --haddock
-  -- ghc-options: -haddock
+  -- ghc 8.10.7 fails to build ghc-lib-9.2.2
+  -- ghc-options: --haddock
   test-show-details: direct
 
 write-ghc-environment-files: never
 
-index-state: 2022-04-27T09:22:49Z
+index-state: 2022-04-30T21:02:45Z
 
 constraints:
-    hyphenation +embed,
-    -- remove this when hlint sets ghc-lib to true by default
-    -- https://github.com/ndmitchell/hlint/issues/1376
-    hlint +ghc-lib
+  hyphenation +embed,
+  hls-hlint-plugin +ghc-lib,
 
-allow-newer:
-    -- for shake-bench
-    Chart-diagrams:diagrams-core,
-    SVGFonts:diagrams-core

configuration-ghc-810.nix

@@ -0,0 +1,58 @@
+{ pkgs, inputs }:
+
+let
+  disabledPlugins = [
+    "hls-brittany-plugin"
+    "hls-hlint-plugin"
+    "hls-stylish-haskell-plugin"
+    "hls-haddock-comments-plugin"
+    "hls-tactics-plugin"
+    # That one is not technically a plugin, but by putting it in this list, we
+    # get it removed from the top level list of requirement and it is not pull
+    # in the nix shell.
+    "shake-bench"
+  ];
+
+  hpkgsOverride = hself: hsuper:
+    with pkgs.haskell.lib; {
+      hlsDisabledPlugins = disabledPlugins;
+
+      ghc-lib = hself.ghc-lib_8_10_7_20220219;
+      ghc-lib-parser = hself.ghc-lib-parser_8_10_7_20220219;
+
+      fourmolu = hself.callCabal2nix "fourmolu" inputs.fourmolu-0300 { };
+
+      stylish-haskell = hself.callCabal2nixWithOptions "stylish-haskell"
+        inputs.stylish-haskell-01220 (pkgs.lib.concatStringsSep " " [ ]) { };
+
+      aeson = hself.callCabal2nixWithOptions "aeson" inputs.aeson-1520
+        (pkgs.lib.concatStringsSep " " [ ]) { };
+
+      brittany = hself.callCabal2nixWithOptions "brittany" inputs.brittany-01312
+        (pkgs.lib.concatStringsSep " " [ ]) { };
+
+      hls-hlint-plugin = hself.callCabal2nixWithOptions "hls-hlint-plugin"
+        ./plugins/hls-hlint-plugin
+        (pkgs.lib.concatStringsSep " " [ "-f-hlint34" "-fhyphenation" ]) { };
+
+      # Re-generate HLS drv excluding some plugins
+      haskell-language-server =
+        hself.callCabal2nixWithOptions "haskell-language-server" ./.
+        (pkgs.lib.concatStringsSep " " [
+          "-fpedantic"
+          "-f-hlint"
+          "-f-fourmolu"
+          "-f-ormolu"
+        ]) { };
+
+      # YOLO
+      mkDerivation = args:
+        hsuper.mkDerivation (args // {
+          jailbreak = true;
+          doCheck = false;
+        });
+    };
+in {
+  inherit disabledPlugins;
+  tweakHpkgs = hpkgs: hpkgs.extend hpkgsOverride;
+}

configuration-ghc-88.nix

@@ -0,0 +1,58 @@
+{ pkgs, inputs }:
+
+let
+  disabledPlugins = [
+    "hls-brittany-plugin"
+    "hls-hlint-plugin"
+    "hls-stylish-haskell-plugin"
+    "hls-haddock-comments-plugin"
+    "hls-tactics-plugin"
+    # That one is not technically a plugin, but by putting it in this list, we
+    # get it removed from the top level list of requirement and it is not pull
+    # in the nix shell.
+    "shake-bench"
+  ];
+
+  hpkgsOverride = hself: hsuper:
+    with pkgs.haskell.lib; {
+      hlsDisabledPlugins = disabledPlugins;
+
+      ghc-lib = hself.ghc-lib_8_10_7_20220219;
+      ghc-lib-parser = hself.ghc-lib-parser_8_10_7_20220219;
+
+      fourmolu = hself.callCabal2nix "fourmolu" inputs.fourmolu-0300 { };
+
+      stylish-haskell = hself.callCabal2nixWithOptions "stylish-haskell"
+        inputs.stylish-haskell-01220 (pkgs.lib.concatStringsSep " " [ ]) { };
+
+      aeson = hself.callCabal2nixWithOptions "aeson" inputs.aeson-1520
+        (pkgs.lib.concatStringsSep " " [ ]) { };
+
+      brittany = hself.callCabal2nixWithOptions "brittany" inputs.brittany-01312
+        (pkgs.lib.concatStringsSep " " [ ]) { };
+
+      hls-hlint-plugin = hself.callCabal2nixWithOptions "hls-hlint-plugin"
+        ./plugins/hls-hlint-plugin
+        (pkgs.lib.concatStringsSep " " [ "-f-hlint34" "-fhyphenation" ]) { };
+
+      # Re-generate HLS drv excluding some plugins
+      haskell-language-server =
+        hself.callCabal2nixWithOptions "haskell-language-server" ./.
+        (pkgs.lib.concatStringsSep " " [
+          "-fpedantic"
+          "-f-hlint"
+          "-f-fourmolu"
+          "-f-ormolu"
+        ]) { };
+
+      # YOLO
+      mkDerivation = args:
+        hsuper.mkDerivation (args // {
+          jailbreak = true;
+          doCheck = false;
+        });
+    };
+in {
+  inherit disabledPlugins;
+  tweakHpkgs = hpkgs: hpkgs.extend hpkgsOverride;
+}

configuration-ghc-90.nix

@@ -0,0 +1,45 @@
+{ pkgs, inputs }:
+
+let
+  disabledPlugins = [ "hls-brittany-plugin" "hls-stylish-haskell-plugin" ];
+
+  hpkgsOverride = hself: hsuper:
+    with pkgs.haskell.lib; {
+      hlsDisabledPlugins = disabledPlugins;
+
+      # ptr-poker breaks on MacOS without SSE2 optimizations
+      # https://github.com/nikita-volkov/ptr-poker/issues/11
+      ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
+
+      ghc-lib = hself.ghc-lib_9_2_2_20220307;
+      ghc-lib-parser = hself.ghc-lib-parser_9_2_2_20220307;
+      ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_2_0_3;
+
+      Cabal = hself.Cabal_3_6_3_0;
+      ormolu = hself.ormolu_0_4_0_0;
+      fourmolu = hself.fourmolu_0_6_0_0;
+
+      # Hlint is still broken
+      hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint-34 { });
+
+      hls-hlint-plugin = hself.callCabal2nixWithOptions "hls-hlint-plugin"
+        ./plugins/hls-hlint-plugin
+        (pkgs.lib.concatStringsSep " " [ "-fhlint34" "-fghc-lib" ]) { };
+
+      # Re-generate HLS drv excluding some plugins
+      haskell-language-server =
+        hself.callCabal2nixWithOptions "haskell-language-server" ./.
+        (pkgs.lib.concatStringsSep " " [ "-f-brittany" "-f-stylishhaskell" ])
+        { };
+
+      # YOLO
+      mkDerivation = args:
+        hsuper.mkDerivation (args // {
+          jailbreak = true;
+          doCheck = false;
+        });
+    };
+in {
+  inherit disabledPlugins;
+  tweakHpkgs = hpkgs: hpkgs.extend hpkgsOverride;
+}

configuration-ghc-921.nix → configuration-ghc-92.nix

@@ -1,4 +1,3 @@
-# nix version of cabal-ghc901.project
 { pkgs, inputs }:
 
 let
@@ -14,19 +13,22 @@ let
   ];
 
   hpkgsOverride = hself: hsuper:
-    with pkgs.haskell.lib;
-    {
+    with pkgs.haskell.lib; {
       hlsDisabledPlugins = disabledPlugins;
 
-      fourmolu = hself.callCabal2nix "fourmolu" inputs.fourmolu {};
-      primitive-extras = hself.primitive-extras_0_10_1_2;
-      ghc-exactprint = hself.callCabal2nix "ghc-exactprint" inputs.ghc-exactprint {};
-      constraints-extras = hself.callCabal2nix "constraints-extras" inputs.constraints-extras {};
-      retrie = hself.callCabal2nix "retrie" inputs.retrie {};
+      fourmolu = hself.callCabal2nix "fourmolu" inputs.fourmolu { };
+      ghc-exactprint =
+        hself.callCabal2nix "ghc-exactprint" inputs.ghc-exactprint-150 { };
+      constraints-extras =
+        hself.callCabal2nix "constraints-extras" inputs.constraints-extras { };
+      retrie = hself.callCabal2nix "retrie" inputs.retrie { };
+
+      # ptr-poker breaks on MacOS without SSE2 optimizations
+      # https://github.com/nikita-volkov/ptr-poker/issues/11
+      ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
 
       # Hlint is still broken
-      hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint {});
-      hiedb = hself.hiedb_0_4_1_0;
+      hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint { });
 
       # Re-generate HLS drv excluding some plugins
       haskell-language-server =

docs/requirements.txt

@@ -1,4 +1,4 @@
 Sphinx==4.0.2
 sphinx-rtd-theme==0.5.2
 myst-parser==0.15.1
-docutils<0.17
+docutils<0.19