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/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-18 08:57:16 -07:00
parent c227fb4b17 d189df235a
commit f7a112f6c4
264 changed files with 3781 additions and 1606 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, rustPlatform, fetchFromGitHub, lib, Security, nixosTests }:
{ stdenv, rustPlatform, fetchFromGitHub, lib, libiconv, Security, nixosTests }:
rustPlatform.buildRustPackage rec {
pname = "wireguard-exporter";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-lNFsO7FSmH1+DLM7ID0vn6234qTdtUoaLSnqKcbHoXE=";
buildInputs = lib.optional stdenv.isDarwin Security;
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
passthru.tests = { inherit (nixosTests.prometheus-exporters) wireguard; };