diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-17 09:39:23 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-17 09:39:23 +0200 |
| commit | fe9a3e3e63fa59c8014d454b0efd3231bdd19350 (patch) | |
| tree | 3546e83902366b34599e8d5f6a698e37935a104d /pkgs/development/tools/rust | |
| parent | ed3cb39bfa7234e5bbf2b50ce6f658ef5fda686a (diff) | |
| parent | c68f58d95c0e34d91ff3e4f08464954fd0e9e466 (diff) | |
| download | nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.gz nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.bz2 nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.lz nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.xz nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.tar.zst nixpkgs-fe9a3e3e63fa59c8014d454b0efd3231bdd19350.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools/rust')
| -rw-r--r-- | pkgs/development/tools/rust/cargo-expand/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/tools/rust/cargo-make/default.nix | 10 |
2 files changed, 14 insertions, 10 deletions
diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 32cd368fb04..0a36efa79eb 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -1,18 +1,22 @@ -{ stdenv, rustPlatform, fetchFromGitHub, darwin }: +{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, darwin }: rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.4.12"; + version = "0.4.13"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "0m57v7mh7wdl0rdbad7vkvcgy93p9gcb971wap8i5nzjvzmp4wlb"; + sha256 = "0s3xd9dr0n64j0m38gd4cafrdr5vnpl557ks4wr0jszyhldnlfkz"; }; - cargoSha256 = "1wvqxj2w02d6zhyw3z5v0w4bfmbmldh63ygmvfxa3ngfb36gcacz"; - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + cargoSha256 = "13zz3n1p75267h3qrmvpmd8agnkbk8vfbr8s38wcyysck81pr4px"; + + buildInputs = [ llvmPackages.libclang ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; meta = with stdenv.lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 56f550e37a2..92e21bfc00e 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.21.0"; + version = "0.22.0"; src = let @@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "02hxf0mbk4nj9ja1z70k8fskh1kl3pixwy7gx0si5fbp9rmn04wk"; + sha256 = "13nl370immbhjarc0vfzrsflml3alh2f2zrh4znbks4yc3yp790z"; }; cargo-lock = fetchurl { - url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/b6017fd825b52987ac7c3b65620917e5d567312b/cargo-make-Cargo.lock"; - sha256 = "15ajxza58bbviwjxl98c0z89w4430902j0z46b594nbm02kv2ad9"; + url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/d31cfb3598d0a2886abd4d2ed43a02d493c8de8c/cargo-make-Cargo.lock"; + sha256 = "08fzl98d277n9xn3hrg9jahkqwdjfi5saajsppwzdbb3l7xw4jh2"; }; in runCommand "cargo-make-src" {} '' @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1fsfjavad1cbq1xvck2j5vyppxck606cpmqrwbs4fjvdmlbgx3gp"; + cargoSha256 = "0gj4a15slxnp31mlfgh57h3cwv0lnw5gdmkrmmj79migi96i5i6y"; # Some tests fail because they need network access. # However, Travis ensures a proper build. |