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

darwin: miscellaneous fixes #24762

Merged
merged 13 commits into from Apr 10, 2017
Merged

darwin: miscellaneous fixes #24762

merged 13 commits into from Apr 10, 2017

Conversation

matthewbauer
Copy link
Member

@matthewbauer matthewbauer commented Apr 9, 2017

Motivation for this change

This is a bunch of miscellaneous fixes to Darwin. I can split them up into multiple prs if necessary, but hopefully it won't be necessary.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@matthewbauer, thanks for your PR! By analyzing the history of the files in this pull request, we identified @ndowens, @vcunat and @acowley to be potential reviewers.

@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label Apr 9, 2017
@LnL7
Copy link
Member

LnL7 commented Apr 9, 2017

I get this when building cwebbin, do you get the same with nix-build -A cwebbin.src --check?

unpacking source archive /private/var/folders/qv/5k4lhv3n1hg2jk29cj3smtp00000gn/T/nix-build-cwebbin-cwebbin-22p-src.drv-0/cwebbin-22p.tar.gz
output path ‘/nix/store/pb6ag3d3cznzklaqfbamfs4kk4q13mm1-cwebbin-cwebbin-22p-src’ has r:sha256 hash ‘180i5af07zhjv7cdi1wggs9b03iwj07ay7dkvfdwi1ljm6rqm4dj’ when ‘0zf93016hm9i74i2v384rwzcw16y3hg5vc2mibzkx1rzvqa50yfr’ was expected

@matthewbauer
Copy link
Member Author

I uploaded a fix.

@LnL7
Copy link
Member

LnL7 commented Apr 9, 2017

Oh it's actually nix-build -A cwebbin.cweb --check not the src, that has a different hash for me.

@matthewbauer
Copy link
Member Author

@LnL7 Ok got it now, I think. How do you feel about these kind of "miscellaneous" pull requests? I can definitely open separate PRs for each commit but these are mostly unused, tiny packages that I think can be grouped together.

@LnL7 LnL7 merged commit f823051 into NixOS:master Apr 10, 2017
@LnL7
Copy link
Member

LnL7 commented Apr 10, 2017

I don't have a problem with it for trivial changes like this. It's just generally preferred to keep unrelated changes separate to reduce the chance of good changes getting blocked by another issue or unrelated merge conflicts.

@matthewbauer matthewbauer deleted the darwin-misc-fixes branch February 22, 2019 04:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants