cargo-edit: 0.4.1 -> 0.4.2 #75052
Merged
cargo-edit: 0.4.1 -> 0.4.2 #75052
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Br1ght0ne
changed the title
|
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? |
|
@killercup ofBorg had the same issue. I'll patch it now. |
Br1ght0ne
force-pushed
the
cargo-edit-0.4.2
branch
from
a73acb7
to
aa7e6b0
Compare
Br1ght0ne
force-pushed
the
cargo-edit-0.4.2
branch
from
aa7e6b0
to
0b5751c
Compare
|
@GrahamcOfBorg build cargo-edit |
Gerschtli
approved these changes
Dec 6, 2019
Ma27
approved these changes
Dec 6, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
https://github.com/killercup/cargo-edit/releases/tag/v0.4.2
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @Gerschtli @jb55 @oxalica
This change is