Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 Jul 2021 19:39:49 GMT
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 54b07c0cddfb - main - devel/hs-haskell-language-server: Update to 1.2.0
Message-ID:  <202107091939.169Jdn1B057862@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=54b07c0cddfb7d7555490889fc5caf38e721d064

commit 54b07c0cddfb7d7555490889fc5caf38e721d064
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2021-07-09 19:38:49 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2021-07-09 19:39:29 +0000

    devel/hs-haskell-language-server: Update to 1.2.0
---
 devel/hs-haskell-language-server/Makefile            | 16 +++++++++-------
 devel/hs-haskell-language-server/distinfo            | 18 +++++++++++-------
 .../patch-cabal.project.haskell-language-server      | 20 +++++++++++++++++---
 .../files/patch-ghcide_ghcide.cabal                  |  4 ++--
 .../files/patch-hls-test-utils_hls-test-utils.cabal  | 17 ++++++++---------
 5 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/devel/hs-haskell-language-server/Makefile b/devel/hs-haskell-language-server/Makefile
index 119ff433d7a2..f8a47d2312f2 100644
--- a/devel/hs-haskell-language-server/Makefile
+++ b/devel/hs-haskell-language-server/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	haskell-language-server
-DISTVERSION=	1.1.0
-PORTREVISION=	1
+DISTVERSION=	1.2.0
 CATEGORIES=	devel haskell
+EXTRACT_ONLY=	hsyl20-ghc-api-compat-8fee87eac97a538dbe81ff1ab18cff10f2f9fa15_GH0${EXTRACT_SUFX}
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	LSP provider implementation for Haskell language
@@ -14,6 +14,7 @@ USES=		cabal
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	haskell
+GH_TUPLE=	hsyl20:ghc-api-compat:8fee87eac97a538dbe81ff1ab18cff10f2f9fa15:ghcapicompat
 
 USE_CABAL=	Diff-0.4.0 \
 		Glob-0.10.1 \
@@ -30,7 +31,7 @@ USE_CABAL=	Diff-0.4.0 \
 		algebraic-graphs-0.5 \
 		ansi-terminal-0.10.3 \
 		ansi-wl-pprint-0.6.9_2 \
-		apply-refact-0.9.2.0 \
+		apply-refact-0.9.3.0 \
 		assoc-1.0.2_1 \
 		async-2.2.3 \
 		attoparsec-0.13.2.5_1 \
@@ -87,7 +88,7 @@ USE_CABAL=	Diff-0.4.0 \
 		fuzzy-0.1.0.0 \
 		generic-lens-2.1.0.0 \
 		generic-lens-core-2.1.0.0 \
-		ghc-check-0.5.0.3 \
+		ghc-check-0.5.0.5 \
 		ghc-exactprint-0.6.4 \
 		ghc-lib-parser-8.10.4.20210206 \
 		ghc-lib-parser-ex-8.10.0.19 \
@@ -109,6 +110,7 @@ USE_CABAL=	Diff-0.4.0 \
 		hsc2hs-0.68.7_1 \
 		hscolour-1.24.4 \
 		hslogger-1.3.1.0_2 \
+		hyphenation-0.8.2 \
 		implicit-hie-0.1.2.5 \
 		implicit-hie-cradle-0.3.0.2 \
 		indexed-profunctors-0.1 \
@@ -217,11 +219,11 @@ EXECUTABLES=		${PORTNAME} \
 
 NOT_FOR_ARCHS=		i386
 PLIST_FILES=		bin/${PORTNAME} \
-			bin/${PORTNAME}-8.10.4 \
+			bin/${PORTNAME}-8.10.5 \
 			bin/${PORTNAME}-wrapper
 
 post-extract:
-	${CP} ${WRKSRC}/stack-8.10.4.yaml ${WRKSRC}/stack-8.10.5.yaml
+	${MV} ${WRKDIR}/ghc-api-compat-8fee87eac97a538dbe81ff1ab18cff10f2f9fa15 ${WRKSRC}/ghc-api-compat
 
 do-build:
 	cd ${WRKSRC} && \
