[Git][ghc/ghc][master] haddock: Remove obsolete links to github.com/haskell/haddock in the docs
Marge Bot (@marge-bot)
gitlab at gitlab.haskell.org
Wed Jun 12 07:09:17 UTC 2024
Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC
Commits:
a2f60da5 by Hécate Kleidukos at 2024-06-12T03:08:35-04:00
haddock: Remove obsolete links to github.com/haskell/haddock in the docs
- - - - -
7 changed files:
- utils/haddock/README.md
- utils/haddock/doc/intro.rst
- utils/haddock/haddock-api/haddock-api.cabal
- utils/haddock/haddock-api/resources/html/package.json
- utils/haddock/haddock-library/haddock-library.cabal
- utils/haddock/haddock-test/haddock-test.cabal
- utils/haddock/haddock.cabal
Changes:
=====================================
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
=====================================
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
----------------
=====================================
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 at gmail.com>, Alex Biehl <alexbiehl at gmail.com>, Simon Hengel <sol at typeful.net>, Mateusz Kowalczyk <fuuzetsu at 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
=====================================
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 at timbaumann.info>",
"contributors": [
=====================================
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 at gmail.com>, Alex Biehl <alexbiehl at gmail.com>, Simon Hengel <sol at typeful.net>, Mateusz Kowalczyk <fuuzetsu at 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
=====================================
utils/haddock/haddock-test/haddock-test.cabal
=====================================
@@ -6,11 +6,10 @@ license: BSD-2-Clause
author: Simon Marlow, David Waern
maintainer: Simon Hengel <sol at typeful.net>, Mateusz Kowalczyk <fuuzetsu at 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
=====================================
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 at gmail.com>, Alex Biehl <alexbiehl at gmail.com>, Simon Hengel <sol at typeful.net>, Mateusz Kowalczyk <fuuzetsu at 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
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a2f60da575598ae413cc553460c0c2c1ebce9d2c
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a2f60da575598ae413cc553460c0c2c1ebce9d2c
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20240612/5cf8ff21/attachment-0001.html>
More information about the ghc-commits
mailing list