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

Fix NetworkManager patches with fetchpatch and updated hashes #48023

Merged
merged 1 commit into from Oct 12, 2018

Conversation

ElvishJerricco
Copy link
Contributor

@ElvishJerricco ElvishJerricco commented Oct 7, 2018

Motivation for this change

Had someone on IRC who couldn't nixos-rebuild because the second patch here had changed hashes. Looks like there's some irrelevant version number gitlab is appending to the patch file. Using fetchpatch should prevent this from being an issue in the future if I understand correctly.

Sidenote, while I was testing this out, I found I could download the results of the old expression from https://cache.nixos.org by running nix-build -A networkmanager.patches. (EDIT: IRC user couldn't because they had substituters = http://nixos-arm.dezgeg.me/channel). However it's been pointed out to me that fetchurl is supposed to enable preferLocalBuild, which is supposed to prevent this. Is this a bug in Nix?

Sidenote 2, is there a particular reason this derivation doesn't have enableParallelBuilding = true? It's quite a slow build without that, for my 32 thread machine :P

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@ElvishJerricco
Copy link
Contributor Author

Didn't realize network-manager was such a common dependency. Should this go to staging then?

@infinisil
Copy link
Member

I'd go for staging

@ElvishJerricco ElvishJerricco changed the base branch from master to staging October 11, 2018 19:37
@ElvishJerricco
Copy link
Contributor Author

Done. Can I get a reviewer?

Copy link
Member

@infinisil infinisil left a comment

Choose a reason for hiding this comment

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

LGTM, I verified the hashes are correct

@infinisil
Copy link
Member

Can you change the commit message to networkmanager: ...?

@ElvishJerricco
Copy link
Contributor Author

@infinisil done.

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.

None yet

3 participants