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

Merge branch 'staging-next' into staging

Browse Source 
The transmission conflict was non-trivial:
- libbrotli added to apparmor rules <https://github.com/NixOS/nixpkgs/commit/1bdda029cd85b5f4358697afd2c8f6a1996c6ccf>
- apparmor rules rewritten <https://github.com/NixOS/nixpkgs/commit/b280e64078d69c59cf4fccfcaa9d56a59d789dc9>

Chosen the rewrite and verified that brotli is part of the rule set generated by `apparmorRulesFromClosure`.
This commit is contained in:
Jan Tojnar
2021-05-06 08:42:50 +02:00
parent bc29d22a2c 305e1c9446
commit d9f177eb4d
73 changed files with 365 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/rust/cargo-watch/default.nix
+5 -5
View File
@@ -1,19 +1,19 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust }:
{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "cargo-watch";
version = "7.6.1";
version = "7.7.2";
src = fetchFromGitHub {
owner = "passcod";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vjX8xfwv/DOogji+OQCB9l5ebGBNoLW722TGpZ5Wg80=";
sha256 = "sha256-ocibNgH2xw0BrJRmHCAahO6hPLmlDmwjjzo7mMWp9FU=";
};
cargoSha256 = "sha256-ku+tI0DIofV0EZ413sPjbJDUSqwTxiT8NWBeURrJW1k=";
cargoSha256 = "sha256-6ztMEfVOlsyUtIeH+Qd/l7khC7XOHKc4bWsDd27RNu8=";
buildInputs = lib.optional stdenv.isDarwin CoreServices;
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
# `test with_cargo` tries to call cargo-watch as a cargo subcommand
# (calling cargo-watch with command `cargo watch`)
pkgs/development/tools/rust/sqlx-cli/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security }:
{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "sqlx-cli";
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security ];
++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security libiconv ];
meta = with lib; {
description =