Merge pull request #151 from phadej/release-preparations

Release preparation
phadej · Apr 14, 2024 · f487e29 · f487e29
2 parents 648c338 + e138a72
commit f487e29
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/cabal-docspec/.gitignore b/cabal-docspec/.gitignore
@@ -1,2 +1,3 @@
 # "releases"
 cabal-docspec-*.xz
+cabal-docspec-*.SHA256SUM
diff --git a/cabal-docspec/Makefile b/cabal-docspec/Makefile
@@ -8,24 +8,24 @@ cabal-docspec.1 : MANUAL.md
 man : cabal-docspec.1
 	cat cabal-docspec.1 | man -l -
 
+ALPINEVERSION:=3.17.3
+GHCUPVERSION:=0.1.22.0
+GHCVERSION:=9.8.2
+CABALVERSION:=3.10.3.0
+
 CABALPLAN:=$(HOME)/.local/bin/cabal-plan
 CABAL:=$(HOME)/.ghcup/bin/cabal
-GHC:=$(HOME)/.ghcup/bin/ghc-9.2.7
+GHC:=$(HOME)/.ghcup/bin/ghc-$(GHCVERSION)
 GHCUP:=$(HOME)/.ghcup/bin/ghcup
 
-ALPINEVERSION:=3.17.3
-GHCUPVERSION:=0.1.19.2
-GHCVERSION:=9.2.7
-CABALVERSION:=3.10.1.0
-
 # docker run -ti -v $(dirname $(pwd)):/src alpine:3.17.3
 # cd /src/cabal-docspec
 # apk add make
 # make alpine-release
 #
 .PHONY: alpine-release
 alpine-release :
-	apk add binutils-gold curl gcc git gmp-dev libc-dev libffi-dev make musl-dev ncurses-dev openssh-client perl tar tmux vim xz zlib-dev zlib-static
+	apk add binutils-gold curl gcc g++ git gmp-dev libc-dev libffi-dev make musl-dev ncurses-dev openssh-client perl tar tmux vim xz xz-dev zlib-dev zlib-static
 	mkdir -p $(HOME)/.local/bin
 	curl -L https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz | xz -d > $(CABALPLAN)
 	chmod a+x $(CABALPLAN)

diff --git a/cabal-docspec/src/CabalDocspec/Diff.hs b/cabal-docspec/src/CabalDocspec/Diff.hs
@@ -163,8 +163,10 @@ instance Ord LR where
 -- |
 --
 -- >>> diffLines [Exact (map Exact "foo")] ["boo"]
+-- (1 % 3,DiffChunk [Emph "f" (Norm "oo" Empty)] [Emph "b" (Norm "oo" Empty)] DiffEmpty)
 --
 -- >>> diffLines [Exact (map Exact "boo")] ["boo"]
+-- (0 % 1,DiffSame ["boo"] DiffEmpty)
 --
 diffLines :: [Wild [Wild Char]] -> [String] -> (Rational, Diff)
 diffLines xs ys = case cached 0 0 of

diff --git a/cabal-docspec/src/CabalDocspec/Main.hs b/cabal-docspec/src/CabalDocspec/Main.hs
@@ -507,7 +507,7 @@ filterExpressionD orig@(L l (Property s)) =
 -- Otherwise
 --
 -- @
--- >>> :{
+-- ghci> :{
 -- x = 1
 --
 -- y = 2
-Original file line number
+Diff line change
@@ Expand Up / @@ -507,7 +507,7 @@ filterExpressionD orig@(L l (Property s)) = @@
     -- Otherwise
     --
     -- @
-    -- >>> :{
+    -- ghci> :{
     -- x = 1
     --
     -- y = 2
@@ Expand Down @@