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

cargo-geiger: fix darwin build #72927

Merged
merged 1 commit into from Nov 7, 2019
Merged

cargo-geiger: fix darwin build #72927

merged 1 commit into from Nov 7, 2019

Conversation

jonringer
Copy link
Contributor

@jonringer jonringer commented Nov 6, 2019 •
edited

Motivation for this change

noticed in hydra logs this is failing to build for darwin

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 nix-review --run "nix-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.
Notify maintainers

cc @

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Nov 6, 2019
@jonringer
Copy link
Contributor Author

@GrahamcOfBorg build cargo-geiger

@ofborg ofborg bot requested a review from evanjs November 6, 2019 19:33
evanjs
evanjs suggested changes Nov 6, 2019
View reviewed changes
Copy link
Member

@evanjs evanjs left a comment

Choose a reason for hiding this comment

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

Looks good aside from the darwin import which we don’t seem to need.
Thanks!

pkgs/development/tools/rust/cargo-geiger/default.nix Outdated
@@ -1,6 +1,8 @@
{ stdenv, lib, fetchFromGitHub
, rustPlatform, pkgconfig
, openssl, Security }:
, openssl
# darwin
Copy link
Member

Choose a reason for hiding this comment

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

Can we remove this if it’s unused?

Copy link
Contributor Author

@jonringer jonringer Nov 6, 2019 •
edited

Choose a reason for hiding this comment

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

it was just a note to say those are darwin dependencies, didn't mean the top-level import.

@jonringer
Copy link
Contributor Author

@GrahamcOfBorg build cargo-geiger

@ofborg ofborg bot requested a review from evanjs November 6, 2019 23:17
@jonringer
Copy link
Contributor Author

@GrahamcOfBorg build cargo-geiger

@ofborg ofborg bot requested a review from evanjs November 6, 2019 23:30
@jonringer
Copy link
Contributor Author

DARWIN BUILT!!!!!! :D

@jonringer jonringer merged commit cb581af into NixOS:master Nov 7, 2019
@jonringer jonringer deleted the fix-cargo-geiger branch November 7, 2019 02:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@evanjs evanjs evanjs approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jonringer @evanjs