@@ -231,7 +233,7 @@ do-install:
 .for exe in ${EXECUTABLES}
 	${INSTALL_PROGRAM} ${CABAL_HOME}/.cabal/bin/${exe} ${STAGEDIR}${PREFIX}/bin
 .endfor
-	${LN} -s ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-8.10.4
+	${LN} -s ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-8.10.5
 
 cabal-extract-deps:
 	cd ${WRKSRC} && \
diff --git a/devel/hs-haskell-language-server/distinfo b/devel/hs-haskell-language-server/distinfo
index 45c1032c1c25..d5ed11916f38 100644
--- a/devel/hs-haskell-language-server/distinfo
+++ b/devel/hs-haskell-language-server/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1618388042
+TIMESTAMP = 1625858598
 SHA256 (cabal/Diff-0.4.0/Diff-0.4.0.tar.gz) = 7290ac098ad8b4748b9c10e494cc85ba54af688226ae69a465aa7b4c73f149c7
 SIZE (cabal/Diff-0.4.0/Diff-0.4.0.tar.gz) = 8065
 SHA256 (cabal/Glob-0.10.1/Glob-0.10.1.tar.gz) = cae4476d944947010705e0b00cf3e36c90ef407f968861f6771b931056b6d315
@@ -41,8 +41,8 @@ SHA256 (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = a7b2e8e7cd3f02
 SIZE (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = 16723
 SHA256 (cabal/ansi-wl-pprint-0.6.9/revision/2.cabal) = 20d30674f137d43aa0279c2c2cc5e45a5f1c3c57e301852494906158b6313bf7
 SIZE (cabal/ansi-wl-pprint-0.6.9/revision/2.cabal) = 2388
-SHA256 (cabal/apply-refact-0.9.2.0/apply-refact-0.9.2.0.tar.gz) = 9d517260cf0941a4a85f2c8e398405857ab04bd09a1ff2c6f23c946768730ac8
-SIZE (cabal/apply-refact-0.9.2.0/apply-refact-0.9.2.0.tar.gz) = 72214
+SHA256 (cabal/apply-refact-0.9.3.0/apply-refact-0.9.3.0.tar.gz) = fcd4b5d271330c6a023d68ed62e8cfdfdc1883313591e9df23aaa3aec379c5ea
+SIZE (cabal/apply-refact-0.9.3.0/apply-refact-0.9.3.0.tar.gz) = 73439
 SHA256 (cabal/assoc-1.0.2/assoc-1.0.2.tar.gz) = d8988dc6e8718c7a3456515b769c9336aeeec730cf86fc5175247969ff8f144f
 SIZE (cabal/assoc-1.0.2/assoc-1.0.2.tar.gz) = 3047
 SHA256 (cabal/assoc-1.0.2/revision/1.cabal) = a824e4f615469a27ad949dbf4907ba258bd6b459deebec00524c7bcb3f65cc9f
@@ -173,8 +173,8 @@ SHA256 (cabal/generic-lens-2.1.0.0/generic-lens-2.1.0.0.tar.gz) = cd4df37fc20910
 SIZE (cabal/generic-lens-2.1.0.0/generic-lens-2.1.0.0.tar.gz) = 21104
 SHA256 (cabal/generic-lens-core-2.1.0.0/generic-lens-core-2.1.0.0.tar.gz) = 6584476b6974f887ba3e2bff26bc73121d16836ed92cfcea22421d776c164749
 SIZE (cabal/generic-lens-core-2.1.0.0/generic-lens-core-2.1.0.0.tar.gz) = 21386
-SHA256 (cabal/ghc-check-0.5.0.3/ghc-check-0.5.0.3.tar.gz) = 56fa5e636629dbb393c431b4f34d2ce475fa2056f80f0fd7f9fa9b2434a63033
-SIZE (cabal/ghc-check-0.5.0.3/ghc-check-0.5.0.3.tar.gz) = 6309
+SHA256 (cabal/ghc-check-0.5.0.5/ghc-check-0.5.0.5.tar.gz) = 5153a9a1312613dda2fa735d7e58b3ab9792b143d09122792322267172da8556
+SIZE (cabal/ghc-check-0.5.0.5/ghc-check-0.5.0.5.tar.gz) = 7042
 SHA256 (cabal/ghc-exactprint-0.6.4/ghc-exactprint-0.6.4.tar.gz) = fc3e5a5b01b92a8b8cd790d71fe73f24922110ac1d0a50c5bfa40993d457cb28
 SIZE (cabal/ghc-exactprint-0.6.4/ghc-exactprint-0.6.4.tar.gz) = 539141
 SHA256 (cabal/ghc-lib-parser-8.10.4.20210206/ghc-lib-parser-8.10.4.20210206.tar.gz) = e28ad49b33bc7ae90e994f1f5e37639197911a7c56b93667a083fc0e8f91431e
@@ -223,6 +223,8 @@ SHA256 (cabal/hslogger-1.3.1.0/hslogger-1.3.1.0.tar.gz) = 7f2364f6c0b9c5b85a2572
 SIZE (cabal/hslogger-1.3.1.0/hslogger-1.3.1.0.tar.gz) = 37468
 SHA256 (cabal/hslogger-1.3.1.0/revision/2.cabal) = 3cd5954dc9e8fe26bbaea0fa6c141008110c46bdda6b5bf3f67081be560e7bae
 SIZE (cabal/hslogger-1.3.1.0/revision/2.cabal) = 2899
+SHA256 (cabal/hyphenation-0.8.2/hyphenation-0.8.2.tar.gz) = 1e18152bcdc0a6bc8dc9f39c9085ad773b2b263f486a23b8d9e9b194da046314
+SIZE (cabal/hyphenation-0.8.2/hyphenation-0.8.2.tar.gz) = 1048466
 SHA256 (cabal/implicit-hie-0.1.2.5/implicit-hie-0.1.2.5.tar.gz) = 0ede4a0681f116efe5a34a2a90b09c5cc195ec802b8d4d0304823f34dad2f649
 SIZE (cabal/implicit-hie-0.1.2.5/implicit-hie-0.1.2.5.tar.gz) = 9460
 SHA256 (cabal/implicit-hie-cradle-0.3.0.2/implicit-hie-cradle-0.3.0.2.tar.gz) = 30921016e795001006fbdcbca3dc6601bc0a9f8f3c623dd99dbfa48b9f8eb7a0
@@ -465,5 +467,7 @@ SHA256 (cabal/yaml-0.11.5.0/yaml-0.11.5.0.tar.gz) = b28e748bd69948cb1b43694d4d7c
 SIZE (cabal/yaml-0.11.5.0/yaml-0.11.5.0.tar.gz) = 30049
 SHA256 (cabal/zlib-0.6.2.3/zlib-0.6.2.3.tar.gz) = 807f6bddf9cb3c517ce5757d991dde3c7e319953a22c86ee03d74534bd5abc88
 SIZE (cabal/zlib-0.6.2.3/zlib-0.6.2.3.tar.gz) = 149186
-SHA256 (cabal/haskell-haskell-language-server-1.1.0_GH0.tar.gz) = 1d2bab12dcf6ef5f14fe4159e2d1f76b00de75fa9af51846b7ad861fa1daadb2
-SIZE (cabal/haskell-haskell-language-server-1.1.0_GH0.tar.gz) = 1194891
+SHA256 (cabal/haskell-haskell-language-server-1.2.0_GH0.tar.gz) = 8931fd95bf28300d3f18675b0f03aac9bda172becb67eaa8ef1f62e6d1c6238e
+SIZE (cabal/haskell-haskell-language-server-1.2.0_GH0.tar.gz) = 1268563
+SHA256 (cabal/hsyl20-ghc-api-compat-8fee87eac97a538dbe81ff1ab18cff10f2f9fa15_GH0.tar.gz) = 6672cc7f795b8a5ee43efaf20ea30b6f234e1de4978164375a07c8d13064c366
+SIZE (cabal/hsyl20-ghc-api-compat-8fee87eac97a538dbe81ff1ab18cff10f2f9fa15_GH0.tar.gz) = 6806
diff --git a/devel/hs-haskell-language-server/files/patch-cabal.project.haskell-language-server b/devel/hs-haskell-language-server/files/patch-cabal.project.haskell-language-server
index 96f8458a3c07..1d8ad6d815fa 100644
--- a/devel/hs-haskell-language-server/files/patch-cabal.project.haskell-language-server
+++ b/devel/hs-haskell-language-server/files/patch-cabal.project.haskell-language-server
@@ -1,10 +1,24 @@
---- cabal.project.haskell-language-server.orig	2021-04-13 07:56:15 UTC
+--- cabal.project.haskell-language-server.orig	2021-06-13 09:19:43 UTC
 +++ cabal.project.haskell-language-server
-@@ -1,7 +1,6 @@
+@@ -1,7 +1,7 @@
  packages:
           ./
++         ./ghc-api-compat
           ./hie-compat
 -         ./shake-bench
+          ./hls-graph
           ./ghcide
           ./hls-plugin-api
-          ./hls-test-utils
+@@ -27,12 +27,6 @@ tests: true
+ package *
+   ghc-options: -haddock
+   test-show-details: direct
+-
+--- ghc-api-compat-8.6
+-source-repository-package
+-  type: git
+-  location: https://github.com/hsyl20/ghc-api-compat
+-  tag: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
+ 
+ write-ghc-environment-files: never
+ 
diff --git a/devel/hs-haskell-language-server/files/patch-ghcide_ghcide.cabal b/devel/hs-haskell-language-server/files/patch-ghcide_ghcide.cabal
index c207faf65d5f..d47ff487edda 100644
--- a/devel/hs-haskell-language-server/files/patch-ghcide_ghcide.cabal
+++ b/devel/hs-haskell-language-server/files/patch-ghcide_ghcide.cabal
@@ -1,6 +1,6 @@
---- ghcide/ghcide.cabal.orig	2021-04-13 07:56:15 UTC
+--- ghcide/ghcide.cabal.orig	2021-06-13 09:19:43 UTC
 +++ ghcide/ghcide.cabal
-@@ -405,7 +405,6 @@ executable ghcide-bench
+@@ -403,7 +403,6 @@ executable ghcide-bench
          extra,
          filepath,
          ghcide,
diff --git a/devel/hs-haskell-language-server/files/patch-hls-test-utils_hls-test-utils.cabal b/devel/hs-haskell-language-server/files/patch-hls-test-utils_hls-test-utils.cabal
index 59cb39cc2f65..adfc0c166c69 100644
--- a/devel/hs-haskell-language-server/files/patch-hls-test-utils_hls-test-utils.cabal
+++ b/devel/hs-haskell-language-server/files/patch-hls-test-utils_hls-test-utils.cabal
@@ -1,24 +1,23 @@
---- hls-test-utils/hls-test-utils.cabal.orig	2021-04-13 07:56:15 UTC
+--- hls-test-utils/hls-test-utils.cabal.orig	2021-06-13 09:19:43 UTC
 +++ hls-test-utils/hls-test-utils.cabal
-@@ -36,7 +36,6 @@ library
+@@ -34,7 +34,6 @@ library
      , aeson
      , async
-     , base
+     , base                    >=4.12 && <5
 -    , blaze-markup
      , bytestring
      , containers
      , data-default
-@@ -45,18 +44,10 @@ library
-     , filepath
-     , ghcide                  ^>=1.2.0.2
-     , hls-plugin-api          ^>=1.1.0.0
--    , hspec
+@@ -44,17 +43,9 @@ library
+     , ghcide                  ^>=1.4
+     , hls-graph
+     , hls-plugin-api          ^>=1.1
+-    , hspec                   <2.8
 -    , hspec-core
      , lens
      , lsp                     ^>=1.2
 -    , lsp-test                ==0.14.0.0
      , lsp-types               ^>=1.2
-     , shake
 -    , tasty
 -    , tasty-expected-failure
 -    , tasty-golden



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107091939.169Jdn1B057862>