public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-11 12:24:28 +00:00
committed by GitHub
parent 10e16ec9ab 5e7fe16211
commit 1e7a48b474
22 changed files with 903 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/rust/cargo-expand/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub }:
{ lib, rustPlatform, fetchFromGitHub, stdenv, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
@@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-1+A+n5VQS8zJULiR8IWLGo+RnFuVjg6ist8G3eCsXJM=";
buildInputs = lib.optional stdenv.isDarwin libiconv;
meta = with lib; {
description =
"A utility and Cargo subcommand designed to let people expand macros in their Rust source code";

4
pkgs/development/tools/rust/cargo-feature/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub }:
{ lib, rustPlatform, fetchFromGitHub, stdenv, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "cargo-feature";
@@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0nvl5smibl81b826xcsrjx8p89lcfpj7wqdsvywnj7jd3p5ag03n";
buildInputs = lib.optional stdenv.isDarwin libiconv;
meta = with lib; {
description = "Allows conveniently modify features of crate";
homepage = "https://github.com/Riey/cargo-feature";

4
pkgs/development/tools/rust/cargo-fuzz/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, rustPlatform }:
{ lib, fetchFromGitHub, rustPlatform, stdenv, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "cargo-fuzz";
@@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-eEfry6Q2YiIkNEHu6C8p17pUTF43eS1/iTP2oATZ/F8=";
buildInputs = lib.optional stdenv.isDarwin libiconv;
doCheck = false;
meta = with lib; {

7
pkgs/development/tools/rust/cargo-msrv/default.nix
View File

@@ -4,6 +4,9 @@
, nix-update-script
, pkg-config
, openssl
, stdenv
, libiconv
, Security
}:
rustPlatform.buildRustPackage rec {
@@ -28,7 +31,9 @@ rustPlatform.buildRustPackage rec {
# Integration tests fail
doCheck = false;
buildInputs = [ openssl ];
buildInputs = if stdenv.isDarwin
then [ libiconv Security ]
else [ openssl ];
nativeBuildInputs = [ pkg-config ];