This project is mirrored from https://github.com/haskell/Cabal.
Pull mirroring updated .
- Jun 24, 2024
-
-
mergify[bot] authored
regenerate bootstrap files without arch-native
-
Brandon S. Allbery authored
-
mergify[bot] authored
* Disable arch-native flag when building releases that we distribute * Use the constraints stanza * Also disable the flag in cabal.validate.project (cherry picked from commit 9bb4f58e) Co-authored-by:
Hécate <Kleidukos@users.noreply.github.com>
-
- Jun 23, 2024
-
-
Brandon S. Allbery authored
* missed the two changelog pointers * Apply suggestions from code review fixup! missed the two changelog pointers Co-authored-by:
ffaf1 <fa-ml@ariis.it> * squash! and the other two changelogs --------- Co-authored-by:
ffaf1 <fa-ml@ariis.it>
-
mergify[bot] authored
Skip tasty-quickcheck 0.11 (backport #10136)
-
Brandon S. Allbery authored
API incompatible with our test suites (cherry picked from commit 3964da34)
-
- Jun 21, 2024
-
-
Brandon S. Allbery authored
* release 3.12.1.0: version bumps * regenerate bootstrap plans
-
Brandon S. Allbery authored
undefined
-
Brandon S. Allbery authored
* changelog for 3.12.1.0 * fixup! changelog for 3.12.1.0 * fixup! Changelogs for 3.12.1.0 Co-authored-by:
Artem Pelenitsyn <a.pelenitsyn@gmail.com> * fixup! changelog for 3.12.1.0 * fixup! changelog for 3.12.1.0 * fixup! Changelogs for 3.12.1.0 Co-authored-by:
ffaf1 <fa-ml@ariis.it> * fixup! Changelogs for 3.12.1.0 * fixup! Changelogs for 3.12.1.0 * fixup! Changelogs for 3.12.1.0 --------- Co-authored-by:
Artem Pelenitsyn <a.pelenitsyn@gmail.com> Co-authored-by:
ffaf1 <fa-ml@ariis.it>
-
- Jun 18, 2024
-
-
mergify[bot] authored
* Bump index state to allow tar-0.6.3.0 tar-0.6.3.0 has much improved performance of deserialising .tar index which has significant ramifications for the start-up time of cabal-install. See #10110 (cherry picked from commit 827256a5) * Update bootstrap plans to include tar-0.6.3 Using the updated version of this library improves performance of cabal-install so it's worthwhile to make sure the bootstrap plans use this version. (cherry picked from commit 4d787e1b) # Conflicts: # bootstrap/linux-8.10.7.json # bootstrap/linux-9.0.2.json # bootstrap/linux-9.2.8.json # bootstrap/linux-9.4.8.json # bootstrap/linux-9.6.4.json # bootstrap/linux-9.8.2.json * fixup! Update bootstrap plans to include tar-0.6.3 --------- Co-authored-by:
Matthew Pickering <matthewtpickering@gmail.com> Co-authored-by:
brandon s allbery kf8nh <allbery.b@gmail.com> Co-authored-by:
mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
-
mergify[bot] authored
verifyFetchedTarball has the effect of deserialising the index tarball (see call to Sec.withIndex). verifyFetchedTarball is called individually for each package in the build plan (see ProjectPlanning.hs). Not once per repo. The hackage tarball is now 880mb so it takes a non significant amount of time to deserialise this (much better after haskell/tar#95). This code path is important as it can add 1s with these 38 calls on to the initial load of a project and scales linearly with the size of your build tree. Reproducer: Simple project with "lens" dependency deserialises the index tarball 38 times. Solution: Refactor verifyFetchedTarball to run once per repo rather than once per package. In future it would be much better to refactor this function so that the items are not immediately grouped and ungrouped but I didn't want to take that on immediately. Fixes #10110 (cherry picked from commit 7d46115b) Co-authored-by:
Matthew Pickering <matthewtpickering@gmail.com>
-
- Jun 16, 2024
-
-
mergify[bot] authored
* Add MHS as a recognized compiler. (#9878) * Add MHS as a recognized compiler. * Add Changelog entry * Add comment. * Update checksums. * Update more checksums. --------- Co-authored-by:
Lennart Augustsson <lennart.augustsson@epicgames.com> (cherry picked from commit 3169b879) # Conflicts: # Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs * fixup! Add MHS as a recognized compiler. (#9878) --------- Co-authored-by:
Lennart Augustsson <lennart@augustsson.net> Co-authored-by:
brandon s allbery kf8nh <allbery.b@gmail.com>
-
- Jun 15, 2024
-
-
mergify[bot] authored
(cherry picked from commit e6d92575) Co-authored-by:
Phil de Joux <philderbeast@gmail.com>
-
mergify[bot] authored
Be sure to invalidate the cache if building throws an exception! If not, we'll abort execution with a stale recompilation cache. See ghc#24926 for an example of how this can go wrong. (cherry picked from commit a9f2c3b2) Co-authored-by:
Rodrigo Mesquita <rodrigo.m.mesquita@gmail.com>
-
- Jun 14, 2024
-
-
mergify[bot] authored
(cherry picked from commit 67aafee1) Co-authored-by:
brandon s allbery kf8nh <allbery.b@gmail.com>
-
mergify[bot] authored
Issue #10063 points out that cabal exits before the external command has finished executing. This was a simple oversight to not waitForProcess on the result of calling createProcess. This also points out the flaw that there isn't a way for external commands to signal failure, so we now also propagate the exit code from the external process. Fixes #10063 (cherry picked from commit cb57c371) Co-authored-by:
Matthew Pickering <matthewtpickering@gmail.com>
-
- Jun 13, 2024
-
-
mergify[bot] authored
GHC 9.10 ships with a new wired-in package, ghc-internal, which cannot be reinstalled. This commit prevents cabal-install from attempting it. Co-authored-by:
mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> (cherry picked from commit b1c8ee6f) Co-authored-by:
Adam Gundry <adam@well-typed.com>
-
- Jun 12, 2024
-
-
mergify[bot] authored
* add the applicable new (version 9.10) GHC flags to normaliseGhcArgs (#10014) * add the applicable new (versions 9.2 - 9.10) GHC flags to normaliseGhcArgs Actionable flags are: - fdiagnostics-as-json (changes the format GHC outputs its diagnostics) - fprint-error-index-lists (changes the way GHC displays compile time) - fbreak-points (enables/disables break-points in GHCi) - dipe-stats (dumps information about which info tables have IPE information) - ffamily-application-cache (only changes the speed of the compiler) - fprint-redundant-promotion-ticks - show-error-context - unoptimized-core-for-interpreter (only applies to GHCi) * [chore] correct the flag names and add a FUTUREWORK (cherry picked from commit be10be83) # Conflicts: # Cabal/src/Distribution/Simple/Program.hs * fixup! add the applicable new (version 9.10) GHC flags to normaliseGhcArgs (#10014) --------- Co-authored-by:
Mango The Fourth <40720523+MangoIV@users.noreply.github.com> Co-authored-by:
brandon s allbery kf8nh <allbery.b@gmail.com>
-
- Jun 11, 2024
-
-
mergify[bot] authored
* Bump a number of dependencies base and QuickCheck. (cherry picked from commit 5226cd8c) # Conflicts: # cabal-install-solver/cabal-install-solver.cabal * Bump `cabal-version` For `Cabal` and `cabal-install`. (cherry picked from commit bb24ef55) * fixup! Bump a number of dependencies --------- Co-authored-by:
Francesco Ariis <fa-ml@ariis.it> Co-authored-by:
brandon s allbery kf8nh <allbery.b@gmail.com>
-
mergify[bot] authored
(cherry picked from commit cb1b60f4) Co-authored-by:
Artem Pelenitsyn <a.pelenitsyn@gmail.com>
-
- Jun 08, 2024
-
-
mergify[bot] authored
* Add extra ghc options to multi-repl file These options are configured into the program by Cabal, so we also need to extract these and put them into the mutli-file. Fixes #10015 (cherry picked from commit 539cb7bc) * Fix rendering of `-j` option in multi-repl Before this was rendered as.. ``` /run/current-system/sw/bin/ghc --interactive -package-env - -j 'NumJobs (Just 8)' ... ``` Due to this place not being updated when support for semaphores was added. (cherry picked from commit c3708d21) --------- Co-authored-by:
Matthew Pickering <matthewtpickering@gmail.com> Co-authored-by:
mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
-
mergify[bot] authored
- Use real-life example from Cabal project in doctest (cherry picked from commit 325ff22c) Co-authored-by:
Phil de Joux <philderbeast@gmail.com> Co-authored-by:
mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
-
mergify[bot] authored
Disallowing whitespace while parsing target selectors incorrectly disallows file targets with whitespace in the paths, which can issues when users pass absolute paths. fixes #8875 (cherry picked from commit 564b4fe6) Co-authored-by:
Zoe Zuser <zoe@mzero.dev>
-
- Jun 07, 2024
-
-
mergify[bot] authored
(cherry picked from commit dc9a7a02) Co-authored-by:
Mike Pilgrem <mpilgrem@users.noreply.github.com>
-
mergify[bot] authored
* Downgrade NoLibraryFound from an error to a warning This makes Setup copy/install succeed if there's nothing to do because the package doesn't contain a library or executable. This allows downstream users of Cabal to avoid having to add workarounds for this edge case. Resolves #6750 (cherry picked from commit 312a4124) # Conflicts: # Cabal/src/Distribution/Simple/Install.hs * fixup! fix conflicts --------- Co-authored-by:
Teo Camarasu <teo.camarasu@tracsis.com> Co-authored-by:
Artem Pelenitsyn <a.pelenitsyn@gmail.com> Co-authored-by:
mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
-
mergify[bot] authored
* Fix --program-{prefix,suffix} resulting in invalid installation Currently the options `--program-{prefix,suffix}` for cabal install affects the name of the file in the install directory *and* the executable name in the store. The installation fails: - If using `--install-method=symlink`, the *target* of the symlink is not affected by the affix options and it results in an invalid symlink. - If using `--install-method=copy`, the copy fails because the source is not found. Another issue is that it affects the computation of the hash of the build directory in the store, resulting in needless rebuild when using successively different affix options. Fixed by making the name of the executable in the store canonical, i.e. always ignoring the program affix options. Added a test for all the combinations of `--install-method` and program affixes options. (cherry picked from commit 85934742) # Conflicts: # cabal-install/src/Distribution/Client/CmdInstall.hs * fixup! resolve conflicts --------- Co-authored-by:
Pierre Le Marre <dev@wismill.eu> Co-authored-by:
Artem Pelenitsyn <a.pelenitsyn@gmail.com> Co-authored-by:
mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
-
mergify[bot] authored
* CI: install changelog-d from bindist (#10048) This will avoid build problems when the GHC in the CI environment is updated sooner than expected. Previous breakage: https://github.com/haskell/cabal/pull/9177#issuecomment-2125549693 (cherry picked from commit d1a6ced0) # Conflicts: # .github/workflows/changelogs.yml * !fixup resolve conflicts --------- Co-authored-by:
Francesco Gazzetta <fgaz@fgaz.me> Co-authored-by:
Artem Pelenitsyn <a.pelenitsyn@gmail.com> Co-authored-by:
mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
-
- Jun 06, 2024
-
-
mergify[bot] authored
closes #7986 (cherry picked from commit 0f1e17df) Co-authored-by:
Zoe Zuser <zoe@mzero.dev> Co-authored-by:
mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
-
mergify[bot] authored
* Regenerate HLint counts with hlint-3.5 (cherry picked from commit 1cdb4b9e) * Bump to hlint-3.8 and regenerate counts (cherry picked from commit 46391f70) * fix hlint warning --------- Co-authored-by:
Phil de Joux <philderbeast@gmail.com> Co-authored-by:
Artem Pelenitsyn <a.pelenitsyn@gmail.com>
-
mergify[bot] authored
Also uses 'stanza' consistently in that context. (cherry picked from commit 2e8d7286) Co-authored-by:
Mike Pilgrem <mpilgrem@users.noreply.github.com>
-
- Jun 03, 2024
-
-
mergify[bot] authored
* CI: add GHC 9.10 * GHC 9.10 compat in testsuite: CPP symbols don't get passed to CC as eagearly Discussion: https://github.com/haskell/cabal/pull/9914#issuecomment-2077439625 Related GHC issue: ghc/ghc#21291 * GHC 9.10 compat in tests: disable tests regressing due to #9940 (cherry picked from commit 3a8c69cb) Co-authored-by:
Artem Pelenitsyn <a.pelenitsyn@gmail.com>
-
mergify[bot] authored
* More consistently pass --package-db flag to tests Previously `--package-db` was only passed to test which used the `v2-` prefix. Now we pass `--package-db` to things which use the `v2-` prefix, not things which use the `v1-` prefix and by default assume that unprefixed commands are v2 commands. (cherry picked from commit 2b44677c) # Conflicts: # cabal-testsuite/PackageTests/CustomTestCoverage/cabal.out * fixup! resolve conflicts --------- Co-authored-by:
Matthew Pickering <matthewtpickering@gmail.com> Co-authored-by:
Artem Pelenitsyn <a.pelenitsyn@gmail.com>
-
- May 31, 2024
-
-
mergify[bot] authored
(cherry picked from commit 225d2b15) Co-authored-by:
Pierre Le Marre <dev@wismill.eu>
-
- May 30, 2024
-
-
mergify[bot] authored
* testsuite: Refactor withShorterPathForNewBuildStore This makes `withShorterPathForNewBuildStore` fit more nicely into the rest of the testing infrastructure. * Move `withShorterPathForNewBuildStore` to `TestM` monad * Move responsibility for passing `--store-dir` to `cabalGArgs` function * Move `findDependencyInStore` into `TestM`, and remove requirement to pass path to store directory. * Introduce `testStoreDir` function which returns the store location (and honours `withShorterPathForNewBuildStore`) * Migrate tests which use `withShorterPathForNewBuildStore`. (cherry picked from commit 2a2d0b30) # Conflicts: # Cabal-tests/Cabal-tests.cabal # Cabal-tests/lib/Test/Utils/TempTestDir.hs * !fixup resolve conflicts * fixup! always import `(</>)` --------- Co-authored-by:
Matthew Pickering <matthewtpickering@gmail.com> Co-authored-by:
Artem Pelenitsyn <a.pelenitsyn@gmail.com> Co-authored-by:
brandon s allbery kf8nh <allbery.b@gmail.com>
-
- May 23, 2024
-
-
mergify[bot] authored
[3.12] PackageTests/NewUpdate: fix skipping flaky tests
-
RejectFutureIndexStates and UpdateIndexState are marked "skip", but it's under withRemoteRepo, which causes flakiness before skip is called.
-
mergify[bot] authored
* Rename projects to cabal.*.project - Rename cabal.bootstrap.project - Rename cabal.meta.project - Rename cabal.validate-libonly.project - Rename cabal.validate.project - Rename cabal.release.project (cherry picked from commit d8147f62) # Conflicts: # .github/workflows/quick-jobs.yml # Makefile # cabal.bootstrap.project * Fix conflict with #9990 --------- Co-authored-by:
Phil de Joux <philderbeast@gmail.com> Co-authored-by:
brandon s allbery kf8nh <allbery.b@gmail.com> Co-authored-by:
Artem Pelenitsyn <a.pelenitsyn@gmail.com>
-
mergify[bot] authored
* Fix #9815: switch quick-jobs CI to XDG Fix #9815: - Cache `~/.local/state/cabal` instead of `~/.cabal/store` - `~/.local/bin` is used instead of `~/.cabal/bin` and is already in the PATH (verify this by calling `alex` after installing it) As I am passing by: - bump cache action to v4 - double-quote `$USER` to keep actionlint happy - move `if` from shell-level to job-level - allow newest `alex` (cherry picked from commit e916cb59) * CI quick-jobs: use preinstalled GHC and Cabal (cherry picked from commit c209a827) * Makefile: remove dead target 'lexer', use '.PHONY' systematically The `lexer` target was removed in https://github.com/haskell/cabal/pull/8980 (cherry picked from commit e6000878) * CI "Meta checks": correct cache key (cherry picked from commit 56426e4f) * CI "Meta checks": print Haskell versions (cherry picked from commit 9a311bd8) * CI "Doctest Cabal": daily refresh of cache (cherry picked from commit ba6f6ffc) * CI "Check Field Syntax Reference": correct cache key (cherry picked from commit 5949e3fd) * Update generated Cabal/src/Distribution/Simple/Build/Macros/Z.hs Not sure why this was not up to date on master and still CI passed. Maybe the content of this file is dependent on the GHC version we are using to build the `get-cabal-macros` tool? (cherry picked from commit 947860a8) * CI quick-jobs: entirely wipe ghcup directory rights workaround (cherry picked from commit 5aa8afd4) * !fixup --------- Co-authored-by:
Andreas Abel <andreas.abel@ifi.lmu.de> Co-authored-by:
Artem Pelenitsyn <a.pelenitsyn@gmail.com>
-
Artem Pelenitsyn authored
Co-authored-by:
Rodrigo Mesquita <rodrigo.m.mesquita@gmail.com>
-
- May 22, 2024
-
-
mergify[bot] authored
* Recommend using latest cabal-install - Shorten the suggestion to use cabal.release.project - Move up cabal.release.project for initial build - Put the --project-file option after as suggested by the command help - Usage: cabal build [TARGETS] [FLAGS] - Use the latest markup for note - $ prefix for command line (cherry picked from commit de89ffe7) # Conflicts: # CONTRIBUTING.md * !fixup resolve conflict --------- Co-authored-by:
Phil de Joux <philderbeast@gmail.com> Co-authored-by:
Artem Pelenitsyn <a.pelenitsyn@gmail.com> Co-authored-by:
mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
-