Skip to content

Upgrade to haddock-library-1.11.0 #1126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 26, 2022
Merged

Upgrade to haddock-library-1.11.0 #1126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1d7e39
update dep
AliasQli Aug 19, 2022
3ac0f69
use Cabal 3.6
AliasQli Aug 22, 2022
f730854
Merge into dep-update; restrict dep version
AliasQli Aug 24, 2022
7490f70
restrict version bounds
AliasQli Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions hackage-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't include untested major versions bump.

Copy link
Contributor Author

@AliasQli AliasQli Aug 26, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

transformers 0.5.* is tested while 0.6.* is not, and so is unix. So I tightened the version bounds. What's the problem?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did it because you mentioned it here. Did I misunderstand what you mean?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I confused this (I wasn't expecting these bounds already on master). All is well.

, scientific
-- other dependencies shared by most components
build-depends:
Expand Down Expand Up @@ -398,7 +398,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
Expand Down
2 changes: 1 addition & 1 deletion src/Distribution/Server/Features/Search/ExtractDescriptionTerms.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/Distribution/Server/Pages/Package/HaddockHtml.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down