hnls: specify version in one place noci

Author: thomasjm

languages/haskell/language-server-hls/hnls.nix

@@ -25,9 +25,10 @@ let
   # };
 
   ghcVersionToHnls = let
+    version = "0.3.1.0";
     prebuilt = src: stdenv.mkDerivation {
       pname = "haskell-notebook-language-server";
-      version = "0.3.0.0";
+      inherit version;
 
       inherit src;
 
@@ -40,27 +41,27 @@ let
   in
     {
       "v810" = prebuilt (fetchzip {
-        url = "https://github.com/codedownio/haskell-notebook-language-server/releases/download/v0.3.0.0/haskell-notebook-language-server-0.3.0.0-ghc8107-x86_64-linux.tar.gz";
+        url = "https://github.com/codedownio/haskell-notebook-language-server/releases/download/v${version}/haskell-notebook-language-server-${version}-ghc8107-x86_64-linux.tar.gz";
         sha256 = "1ci6zgxd4wqr7y6cw1kyd7pl8ssqxx9wlkj4a3rm3jrpwbiigbqg";
       });
       "v90" = prebuilt (fetchzip {
-        url = "https://github.com/codedownio/haskell-notebook-language-server/releases/download/v0.3.0.0/haskell-notebook-language-server-0.3.0.0-ghc902-x86_64-linux.tar.gz";
+        url = "https://github.com/codedownio/haskell-notebook-language-server/releases/download/v${version}/haskell-notebook-language-server-${version}-ghc902-x86_64-linux.tar.gz";
         sha256 = "02pzx0zcfifngfah5dfw7k7wan3486gqcigd4a6xg2zfj794qsar";
       });
       "v92" = prebuilt (fetchzip {
-        url = "https://github.com/codedownio/haskell-notebook-language-server/releases/download/v0.3.0.0/haskell-notebook-language-server-0.3.0.0-ghc928-x86_64-linux.tar.gz";
+        url = "https://github.com/codedownio/haskell-notebook-language-server/releases/download/v${version}/haskell-notebook-language-server-${version}-ghc928-x86_64-linux.tar.gz";
         sha256 = "sha256-A3ZZqkrpypcn4UhhqCjtSLfNj9wemH58OSpiknrRl0Q=";
       });
       "v94" = prebuilt (fetchzip {
-        url = "https://github.com/codedownio/haskell-notebook-language-server/releases/download/v0.3.0.0/haskell-notebook-language-server-0.3.0.0-ghc948-x86_64-linux.tar.gz";
+        url = "https://github.com/codedownio/haskell-notebook-language-server/releases/download/v${version}/haskell-notebook-language-server-${version}-ghc948-x86_64-linux.tar.gz";
         sha256 = "sha256-Uj+V5HKA0QtRrc/jodMtmo+33TodX4LxuTwCRydAUME=";
       });
       "v96" = prebuilt (fetchzip {
-        url = "https://github.com/codedownio/haskell-notebook-language-server/releases/download/v0.3.0.0/haskell-notebook-language-server-0.3.0.0-ghc964-x86_64-linux.tar.gz";
+        url = "https://github.com/codedownio/haskell-notebook-language-server/releases/download/v${version}/haskell-notebook-language-server-${version}-ghc964-x86_64-linux.tar.gz";
         sha256 = "sha256-ITQNjAv03Mpaq99Hct1idkQzNITidcdtWbG1MSYbM7w=";
       });
       "v98" = prebuilt (fetchzip {
-        url = "https://github.com/codedownio/haskell-notebook-language-server/releases/download/v0.3.0.0/haskell-notebook-language-server-0.3.0.0-ghc982-x86_64-linux.tar.gz";
+        url = "https://github.com/codedownio/haskell-notebook-language-server/releases/download/v${version}/haskell-notebook-language-server-${version}-ghc982-x86_64-linux.tar.gz";
         sha256 = "sha256-jwJd8IQHIeAI5igX0eilu2e0mDyGn0qPhBf9qnTtbro=";
       });
     };

tests/app/Spec/Tests/Haskell/CodeActions.hs

@@ -4,29 +4,31 @@ module Spec.Tests.Haskell.CodeActions where
 import Control.Lens
 import Data.String.Interpolate
 import Data.Text
-import Language.LSP.Test hiding (message)
-import Language.LSP.Protocol.Types
 import Language.LSP.Protocol.Lens hiding (actions)
+import Language.LSP.Protocol.Types
+import Language.LSP.Test hiding (message)
 import Spec.Tests.Haskell.Common
 import Test.Sandwich as Sandwich
 import TestLib.LSP
+import UnliftIO.Timeout
 
 
 codeActionsTests :: (LspContext context m) => SpecFree context m ()
 codeActionsTests = describe "Code actions" $ do
   it "gets no code actions for putStrLn" $ doNotebookSession lsName codeActionsCode $ \filename -> do
     ident <- openDoc filename "haskell"
-    actions <- getCodeActions ident (Range (Position 1 0) (Position 1 8))
-    actions `shouldBe` []
+    actions <- timeout 60_000_000 $ getCodeActions ident (Range (Position 1 0) (Position 1 8))
+    actions `shouldBe` (Just [])
 
   it "gets code actions for foo" $ doNotebookSession lsName codeActionsCode $ \filename -> do
     ident <- openDoc filename "haskell"
-    actions <- getCodeActions ident (Range (Position 0 0) (Position 0 3))
-    fmap getTitle actions `shouldBe` ["Unfold foo"
-                                     , "Unfold foo in current file"
-                                     , "Fold foo"
-                                     , "Fold foo in current file"
-                                     ]
+    actions <- timeout 60_000_000 $ getCodeActions ident (Range (Position 0 0) (Position 0 3))
+    fmap (fmap getTitle) actions `shouldBe` (
+      Just ["Unfold foo"
+           , "Unfold foo in current file"
+           , "Fold foo"
+           , "Fold foo in current file"
+           ])
 
 getTitle :: (HasTitle a Text, HasTitle b Text) => (a |? b) -> Text
 getTitle (InL x) = x ^. title