Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 230b54c3cb44
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e2b327cd4e84
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Apr 7, 2020

  1. cargo-make: 0.30.2 -> 0.30.4 

    https://github.com/sagiegurari/cargo-make/releases/tag/0.30.3
https://github.com/sagiegurari/cargo-make/releases/tag/0.30.4
    @Ma27
    Ma27 committed Apr 7, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alyssais Alyssa Ross
    GPG key ID: F9DBED4859B271C0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    564af64 View commit details

  2. prometheus-wireguard-exporter: 3.2.4 -> 3.3.0 

    https://github.com/MindFlavor/prometheus_wireguard_exporter/releases/tag/3.3.0
    @Ma27
    Ma27 committed Apr 7, 2020
    Copy the full SHA
    e2b327c View commit details
2 changes: 1 addition & 1 deletion pkgs/development/tools/rust/cargo-make/Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkgs/development/tools/rust/cargo-make/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.30.2";
version = "0.30.4";

src =
let
source = fetchFromGitHub {
owner = "sagiegurari";
repo = pname;
rev = version;
sha256 = "1p7j80vqlrrprrlnaysng542kl3q87r6kv9mxzdb8605g1ma8wd6";
sha256 = "14sl7kcr1n3xb912vd3445pwf3v1kp74lgxlwqybnwiyh1dxihvg";
};
in
runCommand "source" {} ''
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];

cargoSha256 = "0j5ky547xlgfiz4mk7n7fhv1s9v697lvyqsjlj7jc5y9knx56n1j";
cargoSha256 = "06i1z5jjqyadmvjgwxjlxcj2mmb0g83byibl3ap9qffahn0vhf7x";

# Some tests fail because they need network access.
# However, Travis ensures a proper build.
6 changes: 3 additions & 3 deletions pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "wireguard-exporter";
version = "3.2.4";
version = "3.3.0";

src = fetchFromGitHub {
owner = "MindFlavor";
repo = "prometheus_wireguard_exporter";
rev = version;
sha256 = "15his6mv3vmzfg972fb8m01h2m3jxmaqz3zw2krfr136mvg2rvjw";
sha256 = "1c6zadqnn4b83yglcdn1hw54jj1c4makbdy6fli3cfb7sha1ynml";
};

cargoSha256 = "0ajkpshjv0im6falgjrsc2jdbvm2rhibl4v8rcmb2fg3kx7xc8vf";
cargoSha256 = "148982ypkxhab2kmijk9zwwi5l6nk4rcdwaz0r1j9fni47q49f35";

buildInputs = lib.optional stdenv.isDarwin Security;