Skip to content

3.14 Backport #11127: update time to 1.15#11394

Closed
mergify[bot] wants to merge 1 commit into
3.14from
mergify/bp/3.14/pr-11127
Closed

3.14 Backport #11127: update time to 1.15#11394
mergify[bot] wants to merge 1 commit into
3.14from
mergify/bp/3.14/pr-11127

Conversation

@mergify

@mergify mergify Bot commented Jan 7, 2026

Copy link
Copy Markdown
Contributor

I'm requesting the backport due to commercialhaskell/stackage#7919.

Template B: This PR does not modify behaviour or interface

E.g. the PR only touches documentation or tests, does refactorings, etc.

Include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions).

This is an automatic backport of pull request #11127 done by [Mergify](https://mergify.com).

@mergify mergify Bot added the conflicts label Jan 7, 2026
@mergify

mergify Bot commented Jan 7, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 9d8968e has failed:

On branch mergify/bp/3.14/pr-11127
Your branch is up to date with 'origin/3.14'.

You are currently cherry-picking commit 9d8968ed2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cabal-syntax/Cabal-syntax.cabal
	both modified:   Cabal/Cabal.cabal
	both modified:   cabal-install/cabal-install.cabal

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify Bot mentioned this pull request Jan 7, 2026
2 tasks
@mergify mergify Bot added the backport label Jan 7, 2026
(cherry picked from commit 9d8968e)
@Mikolaj Mikolaj force-pushed the mergify/bp/3.14/pr-11127 branch from a4d3b4f to c475621 Compare January 7, 2026 09:02
@Mikolaj Mikolaj removed the conflicts label Jan 7, 2026
@Mikolaj

Mikolaj commented Jan 7, 2026

Copy link
Copy Markdown
Member

I'm requesting the backport due to commercialhaskell/stackage#7919.

@Mikolaj

Mikolaj commented Jan 7, 2026

Copy link
Copy Markdown
Member

Though maybe this is not really needed?

@juhp: don't you plan to update the cabal version together with GHC version, which would make this bump unnecessary? (And the bump here: commercialhaskell/stackage#7916?) You could update straight to cabal 3.16.1.0, which contains both the bumps.

@juhp

juhp commented Jan 7, 2026

Copy link
Copy Markdown
Collaborator

@Mikolaj right good point - I haven't validated the Stackage input carefully... let me try to regenerate...
It was based on current Nightly constraints

@juhp

juhp commented Jan 7, 2026

Copy link
Copy Markdown
Collaborator

Hopefully better now - thanks for pointing it out

But actually this backport is needed for 3.16.0 :)
Though hopefully we will see 3.16.1 in ghc-9.14.2

@juhp juhp changed the title Backport #11127: update time to 1.15 3.14 Backport #11127: update time to 1.15 Jan 7, 2026
@juhp juhp closed this Jan 7, 2026
@Mikolaj

Mikolaj commented Jan 7, 2026

Copy link
Copy Markdown
Member

But actually this backport is needed for 3.16.0 :) Though hopefully we will see 3.16.1 in ghc-9.14.2

Actually, I'm told GHC 9.14.1 ships with cabal 3.16.0.0 plus two commits, one of them being time dep bump. See https://gitlab.haskell.org/ghc/ghc/-/issues/26689#note_651728. But that's probably irrelevant for Stackage so, yes, I reckon GHC 9.14.2 will contain Cabal 3.16.1.0 and that will solve all problems.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants