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
pkgsStatic.brotli: fix patch #102967
Conversation
#(fetchpatch { | ||
# # from https://github.com/google/brotli/pull/655 | ||
# url = "https://github.com/google/brotli/commit/7289e5a378ba13801996a84d89d8fe95c3fc4c11.patch"; | ||
# sha256 = "1bghbdvj24jrvb0sqfdif9vwg7wx6pn8dvl6flkrcjkhpj0gi0jg"; | ||
#}); |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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";
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
0c068b2
to
23c9f18
Compare
There was a problem hiding this 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
By the way, perhaps some of you would like to be in |
Motivation for this change
Fixing #102957
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)