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.

Sign up for GitHub

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

Jump to bottom

re2: fix for pkgsStatic #110581

Merged
merged 2 commits into from Jan 23, 2021
Merged

re2: fix for pkgsStatic #110581

merged 2 commits into from Jan 23, 2021

Conversation

tobim
Copy link
Contributor

@tobim tobim commented Jan 23, 2021

Not using lib.optional to avoid changing the .drv hash.

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.

SuperSandro2000
SuperSandro2000 requested changes Jan 23, 2021
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

Not using lib.optional to avoid changing the .drv hash.

This is causing 26 rebuilds. Please do it properly.

pkgs/development/libraries/re2/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/re2/default.nix Outdated Show resolved Hide resolved
@tobim
Copy link
Contributor Author

tobim commented Jan 23, 2021

This is causing 26 rebuilds.

ofBorg disagrees.

@SuperSandro2000
Copy link
Member

ofBorg disagrees.

Using lib.optional does 26 rebuilds which is totally fine to merge into master. Please only use rebuild avoiding hacks when it would cause stdenv rebuilds. This is not such change so we don't need to do it.

@tobim @SuperSandro2000
Don't use rebuild-avoiding hacks
19bde4e 
`lib.optionals` makes the code more readable. A few rebuilds because of that are tolerable.

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
@tobim
Copy link
Contributor Author

tobim commented Jan 23, 2021

@SuperSandro2000 mind having another look?

@SuperSandro2000
Copy link
Member

Checked it manually and it builds.

@SuperSandro2000 SuperSandro2000 merged commit 4369705 into NixOS:master Jan 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 requested changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@tobim @SuperSandro2000