alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #46100 from alyssais/cargo-edit

Browse source 
cargo-edit: 0.2.0 -> 0.3.0
This commit is contained in:
Jörg Thalheim 2018-09-11 21:15:25 +01:00 committed by GitHub
parent f4a3427539 cea6bbfe75
commit 12fbfbe144
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 1926 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1905
pkgs/tools/package-management/cargo-edit/cargo-edit.nix
View file

File diff suppressed because it is too large Load diff

24
pkgs/tools/package-management/cargo-edit/default.nix
View file

@ -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 {
crateOverrides = defaultCrateOverrides // {
cargo-edit = attrs: rec {
rustPlatform.buildRustPackage rec {
name = "cargo-edit-${version}";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "killercup";
repo = "cargo-edit";
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;
buildInputs = lib.optional (!stdenv.isDarwin) openssl;
propagatedBuildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
patches = [ ./disable-network-based-test.patch ];
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;
};
};
};
}

10
pkgs/tools/package-management/cargo-edit/disable-network-based-test.patch Normal file
View file

@ -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");