aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fixing the merge due to new ghc version (9.4)Yuchen Pei2022-08-162-10/+11
|
* fixing a typo in the mergeYuchen Pei2022-08-161-2/+2
|
* Merge remote-tracking branch 'upstream/main'Yuchen Pei2022-08-1651-606/+552
|\
| * doc: Fix a few minor ReST issuesBen Gamari2022-08-152-3/+3
| | | | | | | | Sphinx was complaining about too-short title underlines.
| * html-test: Testsuite changes for GHC 9.4.1Ben Gamari2022-08-063-54/+220
| |
| * Merge pull request #1518 from bgamari/wip/ghc-9.4-mergeBen Gamari2022-08-0644-771/+574
| |\ | | | | | | Merge GHC 9.4 into `main`
| | * Bump the versionsHécate Moonlight2022-08-055-12/+12
| | |
| | * Clean up build and testsuite for GHC 9.4Ben Gamari2022-08-0511-256/+64
| | |
| | * Merge remote-tracking branch 'origin/ghc-9.4'Ben Gamari2022-08-0540-511/+506
| |/|
| | * Merge pull request #1516 from duog/9-4-backport-fix-hyperlinksHécate Moonlight2022-07-291-4/+13
| | |\ | | | | | | | | Backport 9-4: Fix hyperlinks to external items and modules (#1482)
| | | * Fix hyperlinks to external items and modules (#1482)Jade Lovelace2022-07-291-4/+13
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1481. There were two bugs in this: * We were assuming that we were always getting a relative path to the module in question, while Nix gives us file:// URLs sometimes. This change checks for those and stops prepending `..` to them. * We were not linking to the file under the module. This seems to have been a regression introduced by #977. That is, the URLs were going to something like file:///nix/store/3bwbsy0llxxn1pixx3ll02alln56ivxy-ghc-9.0.2-doc/share/doc/ghc/html/libraries/base-4.15.1.0/src which does not have the appropriate HTML file or fragment for the item in question at the end. There is a remaining instance of the latter bug, but not in the hyperlinker: the source links to items reexported from other modules are also not including the correct file name. e.g. the reexport of Entity in esqueleto, from persistent. NOTE: This needs to get tested with relative-path located modules. It seems correct for Nix based on my testing. Testing strategy: ``` nix-shell '<nixpkgs>' --pure -A haskell.packages.ghc922.aeson mkdir /tmp/aesonbuild && cd /tmp/aesonbuild export out=/tmp/aesonbuild/out genericBuild ln -sf $HOME/co/haddock/haddock-api/resources . ./Setup haddock --with-haddock=$HOME/path/to/haddock/exec --hyperlink-source ``` (cherry picked from commit ab53ccf089ea703b767581ac14be0f6c78a7678a)
| | * Update test outputBen Gamari2022-04-291-6/+2
| | |
| | * Bump base upper boundBen Gamari2022-04-291-1/+1
| | |
| | * Revert "HsToken ConDeclGADT con_dcolon"Ben Gamari2022-04-292-4/+1
| | | | | | | | | | | | This reverts commit 24208496649a02d5f87373052c430ea4a97842c5.
| | * Merge remote-tracking branch 'origin/ghc-head' into ghc-9.4Ben Gamari2022-04-2914-107/+110
| | |\
| | | * Merge commit '2627a86c' into ghc-headBen Gamari2022-04-280-0/+0
| | | |\
| | | | * Revert "Bump ghc-head (#1445)"Ben Gamari2022-04-284-26/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b29a78ef6926101338f62e84f456dac8659dc9d2. This should not have been merged.
| | | | * Bump ghc-head (#1445)Sylvain Henry2021-12-164-24/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update after NoExtCon -> DataConCantHappen rename * Update html-test for Data.List revert * Fix for new Plugins datatype Co-authored-by: Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io> Co-authored-by: Matthew Pickering <matthewtpickering@gmail.com>
| | | * | Bump ghc version to 9.5Ben Gamari2022-04-252-3/+3
| | | | |
| | | * | Merge remote-tracking branch 'upstream/ghc-9.2' into ghc-headBen Gamari2022-04-2511-106/+102
| | | |\ \
| | | * | | HsToken ConDeclGADT con_dcolonVladislav Zavialov2022-04-072-1/+4
| | | | | |
| | | * | | Rename [] to ListVladislav Zavialov2022-04-061-2/+6
| | | | | |
| | * | | | Update for GHC 9.4Ben Gamari2022-04-232-3/+3
| | |/ / /
| | * | | Add support for \cases Jakob Brünker2022-04-011-0/+1
| | | | | | | | | | | | | | | See merge request ghc/ghc!7873
| | * | | Keep track of promotion ticks in HsOpTysheaf2022-04-017-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | | Keeping track of promotion ticks in HsOpTy allows us to properly pretty-print promoted constructors such as lists.
| | * | | Merge branch 'wip/opaque_pragma' into 'ghc-head'Matthew Pickering2022-03-241-0/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add Haddock support for the OPAQUE pragma See merge request ghc/haddock!2
| | | * | | Add Haddock support for the OPAQUE pragmaChristiaan Baaij2022-03-161-0/+2
| | | | | |
| | * | | | Update test outputMatthew Pickering2022-03-221-1/+3
| | | | | |
| | * | | | Minimum changes needed for compilation with hi-haddockMatthew Pickering2022-03-227-53/+79
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | With hi-haddock, of course there is a much large refactoring of haddock which could be achieved but that is left for a future patch which can implemented at any time independently of GHC.
| | * | | Link to (~)Vladislav Zavialov2022-03-145-3/+14
| | | | |
| | * | | Fix CollectPass instance to match TTG refactorJohn Ericson2022-03-111-1/+3
| | | | | | | | | | | | | | | | | | | | Companion to GHC !7614 (https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7614)
| | * | | Remove use of ExtendedModSummaryMatthew Pickering2021-12-281-5/+5
| | | | |
| | * | | Fix for new Plugins datatypeSylvain Henry2021-12-171-6/+8
| | | | |
| | * | | Update html-test for Data.List revertMatthew Pickering2021-12-021-5/+5
| | | | |
| | * | | Update after NoExtCon -> DataConCantHappen renameKrzysztof Gogolewski2021-11-272-13/+13
| | | |/ | | |/|
| | * | Do not use forall as an identifierVladislav Zavialov2021-11-051-2/+2
| | | | | | | | | | | | | | | | See GHC ticket #20609
| | * | Update for changes in GHC for branchAlan Zimmerman2021-10-283-12/+12
| | | | | | | | | | | | | | | | wip/az/no-srcspan-anno-instances
| | * | Fix after PkgQual refactoring (#1429)Sylvain Henry2021-10-151-10/+7
| | | |
| | * | update haddockHypsrcTest for GHC MR !6705 (#1430)sheaf2021-10-153-0/+6
| | | |
| | * | Enable Haddock tests in GHC windows CI (#1428)wz10002021-10-116-21/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * testsuite: strip windows line endings for haddock * hyperlinker: Work around double escaping (#19236) * deterministic SCC
| | * | coot/multiple package (ghc-head) (#1419)Marcin Szamotulski2021-08-1617-118/+7059
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * FromJSON class Aeson style FromJSON class with Parsec based json parser. * doc-index.json file for multiple packages When creating haddock summary page for multiple packages render doc-index.json file using contents of all found 'doc-index.json' files. * Render doc-index.json When rendering html, render doc-index.json file independently of maybe_index_url option. doc-index.json file is useful now even if maybe_index_url is not `Nothing`. * base url option New `Flag_BaseURL` which configures from where static files are loaded (--base-url). If given and not equal "." static files are not coppied, as this indicates that they are not read from the the directory where we'd copy them. The default value is ".".
| | * | Merge pull request #1413 from adinapoli/wip/adinapoli-issue-19920Ben Gamari2021-07-071-2/+2
| | |\ \ | | | | | | | | | | Rename getErrorMessages Lexer import
| | | * | Rename getErrorMessages Lexer importAlfredo Di Napoli2021-07-051-2/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | This commit renames the Lexer import in `Hyperlinker.Parser` from `getErrorMessages` to `getPsErrorMessages` to eliminate the ambiguity with the `getErrorMessages` function defined in `GHC.Types.Error`.
| | * | Fix mkParserOpts (#1411)Sylvain Henry2021-06-282-5/+4
| | | |
| | * | HsToken in FunTy, RecConGADTVladislav Zavialov2021-06-108-26/+27
| | | |
| | * | Update Haddock Bug873 to account for renamingsheaf2021-06-021-3/+3
| | | |
| | * | Update CONTRIBUTING.md (#1403)Ben Simms2021-06-021-9/+6
| | | |
| | * | Update haddockHypSrc tests since we now compute slighly more type info (#1397)wz10002021-06-011-2/+8
| | | |
| | * | Adapt Haddock to Logger and Parser changes (#1399)Sylvain Henry2021-06-014-17/+19
| | | |
| | * | CI configuration for ghc-head (#1395)Ben Simms2021-05-286-16/+24
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 04:12:45 +0000