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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2021-03-26 07:53:44 +01:00
parent 15151dabaf 26fdaef6b2
commit b3c854b60b
195 changed files with 3269 additions and 1871 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/tools/rust/crate2nix/default.nix
View File

@@ -12,13 +12,14 @@ rustPlatform.buildRustPackage rec {
pname = "crate2nix";
version = "0.9.0";
src = fetchFromGitHub
{
owner = "kolloch";
repo = pname;
rev = version;
sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM=";
} + "/crate2nix";
src = fetchFromGitHub {
owner = "kolloch";
repo = pname;
rev = version;
sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM=";
};
sourceRoot = "source/crate2nix";
cargoSha256 = "sha256-6V0ifH63/s5XLo4BCexPtvlUH0UQPHFW8YHF8OCH3ik=";

5
pkgs/development/tools/rust/sqlx-cli/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }:
{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security }:
rustPlatform.buildRustPackage rec {
pname = "sqlx-cli";
@@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "-p sqlx-cli" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security ];
meta = with lib; {
description =