Skip to content

brotli: 1.0.9 -> 1.1.0#254532

Merged
marsam merged 1 commit intoNixOS:stagingfrom
trofi:brotli-update
Sep 13, 2023
Merged

brotli: 1.0.9 -> 1.1.0#254532
marsam merged 1 commit intoNixOS:stagingfrom
trofi:brotli-update

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Sep 11, 2023 •
edited
Loading

Changes: https://github.com/google/brotli/releases/tag/v1.1.0

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@trofi trofi changed the base branch from master to staging September 11, 2023 10:22
@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. label Sep 11, 2023
@ofborg ofborg bot requested a review from freezeboy September 11, 2023 10:37
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Sep 11, 2023
@marsam
Copy link
Contributor

marsam commented Sep 12, 2023

@GrahamcOfBorg eval

@marsam marsam merged commit eb1c63e into NixOS:staging Sep 13, 2023
@trofi trofi deleted the brotli-update branch September 13, 2023 11:23
@mweinelt
Copy link
Member

mweinelt commented Sep 16, 2023

This update broke curl and python3.pkgs.brotlicffi on darwin. See #254963 (comment).

Curl builds fine on f4f4319, fails on eb1c63e.

curl-aarch64-darwin> checking run-time libs availability... failed
curl-aarch64-darwin> configure: error: one or more libs available at link-time are not available run-time. Libs used at link-time: -lnghttp2 -lidn2 -lssh2 -lssh2 -lssl -lcrypto -lssl -lcrypto -lgssapi_krb5 -lresolv -lzstd -lzstd -lbrotlidec -lbrotlidec -lz

@fabianhjr
Copy link
Member

fabianhjr commented Sep 16, 2023

/cc @NixOS/darwin-maintainers

@trofi
Copy link
Contributor Author

trofi commented Sep 17, 2023

There were two changes in this update:

  1. static libraries stopped being installed by default
  2. f842c1bcf9264431cd3b15429a72b7dafbe80509 added an rpath on darwin

Worth a try the revert of Darwin first.

@trofi
Copy link
Contributor Author

trofi commented Sep 17, 2023 •
edited
Loading

f842c1bcf9264431cd3b15429a72b7dafbe80509 added an rpath on darwin

That did it. Proposed the workaround as #255630

@trofi
Copy link
Contributor Author

trofi commented Sep 17, 2023

Proposed proper upstream fix in google/brotli#1084 to use correct library path.

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

Reviewers

@freezeboy freezeboy Awaiting requested review from freezeboy

1 more reviewer

@marsam marsam marsam approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@trofi @marsam @mweinelt @fabianhjr

Comments