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

Conflicts:
  pkgs/tools/package-management/cargo-release/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-18 11:03:38 -07:00
21 changed files with 264 additions and 238 deletions
@@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, nixosTests }:
{ lib, stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, nixosTests, Security }:
rustPlatform.buildRustPackage rec {
pname = "unbound-telemetry";
@@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
buildInputs = [ openssl ]
++ lib.optional stdenv.isDarwin Security;
passthru.tests = {
inherit (nixosTests.prometheus-exporters) unbound;