Skip to content

/nixpkgs

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

cargo-geiger: fix darwin build #72927

Merged
merged 1 commit into from Nov 7, 2019

Conversation

@jonringer
Copy link
Contributor

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 label Nov 6, 2019
@jonringer

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

jonringer commented Nov 6, 2019

@GrahamcOfBorg build cargo-geiger
@ofborg ofborg bot requested a review from evanjs Nov 6, 2019
@jonringer jonringer force-pushed the jonringer:fix-cargo-geiger branch from cb8073b to b270512 Nov 6, 2019
@evanjs
evanjs suggested changes Nov 6, 2019
View changes
Copy link
Member

evanjs left a comment

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

This comment has been minimized.

Sign in to view
Copy link
@evanjs

evanjs Nov 6, 2019

Member

Can we remove this if it’s unused?

This comment has been minimized.

Sign in to view
Copy link
@jonringer

jonringer Nov 6, 2019 •
edited

Author Contributor

it was just a note to say those are darwin dependencies, didn't mean the top-level import.
@jonringer jonringer force-pushed the jonringer:fix-cargo-geiger branch from b270512 to b13a480 Nov 6, 2019
@jonringer

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

jonringer commented Nov 6, 2019

@GrahamcOfBorg build cargo-geiger
@jonringer
cargo-geiger: fix darwin build
Loading status checks…
524b55b
@jonringer jonringer force-pushed the jonringer:fix-cargo-geiger branch from b13a480 to 524b55b Nov 6, 2019
@ofborg ofborg bot requested a review from evanjs Nov 6, 2019
@jonringer

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

jonringer commented Nov 6, 2019

@GrahamcOfBorg build cargo-geiger
@evanjs
evanjs approved these changes Nov 6, 2019
View changes
@ofborg ofborg bot requested a review from evanjs Nov 6, 2019
@evanjs
evanjs approved these changes Nov 6, 2019
View changes
@jonringer

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

jonringer commented Nov 7, 2019

DARWIN BUILT!!!!!! :D
@jonringer jonringer merged commit cb581af into NixOS:master Nov 7, 2019
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
cargo-geiger on aarch64-linux Success
Details
cargo-geiger on x86_64-darwin Success
Details
cargo-geiger on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@jonringer jonringer deleted the jonringer:fix-cargo-geiger branch Nov 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@evanjs evanjs

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 6.topic: darwin
Projects
None yet
Milestone
No milestone
2 participants
@jonringer @evanjs
You can’t perform that action at this time.