search

clash-lang / clash-compiler

Haskell to VHDL/Verilog/SystemVerilog compiler
https://clash-lang.org/
Other
1.4k stars 149 forks source link

Support Aeson 2.2 (copy #2578) #2581

Closed mergify[bot] closed 10 months ago

mergify[bot] commented 10 months ago

This is an automatic copy of pull request #2578 done by Mergify. Cherry-pick of 149885cef097ecfdb910797f73f0c1f54fc5b191 has failed:

On branch mergify/copy/1.6/pr-2578
Your branch is up to date with 'origin/1.6'.

You are currently cherry-picking commit 149885cef.
  (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)

Changes to be committed:
    modified:   clash-lib/clash-lib.cabal
    modified:   clash-lib/src/Data/Aeson/Extra.hs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
    deleted by us:   .ci/stack-8.10.yaml
    both modified:   .ci/stack-8.6.5.yaml
    both modified:   .ci/stack-8.8.4.yaml
    deleted by us:   .ci/stack-9.0.yaml
    deleted by us:   .ci/stack-9.2.yaml
    deleted by us:   flake.lock
    deleted by us:   flake.nix
    deleted by us:   nix/overlay-ghc902.nix
    deleted by us:   nix/overlay-ghc962.nix
    both modified:   stack.yaml

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

Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com
christiaanb commented 10 months ago

@mergify rebase

mergify[bot] commented 10 months ago

rebase

❌ Base branch update has failed

Git reported the following error: ``` Rebasing (1/1) Auto-merging .ci/stack-8.10.yaml CONFLICT (add/add): Merge conflict in .ci/stack-8.10.yaml Auto-merging .ci/stack-9.0.yaml CONFLICT (add/add): Merge conflict in .ci/stack-9.0.yaml error: could not apply 96ace812... Support Aeson 2.2 (#2578) hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm ", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 96ace812... Support Aeson 2.2 (#2578) ```