Haskell fixes

codedownio · Apr 12, 2024 · df8731c · df8731c
1 parent 50a18a5
commit df8731c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/languages/haskell/compilers.nix b/languages/haskell/compilers.nix
@@ -31,19 +31,19 @@
   #   };
   # };
 
-  ghc90 = haskell.packages.ghc90.override {
-    overrides = self: super: {
-      ghc-parser = self.callCabal2nix "ghc-parser" (
-        runCommand "ghc-parser-source" {} "cp -r ${ihaskell-source}/ghc-parser $out"
-      ) {};
+  # ghc90 = haskell.packages.ghc90.override {
+  #   overrides = self: super: {
+  #     ghc-parser = self.callCabal2nix "ghc-parser" (
+  #       runCommand "ghc-parser-source" {} "cp -r ${ihaskell-source}/ghc-parser $out"
+  #     ) {};
 
-      ipython-kernel = self.callCabal2nix "ipython-kernel" (
-        runCommand "ipython-kernel" {} "cp -r ${ihaskell-source}/ipython-kernel $out"
-      ) {};
+  #     ipython-kernel = self.callCabal2nix "ipython-kernel" (
+  #       runCommand "ipython-kernel" {} "cp -r ${ihaskell-source}/ipython-kernel $out"
+  #     ) {};
 
-      ihaskell = self.callCabal2nixWithOptions "ihaskell" ihaskell-source "--no-check" {};
-    };
-  };
+  #     ihaskell = self.callCabal2nixWithOptions "ihaskell" ihaskell-source "--no-check" {};
+  #   };
+  # };
 
   ghc92 = haskell.packages.ghc92.override {
     overrides = self: super: {
@@ -108,6 +108,8 @@
       warp_3_3_29 = null;
 
       ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_11_0;
+
+      ghc-lib = self.ghc-lib_9_8_2_20240223;
     };
   };
 }
diff --git a/tests/app/Spec/Tests/Haskell/Diagnostics.hs b/tests/app/Spec/Tests/Haskell/Diagnostics.hs
@@ -7,8 +7,8 @@ module Spec.Tests.Haskell.Diagnostics where
 import Control.Lens ((^.))
 import Data.String.Interpolate
 import Data.Text as T
-import Language.LSP.Protocol.Types
 import Language.LSP.Protocol.Lens hiding (diagnostics)
+import Language.LSP.Protocol.Types
 import qualified Spec.Tests.Haskell.Common as HaskellCommon
 import Spec.Tests.Haskell.Common hiding (lsName)
 import Test.Sandwich as Sandwich
@@ -72,5 +72,5 @@ etaExpandCode = [__i|module Foo where
 
 main :: IO ()
 main = runSandwichWithCommandLineArgs Sandwich.defaultOptions $
-  introduceNixEnvironment [kernelSpec "haskell-ghc924"] [] "Haskell" $
+  introduceNixEnvironment [kernelSpec "haskell-ghc92"] [] "Haskell" $
     diagnosticsTests HaskellCommon.lsName