fix: Update CI lsp versions

lsp 2.x needs 'row-types'
dhall-lang · Dec 25, 2023 · 4c0b92f · 4c0b92f
1 parent 80acebf
commit 4c0b92f
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 21 deletions.
diff --git a/nix/packages/lsp-types.nix b/nix/packages/lsp-types.nix
@@ -1,24 +1,31 @@
 { mkDerivation, aeson, base, binary, containers, data-default
-, deepseq, Diff, dlist, exceptions, filepath, hashable, hspec
-, hspec-discover, lens, lib, mod, mtl, network-uri, QuickCheck
-, quickcheck-instances, safe, scientific, some, template-haskell
-, text, tuple, unordered-containers
+, deepseq, Diff, directory, dlist, exceptions, file-embed, filepath
+, hashable, hspec, hspec-discover, lens, lib, mod, mtl, network-uri
+, prettyprinter, QuickCheck, quickcheck-instances, regex, row-types
+, safe, some, template-haskell, text, unordered-containers
 }:
 mkDerivation {
   pname = "lsp-types";
-  version = "1.6.0.1";
-  sha256 = "47d084f3a56195706381b51ad2f5d1b22a958238f3e5519625dbc54a2503f670";
+  version = "2.0.1.0";
+  sha256 = "57406c159d14aa30b3d8e5f48ca713186b340f668c93e940e884387fe561ffe0";
+  isLibrary = true;
+  isExecutable = true;
   libraryHaskellDepends = [
     aeson base binary containers data-default deepseq Diff dlist
-    exceptions filepath hashable lens mod mtl network-uri safe
-    scientific some template-haskell text unordered-containers
+    exceptions file-embed filepath hashable lens mod mtl network-uri
+    row-types safe some template-haskell text unordered-containers
+  ];
+  executableHaskellDepends = [
+    base containers directory filepath mtl prettyprinter regex text
   ];
   testHaskellDepends = [
     aeson base filepath hspec lens network-uri QuickCheck
-    quickcheck-instances text tuple
+    quickcheck-instances row-types text
   ];
   testToolDepends = [ hspec-discover ];
+  doHaddock = false;
   homepage = "https://github.com/haskell/lsp";
   description = "Haskell library for the Microsoft Language Server Protocol, data types";
   license = lib.licenses.mit;
+  mainProgram = "generator";
 }
diff --git a/nix/packages/lsp.nix b/nix/packages/lsp.nix
@@ -1,24 +1,24 @@
 { mkDerivation, aeson, async, attoparsec, base, bytestring
 , co-log-core, containers, data-default, directory, exceptions
 , filepath, hashable, hspec, hspec-discover, lens, lib, lsp-types
-, mtl, prettyprinter, random, sorted-list, stm, temporary, text
-, text-rope, transformers, unliftio-core, unordered-containers
-, uuid
+, mtl, prettyprinter, random, row-types, sorted-list, stm
+, temporary, text, text-rope, transformers, unliftio-core
+, unordered-containers, uuid
 }:
 mkDerivation {
   pname = "lsp";
-  version = "1.6.0.0";
-  sha256 = "896803766e8ceabeacc72743f4b92cf7766b2a1f09be270b29d0a39692b00470";
+  version = "2.1.0.0";
+  sha256 = "c8a7a2b82d074641c77894639bdd5aacae5046610ee8d6b8a74b0cf71c4af30d";
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
     aeson async attoparsec base bytestring co-log-core containers
     data-default directory exceptions filepath hashable lens lsp-types
-    mtl prettyprinter random sorted-list stm temporary text text-rope
-    transformers unliftio-core unordered-containers uuid
+    mtl prettyprinter random row-types sorted-list stm temporary text
+    text-rope transformers unliftio-core unordered-containers uuid
   ];
   testHaskellDepends = [
-    base containers hspec sorted-list text text-rope
+    base containers hspec row-types sorted-list text text-rope
     unordered-containers
   ];
   testToolDepends = [ hspec-discover ];

diff --git a/stack.ghc-8.10.yaml b/stack.ghc-8.10.yaml
@@ -12,14 +12,16 @@ packages:
   - dhall-yaml
 extra-deps:
   - co-log-core-0.3.2.0
+  - hashable-1.3.5.0@sha256:3a2beeafb220f9de706568a7e4a5b3c762cc4c9f25c94d7ef795b8c2d6a691d7,4240
   - hnix-0.16.0
   - hnix-store-core-0.5.0.0
   - hnix-store-remote-0.5.0.0
-  - lsp-1.5.0.0
-  - lsp-types-1.5.0.0
-  - lsp-test-0.14.1.0
+  - lsp-2.1.0.0
+  - lsp-types-2.0.1.0
+  - lsp-test-0.15.0.1
   - lucid-2.11.0
   - relude-1.0.0.1@sha256:35bcdaf14018e79f11e712b0e2314c1aac79976f28f4adc179985457493557d5,11569
+  - row-types-1.0.1.2@sha256:4d4c7cb95d06a32b28ba977852d52a26b4c1f695ef083a6fd874ab6d79933b64,3071
   - semialign-1.2@sha256:9afb6eb7e50db7ca34d7c4108aec0f643dae2caaaa80394b44ffdd643315685c,2721
   - text-rope-0.2
   - typerep-map-0.5.0.0

diff --git a/stack.ghc-9.2.yaml b/stack.ghc-9.2.yaml
@@ -18,8 +18,11 @@ extra-deps:
   - hnix-store-core-0.6.1.0
   - hnix-store-remote-0.6.0.0
   - logict-0.7.0.3
-  - lsp-test-0.14.1.0
+  - lsp-2.1.0.0
+  - lsp-types-2.0.1.0
+  - lsp-test-0.15.0.1
   - optparse-applicative-0.16.1.0
+  - row-types-1.0.1.2@sha256:4d4c7cb95d06a32b28ba977852d52a26b4c1f695ef083a6fd874ab6d79933b64,3071
   - saltine-0.2.1.0
   - tomland-1.3.3.2
   - typerep-map-0.5.0.0