diff --git a/utils/haddock/README.md b/utils/haddock/README.md index 530e752d525b5ed0eb3d7acf7f828fdbca03e934..683f56cd3c09bf715feed6530ff60e6a4491ce70 100644 --- a/utils/haddock/README.md +++ b/utils/haddock/README.md @@ -1,4 +1,4 @@ -# Haddock [![CI][CI badge]][CI page] [![Hackage][Hackage badge]][Hackage page] +# Haddock [![Hackage][Hackage badge]][Hackage page] Haddock is the standard tool for generating documentation from Haskell code. Full documentation about Haddock itself can be found in the `doc/` subdirectory, @@ -25,8 +25,6 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) to see how to make contributions to the project. -[CI page]: https://github.com/haskell/haddock/actions/workflows/ci.yml -[CI badge]: https://github.com/haskell/haddock/actions/workflows/ci.yml/badge.svg [Hackage page]: https://hackage.haskell.org/package/haddock [Hackage badge]: https://img.shields.io/hackage/v/haddock.svg [reST]: https://www.sphinx-doc.org/en/master/usage/restructuredtext/index.html diff --git a/utils/haddock/doc/intro.rst b/utils/haddock/doc/intro.rst index 1f4234cbe7b7c1f565fd4ef7e12980d3008b9469..3c856bc59d387bc2433148b0356b0eda7e65f9e9 100644 --- a/utils/haddock/doc/intro.rst +++ b/utils/haddock/doc/intro.rst @@ -62,9 +62,7 @@ Obtaining Haddock Haddock is distributed with GHC distributions, and will automatically be provided if you use `ghcup <https://www.haskell.org/ghcup>`__, for instance. -Up-to-date sources can also be obtained from our public GitHub -repository. The Haddock sources are at -``https://github.com/haskell/haddock``. +Haddock lives in the GHC repository, which you can consult at ``https://gitlab.haskell.org/ghc/ghc``. License ------- @@ -99,12 +97,6 @@ code, except where otherwise indicated. (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Contributors ------------- - -A list of contributors to the project can be seen at -``https://github.com/haskell/haddock/graphs/contributors``. - Acknowledgements ---------------- diff --git a/utils/haddock/haddock-api/haddock-api.cabal b/utils/haddock/haddock-api/haddock-api.cabal index f332a34c4b97bd338e3513bf40739ed1be44d6f6..04b0d7fb7467ca1b9c05da4b375f9220d8246c57 100644 --- a/utils/haddock/haddock-api/haddock-api.cabal +++ b/utils/haddock/haddock-api/haddock-api.cabal @@ -7,13 +7,12 @@ description: Haddock is a documentation-generation tool for Haskell license: BSD-2-Clause license-file: LICENSE author: Simon Marlow, David Waern -maintainer: Alec Theriault <alec.theriault@gmail.com>, Alex Biehl <alexbiehl@gmail.com>, Simon Hengel <sol@typeful.net>, Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> +maintainer: Haddock Team homepage: http://www.haskell.org/haddock/ -bug-reports: https://github.com/haskell/haddock/issues +bug-reports: https://gitlab.haskell.org/ghc/ghc/-/issues/new copyright: (c) Simon Marlow, David Waern category: Documentation build-type: Simple -tested-with: GHC==9.6.* extra-source-files: CHANGES.md @@ -39,6 +38,11 @@ data-files: html/Linuwial.std-theme/synopsis.png latex/haddock.sty +source-repository head + type: git + location: https://gitlab.haskell.org/ghc/ghc.git + subdir: utils/haddock/haddock-api + library default-language: Haskell2010 @@ -203,8 +207,3 @@ test-suite spec build-tool-depends: hspec-discover:hspec-discover ^>= 2.9 - -source-repository head - type: git - subdir: haddock-api - location: https://github.com/haskell/haddock.git diff --git a/utils/haddock/haddock-api/resources/html/package.json b/utils/haddock/haddock-api/resources/html/package.json index e7967351ad247c1171719093b8eed896b64f7069..ca7b6b85fe80613168e64002748ea25eaa0d32a4 100644 --- a/utils/haddock/haddock-api/resources/html/package.json +++ b/utils/haddock/haddock-api/resources/html/package.json @@ -8,7 +8,8 @@ }, "repository": { "type": "git", - "url": "https://github.com/haskell/haddock.git" + "url": "https://gitlab.haskell.org/ghc/ghc.git" + "directory": "utils/haddock" }, "author": "Tim Baumann <tim@timbaumann.info>", "contributors": [ diff --git a/utils/haddock/haddock-library/haddock-library.cabal b/utils/haddock/haddock-library/haddock-library.cabal index dc9c32b3a0b2e8b463e274f73fd942f04806d125..ef3d52aaf8c2447e7d875158e235d5433aab47c3 100644 --- a/utils/haddock/haddock-library/haddock-library.cabal +++ b/utils/haddock/haddock-library/haddock-library.cabal @@ -2,7 +2,6 @@ cabal-version: 3.0 name: haddock-library version: 1.11.0 synopsis: Library exposing some functionality of Haddock. - description: Haddock is a documentation-generation tool for Haskell libraries. These modules expose some functionality of it without pulling in the GHC @@ -13,16 +12,10 @@ description: Haddock is a documentation-generation tool for Haskell license: BSD-2-Clause license-file: LICENSE -maintainer: Alec Theriault <alec.theriault@gmail.com>, Alex Biehl <alexbiehl@gmail.com>, Simon Hengel <sol@typeful.net>, Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> +maintainer: Haddock Team homepage: http://www.haskell.org/haddock/ -bug-reports: https://github.com/haskell/haddock/issues +bug-reports: https://gitlab.haskell.org/ghc/ghc/-/issues/new category: Documentation -tested-with: GHC == 8.4.4 - , GHC == 8.6.5 - , GHC == 8.8.3 - , GHC == 8.10.1 - , GHC == 9.0.1 - , GHC == 9.2.0 extra-doc-files: CHANGES.md @@ -31,6 +24,11 @@ extra-source-files: fixtures/examples/*.input fixtures/examples/*.parsed +source-repository head + type: git + location: https://gitlab.haskell.org/ghc/ghc.git + subdir: utils/haddock/haddock-library + common lib-defaults default-language: Haskell2010 @@ -113,8 +111,3 @@ test-suite fixtures , filepath ^>= 1.4.1.2 , optparse-applicative >= 0.15 && < 0.19 , tree-diff ^>= 0.2 || ^>= 0.3 - -source-repository head - type: git - subdir: haddock-library - location: https://github.com/haskell/haddock.git diff --git a/utils/haddock/haddock-test/haddock-test.cabal b/utils/haddock/haddock-test/haddock-test.cabal index 56bbfbcec34c29d7a79aee41f489a2ca5ce4354a..044775191134daf17fb7c79c3d9367138b358da3 100644 --- a/utils/haddock/haddock-test/haddock-test.cabal +++ b/utils/haddock/haddock-test/haddock-test.cabal @@ -6,11 +6,10 @@ license: BSD-2-Clause author: Simon Marlow, David Waern maintainer: Simon Hengel <sol@typeful.net>, Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> homepage: http://www.haskell.org/haddock/ -bug-reports: https://github.com/haskell/haddock/issues +bug-reports: https://gitlab.haskell.org/ghc/ghc/-/issues/new copyright: (c) Simon Marlow, David Waern category: Documentation build-type: Simple -tested-with: GHC==9.6.* stability: experimental library diff --git a/utils/haddock/haddock.cabal b/utils/haddock/haddock.cabal index 32d104f54f8fb0d0f783bfabc1fad1d13b4aa452..8b03c86257b293bcb89fa7affae18273aee4bc18 100644 --- a/utils/haddock/haddock.cabal +++ b/utils/haddock/haddock.cabal @@ -29,13 +29,12 @@ description: license: BSD-3-Clause license-file: LICENSE author: Simon Marlow, David Waern -maintainer: Alec Theriault <alec.theriault@gmail.com>, Alex Biehl <alexbiehl@gmail.com>, Simon Hengel <sol@typeful.net>, Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> +maintainer: Haddock Team homepage: http://www.haskell.org/haddock/ -bug-reports: https://github.com/haskell/haddock/issues +bug-reports: https://gitlab.haskell.org/ghc/ghc/-/issues/new copyright: (c) Simon Marlow, David Waern category: Documentation build-type: Simple -tested-with: GHC==9.6.* extra-source-files: CHANGES.md @@ -65,6 +64,11 @@ flag threaded default: True manual: True +source-repository head + type: git + location: https://gitlab.haskell.org/ghc/ghc.git + subdir: utils/haddock + executable haddock default-language: Haskell2010 main-is: Main.hs @@ -193,7 +197,3 @@ test-suite hoogle-test main-is: Main.hs hs-source-dirs: hoogle-test build-depends: base, filepath, haddock-test == 0.0.1 - -source-repository head - type: git - location: https://github.com/haskell/haddock.git