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

gcc6, gcc7, gcc8, gcc9, gcc10, gcc11: do not modify code in prePatch #121772

Merged
merged 1 commit into from
May 11, 2021

Conversation

bobrik
Copy link
Contributor

@bobrik bobrik commented May 5, 2021

Motivation for this change

Doing any modifications before patching risks invalidating patch base.

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.

@bobrik bobrik requested a review from matthewbauer as a code owner May 5, 2021 05:51
@bobrik bobrik mentioned this pull request May 5, 2021
10 tasks
Doing any modifications before patching risks invalidating patch base.
@vcunat
Copy link
Member

vcunat commented May 10, 2021

Well, simple prePatch = ""; would avoid the -linux rebuilds (gcc9 for aarch64, gcc10 for others), but I expect the change doesn't hurry because it just addresses some hypothetical future situation.

@bobrik
Copy link
Contributor Author

bobrik commented May 10, 2021

#115235 is not hypothetical.

@vcunat
Copy link
Member

vcunat commented May 10, 2021

Ah, I missed that. The x86_64-darwin rebuilds would force this through staging anyway. I'm actually surprised that gcc can cause so many rebuilds in there, with stdenv being clang-only.

@bobrik
Copy link
Contributor Author

bobrik commented May 11, 2021

I think numpy (which depends on gfortran) is the root cause of many changes for x86_64-darwin.

@vcunat vcunat merged commit 79762fc into NixOS:staging May 11, 2021
@bobrik bobrik deleted the ivan/gcc-no-pre-patch branch May 14, 2021 16:07
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.

2 participants