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

cargo-edit: 0.4.1 -> 0.4.2 #75052

Merged
merged 2 commits into from Dec 6, 2019
Merged

cargo-edit: 0.4.1 -> 0.4.2 #75052

merged 2 commits into from Dec 6, 2019

Conversation

@Br1ght0ne
Copy link
Contributor

@Br1ght0ne Br1ght0ne commented Dec 5, 2019

Motivation for this change

https://github.com/killercup/cargo-edit/releases/tag/v0.4.2

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)
/nix/store/i94wymlizbhdgdpbjgiaklx3y8hwh1q6-cargo-edit-0.4.1	  45.1M
/nix/store/qk1075rapncsxcp3brc4vkk9wkq7dhk5-cargo-edit-0.4.2	  44.7M
Notify maintainers

cc @Gerschtli @jb55 @oxalica


This change is Reviewable

@Br1ght0ne Br1ght0ne changed the title https://github.com/killercup/cargo-edit/releases/tag/v0.4.2cargo-edit: 0.4.1 -> 0.4.2 cargo-edit: 0.4.1 -> 0.4.2 Dec 5, 2019
@Br1ght0ne Br1ght0ne marked this pull request as ready for review Dec 5, 2019
@ofborg ofborg bot requested review from Gerschtli and jb55 Dec 5, 2019
Copy link
Contributor

@Gerschtli Gerschtli left a comment

LGTM

@oxalica
oxalica approved these changes Dec 5, 2019
Copy link
Contributor

@oxalica oxalica left a comment

LGTM.

@killercup
Copy link
Member

@killercup killercup commented Dec 5, 2019

Huh, so this didn't build for me on macOS and I had to

diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix
index 51c6def02c1..bad92e2c1a1 100644
--- a/pkgs/tools/package-management/cargo-edit/default.nix
+++ b/pkgs/tools/package-management/cargo-edit/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, darwin
 , rustPlatform, fetchFromGitHub
-, openssl, pkgconfig }:
+, openssl, pkgconfig, libiconv }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-edit";
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
   cargoSha256 = "0prd53p20cha2y2qp8dmq0ywd32f6jm8mszdkbi4x606dj9bcgbl";
 
   nativeBuildInputs = lib.optional (!stdenv.isDarwin) pkgconfig;
-  buildInputs = lib.optional (!stdenv.isDarwin) openssl;
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
   propagatedBuildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
 
   meta = with lib; {

Can someone verify that this isn't just my broken setup?

@Br1ght0ne
Copy link
Contributor Author

@Br1ght0ne Br1ght0ne commented Dec 5, 2019

@killercup ofBorg had the same issue. I'll patch it now.

@Br1ght0ne Br1ght0ne force-pushed the Br1ght0ne:cargo-edit-0.4.2 branch from a73acb7 to aa7e6b0 Dec 5, 2019
Br1ght0ne added 2 commits Dec 5, 2019
@Br1ght0ne Br1ght0ne force-pushed the Br1ght0ne:cargo-edit-0.4.2 branch from aa7e6b0 to 0b5751c Dec 5, 2019
@Br1ght0ne
Copy link
Contributor Author

@Br1ght0ne Br1ght0ne commented Dec 5, 2019

@GrahamcOfBorg build cargo-edit

@ofborg ofborg bot requested a review from Gerschtli Dec 5, 2019
Copy link
Contributor

@Gerschtli Gerschtli left a comment

Built locally and tested binaries, LGTM

@Ma27
Ma27 approved these changes Dec 6, 2019
@Ma27 Ma27 merged commit ec8bca8 into NixOS:master Dec 6, 2019
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
cargo-edit on aarch64-linux Success
Details
cargo-edit on x86_64-darwin Success
Details
cargo-edit 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.