Upgrade to haddock-library-1.11.0 (haskell#1126)

AliasQli · Aug 29, 2022 · 89ee349 · 89ee349
1 parent 4783ecb
commit 89ee349
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/hackage-server.cabal b/hackage-server.cabal
@@ -111,8 +111,8 @@ common defaults
     , process                >= 1.6   && < 1.7
     , text                  ^>= 1.2.5.0 || ^>= 2.0
     , time                   >= 1.9   && < 1.13
-    , transformers           >= 0.5   && < 0.7
-    , unix                   >= 2.7   && < 2.9
+    , transformers           >= 0.5   && < 0.6
+    , unix                   >= 2.7   && < 2.8
     , scientific
   -- other dependencies shared by most components
   build-depends:
@@ -399,7 +399,7 @@ library lib-server
         -- see https://github.com/haskell/hackage-server/issues/1130
         -- Thus, we need to include Cabal-syntax as dependency explicitly
     , hackage-security-HTTP ^>= 0.1.1
-    , haddock-library        >= 1.7.0 && < 1.11
+    , haddock-library       ^>= 1.11.0
         -- haddock-library-1.11.0 changed type of markupOrderedList
         -- see https://github.com/haskell/hackage-server/issues/1128
     , happstack-server      ^>= 7.7.1     || ^>= 7.8.0

diff --git a/src/Distribution/Server/Features/Search/ExtractDescriptionTerms.hs b/src/Distribution/Server/Features/Search/ExtractDescriptionTerms.hs
@@ -78,7 +78,7 @@ termsMarkup = Markup {
   markupBold          = id,
   markupMonospaced    = \s -> if length s > 1 then [] else s,
   markupUnorderedList = concat,
-  markupOrderedList   = concat,
+  markupOrderedList   = concat . map snd,
   markupDefList       = concatMap (\(d,t) -> d ++ t),
   markupCodeBlock     = const [],
   markupTable         = concat . F.toList,

diff --git a/src/Distribution/Server/Pages/Package/HaddockHtml.hs b/src/Distribution/Server/Pages/Package/HaddockHtml.hs
@@ -24,7 +24,7 @@ htmlMarkup modResolv = Markup {
   markupBold          = strong,
   markupMonospaced    = thecode,
   markupUnorderedList = unordList,
-  markupOrderedList   = ordList,
+  markupOrderedList   = ordList . map snd,
   markupDefList       = defList,
   markupCodeBlock     = pre,
   markupHyperlink     = \(Hyperlink url mLabel) -> anchor ! [href url] << maybe url showHtmlFragment mLabel,