[Git][ghc/ghc][wip/T23490-part2] 2 commits: Remove reference to non-existent file in haddock.cabal

[Matthew Craven (@clyring)]

Matthew Craven pushed to branch wip/T23490-part2 at Glasgow Haskell Compiler / GHC


Commits:
47069396 by Matthew Craven at 2024-06-26T23:00:47-04:00
Remove reference to non-existent file in haddock.cabal

- - - - -
1dccd2d8 by Matthew Craven at 2024-06-26T23:01:38-04:00
Try working around issues with Cabal/time dependency

To be investigated properly: Why doesn't the solver just pick
an older version of time to use for ghc-boot:setup:time?

- - - - -


2 changed files:

- cabal.project-reinstall
- utils/haddock/haddock.cabal


Changes:

=====================================
cabal.project-reinstall
=====================================
@@ -65,6 +65,8 @@ constraints: ghc +internal-interpreter +dynamic-system-linke,
              any.pretty installed,
              any.template-haskell installed
 
+allow-newer:
+  Cabal:time
 
 benchmarks: False
 tests: False


=====================================
utils/haddock/haddock.cabal
=====================================
@@ -43,7 +43,6 @@ extra-source-files:
   doc/README.md
   doc/*.rst
   doc/conf.py
-  haddock-api/src/haddock.sh
   html-test/src/*.hs
   html-test/ref/*.html
   hypsrc-test/src/*.hs



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6e7373951a18b2e74d9768572a9d2d81df692998...1dccd2d8d9cc45fb1f7749373495b7bd459cd068

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/6e7373951a18b2e74d9768572a9d2d81df692998...1dccd2d8d9cc45fb1f7749373495b7bd459cd068
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/20240626/b41693a5/attachment.html>