mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 07:13:23 +01:00
Merge pull request #46100 from alyssais/cargo-edit
cargo-edit: 0.2.0 -> 0.3.0
This commit is contained in:
commit
12fbfbe144
3 changed files with 35 additions and 1926 deletions
File diff suppressed because it is too large
Load diff
|
@ -1,27 +1,31 @@
|
||||||
{ stdenv, pkgs, darwin, defaultCrateOverrides, fetchFromGitHub }:
|
{ stdenv, lib, darwin
|
||||||
|
, rustPlatform, fetchFromGitHub
|
||||||
|
, openssl, pkgconfig }:
|
||||||
|
|
||||||
((import ./cargo-edit.nix { inherit pkgs; }).cargo_edit {}).override {
|
rustPlatform.buildRustPackage rec {
|
||||||
crateOverrides = defaultCrateOverrides // {
|
name = "cargo-edit-${version}";
|
||||||
cargo-edit = attrs: rec {
|
version = "0.3.0";
|
||||||
name = "cargo-edit-${version}";
|
|
||||||
version = "0.2.0";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "killercup";
|
owner = "killercup";
|
||||||
repo = "cargo-edit";
|
repo = "cargo-edit";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1jxppbb7s50pwg24qxf79fqvm1clwm2zdnv0xlkay7y05nd5bc0c";
|
sha256 = "0ngxyzqy5pfc0fqbvqw7kd40jhqzp67qvpzvh3yggk9yxa1jzsp0";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
cargoSha256 = "1j7fqswdx6f2i5wr0pdavdvcv18j1l27a8ighr75p7f54apa27l8";
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
nativeBuildInputs = lib.optional (!stdenv.isDarwin) pkgconfig;
|
||||||
description = "A utility for managing cargo dependencies from the command line";
|
buildInputs = lib.optional (!stdenv.isDarwin) openssl;
|
||||||
homepage = https://github.com/killercup/cargo-edit;
|
propagatedBuildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
|
||||||
license = with licenses; [ mit ];
|
|
||||||
maintainers = with maintainers; [ gerschtli jb55 ];
|
patches = [ ./disable-network-based-test.patch ];
|
||||||
platforms = platforms.all;
|
|
||||||
};
|
meta = with lib; {
|
||||||
};
|
description = "A utility for managing cargo dependencies from the command line";
|
||||||
|
homepage = https://github.com/killercup/cargo-edit;
|
||||||
|
license = with licenses; [ mit ];
|
||||||
|
maintainers = with maintainers; [ gerschtli jb55 ];
|
||||||
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
--- cargo-edit.org/tests/cargo-upgrade.rs 2018-09-11 20:59:04.609532299 +0100
|
||||||
|
+++ cargo-edit/tests/cargo-upgrade.rs 2018-09-11 20:59:50.829435331 +0100
|
||||||
|
@@ -302,6 +302,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
+#[ignore] // requires network
|
||||||
|
fn upgrade_prints_messages() {
|
||||||
|
let (_tmpdir, manifest) = clone_out_test("tests/fixtures/upgrade/Cargo.toml.source");
|
||||||
|
|
Loading…
Reference in a new issue