Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WPB-8943] ghc 9.4 -> 9.6, nixpkgs bump #4071

Merged
merged 2 commits into from
Jun 19, 2024
Merged

Conversation

MangoIV
Copy link
Contributor

@MangoIV MangoIV commented May 29, 2024

https://wearezeta.atlassian.net/browse/WPB-8943

Checklist

  • Add a new entry in an appropriate subdirectory of changelog.d
  • Read and follow the PR guidelines

@MangoIV MangoIV changed the title [feat] all dependencies build ghc 9.4 -> 9.6, nixpkgs bump May 29, 2024
@zebot zebot added the ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist label May 29, 2024
@MangoIV MangoIV force-pushed the mangoiv/update-nixpkgs-ghc-96 branch from b5e1571 to d7bf068 Compare May 29, 2024 14:35
@MangoIV
Copy link
Contributor Author

MangoIV commented May 31, 2024

TODO: point hsaml2 to upstream again (PR go merged already)

@MangoIV MangoIV force-pushed the mangoiv/update-nixpkgs-ghc-96 branch 3 times, most recently from 5c9d4d3 to 97534ec Compare June 3, 2024 15:12
@MangoIV
Copy link
Contributor Author

MangoIV commented Jun 3, 2024

this is a chonky chonk of a PR

@MangoIV MangoIV force-pushed the mangoiv/update-nixpkgs-ghc-96 branch 2 times, most recently from 775b02a to 07e7cae Compare June 3, 2024 16:45
@MangoIV MangoIV marked this pull request as ready for review June 3, 2024 16:45
@MangoIV MangoIV changed the title ghc 9.4 -> 9.6, nixpkgs bump [WPB-8943] ghc 9.4 -> 9.6, nixpkgs bump Jun 4, 2024
@MangoIV MangoIV force-pushed the mangoiv/update-nixpkgs-ghc-96 branch 8 times, most recently from 0beaaa4 to b1c93ef Compare June 9, 2024 12:24
@MangoIV MangoIV force-pushed the mangoiv/update-nixpkgs-ghc-96 branch 4 times, most recently from 00f622b to c243c04 Compare June 18, 2024 15:28
libs/wire-api/src/Wire/API/User/IdentityProvider.hs Outdated Show resolved Hide resolved
libs/wire-api/src/Wire/API/OAuth.hs Outdated Show resolved Hide resolved
nix/haskell-pins.nix Show resolved Hide resolved
nix/manual-overrides.nix Show resolved Hide resolved
@MangoIV MangoIV force-pushed the mangoiv/update-nixpkgs-ghc-96 branch from c243c04 to a83cc0a Compare June 19, 2024 07:19
@MangoIV MangoIV requested a review from akshaymankar June 19, 2024 07:20
@MangoIV MangoIV force-pushed the mangoiv/update-nixpkgs-ghc-96 branch from a83cc0a to d6edf19 Compare June 19, 2024 07:31
- fix hscim
- fix http2-manager
- fix the docs
- fix integration test suite compiliation errors
- fix wire-api, wire-api-federation
- fix spar, stern, cargohold
- fix gundeck, brig and galley
- regenerate local packages
- remove "obsolete" version field from docker compose files
- fix federator
- nix cleanup
- bump http2 to beyond the necessary bug fix in 5.2.2
- patch http2 to not spam ConnectionIsClosed
@MangoIV MangoIV force-pushed the mangoiv/update-nixpkgs-ghc-96 branch from d6edf19 to e530cae Compare June 19, 2024 07:53
@fisx
Copy link
Contributor

fisx commented Jun 19, 2024

good thing we have /tools/rebase-onto-formatter.sh...

for me the "semantic" commit contains quite a lot of noise, too. did something go wrong there?

@MangoIV
Copy link
Contributor Author

MangoIV commented Jun 19, 2024

all files that are in the semantic parts actually contain changes, it is possible that they are reformatted because my editor just does that :) It shouldn't be that bad though ;)

@MangoIV
Copy link
Contributor Author

MangoIV commented Jun 19, 2024

good thing we have /tools/rebase-onto-formatter.sh...

I don't use this tool, I don't really have a need for it :3

@MangoIV
Copy link
Contributor Author

MangoIV commented Jun 19, 2024

you just do git rebase -i HEAD^^^ then move the commit you want to ammend to the semantic part up and squash it into it.

@MangoIV MangoIV force-pushed the mangoiv/update-nixpkgs-ghc-96 branch from e530cae to 5566638 Compare June 19, 2024 08:09
version = "0.3.20";
sha256 = "sha256-PGwjhrRnkH8cLhd7fHTZFd6ts9abp0w5sLlV8ke1yXU=";

# warp is not compatible with
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing end of sentence?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm touching warp soon again anyways, let's get this merged!

Copy link
Contributor

@elland elland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only one comment issue came to mind.

@MangoIV MangoIV merged commit 0ab0e86 into develop Jun 19, 2024
9 checks passed
@MangoIV MangoIV deleted the mangoiv/update-nixpkgs-ghc-96 branch June 19, 2024 11:56
@echoes-hq echoes-hq bot added echoes: technical-roadmap/security More specific category, to highlight task that tackle security requirements. echoes: technical-roadmap/throughput More specific category, to highlight task aiming at improving the development velocity and effici... and removed echoes: technical-roadmap/security More specific category, to highlight task that tackle security requirements. labels Jun 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
echoes: technical-roadmap/throughput More specific category, to highlight task aiming at improving the development velocity and effici... ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants