[arch-commits] Commit in haskell-ghcide/trunk (PKGBUILD haddock-library-1.10.patch)
Felix Yan
felixonmars at archlinux.org
Mon May 10 20:14:25 UTC 2021
Date: Monday, May 10, 2021 @ 20:14:24
Author: felixonmars
Revision: 929620
upgpkg: haskell-ghcide 1.2.0-1
Modified:
haskell-ghcide/trunk/PKGBUILD
Deleted:
haskell-ghcide/trunk/haddock-library-1.10.patch
----------------------------+
PKGBUILD | 45 ++++++++++++++++++----------------------
haddock-library-1.10.patch | 48 -------------------------------------------
2 files changed, 21 insertions(+), 72 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-10 20:09:29 UTC (rev 929619)
+++ PKGBUILD 2021-05-10 20:14:24 UTC (rev 929620)
@@ -2,27 +2,28 @@
_hkgname=ghcide
pkgname=haskell-ghcide
-pkgver=1.1.0
-pkgrel=35
+pkgver=1.2.0
+pkgrel=1
pkgdesc="The core of an IDE"
-url="https://github.com/haskell/ghcide#readme"
+url="https://github.com/haskell/haskell-language-server/tree/master/ghcide#readme"
license=("Apache")
arch=('x86_64')
-depends=('ghc-libs' 'haskell-diff' 'haskell-glob' 'haskell-aeson' 'haskell-async'
- 'haskell-base16-bytestring' 'haskell-bytestring-encoding' 'haskell-case-insensitive'
- 'haskell-cryptohash-sha1' 'haskell-data-default' 'haskell-dependent-map'
- 'haskell-dependent-sum' 'haskell-dlist' 'haskell-extra' 'haskell-fingertree'
- 'haskell-fuzzy' 'haskell-ghc' 'haskell-ghc-check' 'haskell-ghc-exactprint'
- 'haskell-ghc-paths' 'haskell-gitrev' 'haskell-haddock-library' 'haskell-hashable'
- 'haskell-heapsize' 'haskell-hie-bios' 'haskell-hie-compat' 'haskell-hiedb'
- 'haskell-hls-plugin-api' 'haskell-hslogger' 'haskell-implicit-hie-cradle' 'haskell-lens'
- 'haskell-lsp' 'haskell-lsp-test' 'haskell-lsp-types' 'haskell-network-uri'
- 'haskell-opentelemetry' 'haskell-optparse-applicative' 'haskell-parallel'
- 'haskell-prettyprinter' 'haskell-prettyprinter-ansi-terminal' 'haskell-regex-tdfa'
- 'haskell-retrie' 'haskell-rope-utf16-splay' 'haskell-safe' 'haskell-safe-exceptions'
- 'haskell-shake' 'haskell-sorted-list' 'haskell-sqlite-simple' 'haskell-syb'
- 'haskell-unliftio' 'haskell-unliftio-core' 'haskell-unordered-containers'
- 'haskell-utf8-string' 'haskell-vector')
+depends=('ghc-libs' 'haskell-diff' 'haskell-glob' 'haskell-aeson' 'haskell-aeson-pretty'
+ 'haskell-async' 'haskell-base16-bytestring' 'haskell-bytestring-encoding'
+ 'haskell-case-insensitive' 'haskell-cryptohash-sha1' 'haskell-data-default'
+ 'haskell-dependent-map' 'haskell-dependent-sum' 'haskell-dlist' 'haskell-extra'
+ 'haskell-fingertree' 'haskell-fuzzy' 'haskell-ghc' 'haskell-ghc-check'
+ 'haskell-ghc-exactprint' 'haskell-ghc-paths' 'haskell-ghc-trace-events' 'haskell-gitrev'
+ 'haskell-haddock-library' 'haskell-hashable' 'haskell-heapsize' 'haskell-hie-bios'
+ 'haskell-hie-compat' 'haskell-hiedb' 'haskell-hls-plugin-api' 'haskell-hslogger'
+ 'haskell-implicit-hie-cradle' 'haskell-lens' 'haskell-lsp' 'haskell-lsp-test'
+ 'haskell-lsp-types' 'haskell-network-uri' 'haskell-opentelemetry'
+ 'haskell-optparse-applicative' 'haskell-parallel' 'haskell-prettyprinter'
+ 'haskell-prettyprinter-ansi-terminal' 'haskell-regex-tdfa' 'haskell-retrie'
+ 'haskell-rope-utf16-splay' 'haskell-safe' 'haskell-safe-exceptions' 'haskell-shake'
+ 'haskell-sorted-list' 'haskell-sqlite-simple' 'haskell-syb' 'haskell-unliftio'
+ 'haskell-unliftio-core' 'haskell-unordered-containers' 'haskell-utf8-string'
+ 'haskell-vector')
makedepends=('ghc' 'uusi' 'haskell-quickcheck' 'haskell-ghc-typelits-knownnat'
'haskell-implicit-hie' 'haskell-quickcheck-instances' 'haskell-record-dot-preprocessor'
'haskell-record-hasfield' 'haskell-tasty' 'haskell-tasty-expected-failure'
@@ -30,16 +31,12 @@
checkdepends=('cabal-install')
# Hackage tarball is missing test data
#source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz")
-source=("https://github.com/haskell/haskell-language-server/archive/$_hkgname-v$pkgver.tar.gz"
- haddock-library-1.10.patch)
-sha256sums=('ec611943b46027488d85135eb61245ea7cbd892ed9825b1456a4b74e0eb5a713'
- 'ba4114432e733398750247c26486c26c301b3d9fd76066ef8606b8a05d60e33e')
+source=("https://github.com/haskell/haskell-language-server/archive/$_hkgname-v$pkgver.tar.gz")
+sha512sums=('500ce0affdf9f8fffd10064308a42789bc138320cc3f10e444ba438efb699ea959b73550a306398d5aeeaf9725538b477a8723d78f1dbf5111c4e59fadd7d2d7')
prepare() {
cd haskell-language-server-$_hkgname-v$pkgver/$_hkgname
- patch -p2 -i ../../haddock-library-1.10.patch
gen-setup
- uusi -u base16-bytestring $_hkgname.cabal
find test/data -name \*.cabal -exec uusi --add-options-all=-dynamic {} \;
# TODO: Skipped some broken tests for now
Deleted: haddock-library-1.10.patch
===================================================================
--- haddock-library-1.10.patch 2021-05-10 20:09:29 UTC (rev 929619)
+++ haddock-library-1.10.patch 2021-05-10 20:14:24 UTC (rev 929620)
@@ -1,48 +0,0 @@
-From 217f01fcec49c35acf73c90f5ade0e5273ace055 Mon Sep 17 00:00:00 2001
-From: Potato Hatsue <1793913507 at qq.com>
-Date: Sat, 20 Mar 2021 00:35:49 +0800
-Subject: [PATCH 1/2] Bump haddock-library to 1.10.0
-
----
- ghcide/ghcide.cabal | 2 +-
- ghcide/src/Development/IDE/Spans/Common.hs | 9 ++++++++-
- stack-8.6.4.yaml | 2 +-
- stack-8.6.5.yaml | 2 +-
- stack-8.8.2.yaml | 2 +-
- stack.yaml | 2 +-
- 6 files changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal
-index 50e829612..499ba86ac 100644
---- a/ghcide/ghcide.cabal
-+++ b/ghcide/ghcide.cabal
-@@ -55,7 +55,7 @@ library
- fingertree,
- ghc-exactprint,
- Glob,
-- haddock-library >= 1.8 && < 1.10,
-+ haddock-library ^>= 1.10.0,
- hashable,
- hie-compat ^>= 0.1.0.0,
- hls-plugin-api ^>= 1.0.0.0,
-diff --git a/ghcide/src/Development/IDE/Spans/Common.hs b/ghcide/src/Development/IDE/Spans/Common.hs
-index d03e81c97..8e6c06680 100644
---- a/ghcide/src/Development/IDE/Spans/Common.hs
-+++ b/ghcide/src/Development/IDE/Spans/Common.hs
-@@ -121,8 +121,15 @@ haddockToMarkdown (H.DocIdentifier i)
- = "`" ++ i ++ "`"
- haddockToMarkdown (H.DocIdentifierUnchecked i)
- = "`" ++ i ++ "`"
--haddockToMarkdown (H.DocModule i)
-+haddockToMarkdown (H.DocModule (H.ModLink i Nothing))
- = "`" ++ escapeBackticks i ++ "`"
-+-- See https://github.com/haskell/haddock/pull/1315
-+-- Module references can be labeled in markdown style, e.g. [some label]("Some.Module")
-+-- However, we don't want to use the link markup here, since the module name would be covered
-+-- up by the label. Thus, we keep both the label and module name in the following style:
-+-- some label ( `Some.Module` )
-+haddockToMarkdown (H.DocModule (H.ModLink i (Just label)))
-+ = haddockToMarkdown label ++ " ( `" ++ escapeBackticks i ++ "` )"
- haddockToMarkdown (H.DocWarning w)
- = haddockToMarkdown w
- haddockToMarkdown (H.DocEmphasis d)
More information about the arch-commits
mailing list