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

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
	pkgs/development/tools/rust/cargo-cache/default.nix
	pkgs/development/tools/rust/cargo-embed/default.nix
	pkgs/development/tools/rust/cargo-flash/default.nix
	pkgs/servers/nosql/influxdb2/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-17 07:01:38 -07:00
parent 3ff6965554 631cbc3de7
commit c227fb4b17
113 changed files with 1041 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/rust/cargo-cache/default.nix
View File

@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-cache";
version = "0.6.1";
version = "0.6.2";
src = fetchFromGitHub {
owner = "matthiaskrgr";
repo = pname;
rev = version;
sha256 = "sha256-qRwyNSAYuAnU17o/5zqKuvixQw7xfA6wNVzN6QRbZlY=";
sha256 = "sha256-/xP6TQcLyY1XC8r5SCkwej/I6fMaV5PqNNuvK1WbmeM=";
};
cargoSha256 = "sha256-qAq5B/BivQr8yuHtyFGTRigAa5dG2rboc0aD44/38FQ=";
cargoSha256 = "sha256-1ZNbqydRsXmMGLhqPrgNAE8bhpZCMAJO/YQbOvtiS/s=";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];

6
pkgs/development/tools/rust/cargo-crev/default.nix
View File

@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-crev";
version = "0.19.2";
version = "0.19.4";
src = fetchFromGitHub {
owner = "crev-dev";
repo = "cargo-crev";
rev = "v${version}";
sha256 = "sha256-aqvdAljAJsYtmxz/WtMrrnmJJRXDpqDjUn1LusoM8ns=";
sha256 = "sha256-XwwzMo06TdyOtGE9Z48mkEr6DnB/89wtMrW+UWr0G/Q=";
};
cargoSha256 = "sha256-KwnZmehh0vdR1eSPBrY6yHJR6r7mhIEgfN4soEBDTjU=";
cargoSha256 = "sha256-gA2Fg4CCi0W+GqJoNPZWw/OjNYh2U2UsC6eMZ9W1QN8=";
nativeBuildInputs = [ perl pkg-config ];

12
pkgs/development/tools/rust/cargo-embed/default.nix
View File

@@ -1,22 +1,24 @@
{ lib
, rustPlatform, fetchFromGitHub
, libusb1, pkg-config, rustfmt }:
, libusb1, libftdi1, pkg-config, rustfmt }:
rustPlatform.buildRustPackage rec {
pname = "cargo-embed";
version = "0.8.0";
version = "0.10.1";
src = fetchFromGitHub {
owner = "probe-rs";
repo = pname;
rev = "v${version}";
sha256 = "0klkgl7c42vhqxj6svw26lcr7rccq89bl17jn3p751x6281zvr35";
sha256 = "1z8n883cb4jca3phi9x2kwl01xclyr00l8jxgiyd28l2jik78i5k";
};
cargoSha256 = "1nqrij4j8787x7zqgdcscf8i436s19gwk08nyixhmf9sprcfb0ck";
cargoSha256 = "1ir9qngxmja6cm42m40jqbga9mlfjllm23ca26wyigjv3025pi6i";
nativeBuildInputs = [ pkg-config rustfmt ];
buildInputs = [ libusb1 ];
buildInputs = [ libusb1 libftdi1 ];
cargoBuildFlags = [ "--features=ftdi" ];
meta = with lib; {
description = "A cargo extension for working with microcontrollers";

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

@@ -23,9 +23,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-P7xyg9I1MhmiKlyAI9cvABcYKNxB6TSvTgMsMk5KxAQ=";
nativeBuildInputs = [ pkg-config rustfmt ];
buildInputs = [ libusb1 ]
++ lib.optionals (!stdenv.isDarwin) [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security ];
buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; {
description = "A cargo extension for working with microcontrollers";