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

pkgsStatic.brotli: fix patch #102967

Merged
merged 1 commit into from Nov 7, 2020
Merged

Conversation

freezeboy
Copy link
Contributor

@freezeboy freezeboy commented Nov 5, 2020

Motivation for this change

Fixing #102957

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Comment on lines 19 to 23
#(fetchpatch {
# # from https://github.com/google/brotli/pull/655
# url = "https://github.com/google/brotli/commit/7289e5a378ba13801996a84d89d8fe95c3fc4c11.patch";
# sha256 = "1bghbdvj24jrvb0sqfdif9vwg7wx6pn8dvl6flkrcjkhpj0gi0jg";
#});
Copy link
Member

Choose a reason for hiding this comment

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

What was the fetch issue? I see you opted to commit the patch.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The patch was an not mergeable with their master/release branch, as another PR doing the things differently was merged, and the patch was not up to date.

I thought it would be easier to keep the modification here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Btw didn't meant to keep it as a comment, I can remove it

Copy link
Member

Choose a reason for hiding this comment

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

Ah, then I suggest you send that new patch as a PR upstream and then grab it as the previous one.

url = "https://github.com/google/brotli/commit/[commit hash of new patch here].patch";

Copy link
Member

Choose a reason for hiding this comment

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

Btw didn't meant to keep it as a comment, I can remove it

You generally don't comment out things that don't work in git. You can fix it, remove it or comment it our with a comment why it is commented and a TODO.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done, but apparenty their CI doesn't like the patch, anyway on our side, it works for both static and shared libraries

@veprbl veprbl linked an issue Nov 6, 2020 that may be closed by this pull request
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

[nix-shell:~/.cache/nixpkgs-review/pr-102967]$ nix-build ./nixpkgs/ -A pkgsStatic.brotli
/nix/store/6d80j40adjzdw0qz250kkai0z5dvxpji-brotli-1.0.9-x86_64-unknown-linux-musl

@jonringer jonringer merged commit 99c9647 into NixOS:master Nov 7, 2020
@freezeboy freezeboy deleted the fix-static-brotli branch November 7, 2020 19:14
vcunat pushed a commit that referenced this pull request Nov 8, 2020
(cherry picked from commit 99c9647, PR #102967)
Non-static builds aren't affected, static build gets fixed.
@vcunat
Copy link
Member

vcunat commented Nov 8, 2020

By the way, perhaps some of you would like to be in brotli.meta.maintainers? (empty ATM)

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

Successfully merging this pull request may close these issues.

brotli: static build is broken
6 participants