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-edit: 0.2.0 -> 0.3.0 #46100

Merged
merged 4 commits into from Sep 11, 2018
Merged

cargo-edit: 0.2.0 -> 0.3.0 #46100

merged 4 commits into from Sep 11, 2018

Conversation

alyssais
Copy link
Member

@alyssais alyssais commented Sep 5, 2018

Motivation for this change
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.

@Mic92
Copy link
Member

Mic92 commented Sep 5, 2018 •
edited

oh, 3000 lines nix code for a single package?

@Mic92
Copy link
Member

Mic92 commented Sep 5, 2018

Does it also compile with buildRustPackage?

@alyssais
Copy link
Member Author

alyssais commented Sep 11, 2018 via email

@Mic92
Copy link
Member

Mic92 commented Sep 11, 2018

@GrahamcOfBorg build cargo-edit

Mic92
Mic92 reviewed Sep 11, 2018
View reviewed changes
pkgs/tools/package-management/cargo-edit/default.nix Outdated

propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
propagatedBuildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
Copy link
Member

Choose a reason for hiding this comment

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

On linux cargo-edit also needs pkgconfig in nativeBuildInputs and openssl in buildInputs.

Copy link
Member

Choose a reason for hiding this comment

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

Any reason why darwin.apple_sdk.frameworks.Security is not in buildInputs?

Copy link
Member Author

Choose a reason for hiding this comment

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

Not that I can see. Was like that before.

Copy link
Member

Choose a reason for hiding this comment

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

darwin.apple_sdk.frameworks.Security is probably fine. pkgs/build-support/rust/default-crate-overrides.nix does the same.

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: cargo-edit

Partial log (click to expand)

could not be found. If you have OpenSSL installed you can likely fix this by
installing `pkg-config`.

', /build/cargo-edit-0.3.0-vendor/openssl-sys/build/main.rs:232:5
note: Run with `RUST_BACKTRACE=1` for a backtrace.

warning: build failed, waiting for other jobs to finish...
error: build failed
builder for '/nix/store/7b2q48ilsxr15d2l8f353n91yk7a6qkf-cargo-edit-0.3.0.drv' failed with exit code 101
error: build of '/nix/store/7b2q48ilsxr15d2l8f353n91yk7a6qkf-cargo-edit-0.3.0.drv' failed

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: cargo-edit

Partial log (click to expand)

could not be found. If you have OpenSSL installed you can likely fix this by
installing `pkg-config`.

', /build/cargo-edit-0.3.0-vendor/openssl-sys/build/main.rs:232:5
note: Run with `RUST_BACKTRACE=1` for a backtrace.

warning: build failed, waiting for other jobs to finish...
error: build failed
builder for '/nix/store/z322a42wbvcs89i78pgx5bhi1h9s05ld-cargo-edit-0.3.0.drv' failed with exit code 101
error: build of '/nix/store/z322a42wbvcs89i78pgx5bhi1h9s05ld-cargo-edit-0.3.0.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: cargo-edit

Partial log (click to expand)

test src/manifest.rs - manifest::Manifest::remove_from_table (line 296) ... ok

test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out

installing
post-installation fixup
strip is /nix/store/df6k4mgdjxciy0f637lryp7c9ln7n1m3-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/kwsp82q6954wq1lxs5sxhy0qqq8pc77b-cargo-edit-0.3.0/bin
patching script interpreter paths in /nix/store/kwsp82q6954wq1lxs5sxhy0qqq8pc77b-cargo-edit-0.3.0
/nix/store/kwsp82q6954wq1lxs5sxhy0qqq8pc77b-cargo-edit-0.3.0

@Mic92
Copy link
Member

Mic92 commented Sep 11, 2018

@GrahamcOfBorg build cargo-edit

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: cargo-edit

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/qamg4m7z4zsylsjkjxwdxm95y7vjwng1-cargo-edit-0.3.0
shrinking /nix/store/qamg4m7z4zsylsjkjxwdxm95y7vjwng1-cargo-edit-0.3.0/bin/cargo-upgrade
shrinking /nix/store/qamg4m7z4zsylsjkjxwdxm95y7vjwng1-cargo-edit-0.3.0/bin/cargo-rm
shrinking /nix/store/qamg4m7z4zsylsjkjxwdxm95y7vjwng1-cargo-edit-0.3.0/bin/cargo-add
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/qamg4m7z4zsylsjkjxwdxm95y7vjwng1-cargo-edit-0.3.0/bin
patching script interpreter paths in /nix/store/qamg4m7z4zsylsjkjxwdxm95y7vjwng1-cargo-edit-0.3.0
checking for references to /build in /nix/store/qamg4m7z4zsylsjkjxwdxm95y7vjwng1-cargo-edit-0.3.0...
/nix/store/qamg4m7z4zsylsjkjxwdxm95y7vjwng1-cargo-edit-0.3.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: cargo-edit

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/pbw04kiwi74x38qwhkgcsprf9awgbb7l-cargo-edit-0.3.0
shrinking /nix/store/pbw04kiwi74x38qwhkgcsprf9awgbb7l-cargo-edit-0.3.0/bin/cargo-rm
shrinking /nix/store/pbw04kiwi74x38qwhkgcsprf9awgbb7l-cargo-edit-0.3.0/bin/cargo-add
shrinking /nix/store/pbw04kiwi74x38qwhkgcsprf9awgbb7l-cargo-edit-0.3.0/bin/cargo-upgrade
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/pbw04kiwi74x38qwhkgcsprf9awgbb7l-cargo-edit-0.3.0/bin
patching script interpreter paths in /nix/store/pbw04kiwi74x38qwhkgcsprf9awgbb7l-cargo-edit-0.3.0
checking for references to /build in /nix/store/pbw04kiwi74x38qwhkgcsprf9awgbb7l-cargo-edit-0.3.0...
/nix/store/pbw04kiwi74x38qwhkgcsprf9awgbb7l-cargo-edit-0.3.0

@Mic92 Mic92 merged commit 12fbfbe into NixOS:master Sep 11, 2018
@Mic92
Copy link
Member

Mic92 commented Sep 11, 2018

Thanks!

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: cargo-edit

Partial log (click to expand)

test src/manifest.rs - manifest::Manifest::remove_from_table (line 296) ... ok

test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out

installing
post-installation fixup
strip is /nix/store/df6k4mgdjxciy0f637lryp7c9ln7n1m3-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/a6x5qpj82wysbmjmlfcpvhgdxw1zphhs-cargo-edit-0.3.0/bin
patching script interpreter paths in /nix/store/a6x5qpj82wysbmjmlfcpvhgdxw1zphhs-cargo-edit-0.3.0
/nix/store/a6x5qpj82wysbmjmlfcpvhgdxw1zphhs-cargo-edit-0.3.0

@alyssais alyssais deleted the cargo-edit branch November 2, 2018 11:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

Assignees
No one assigned
Labels
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
3 participants
@alyssais @Mic92 @GrahamcOfBorg