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: b18d66f5d588
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 85e5cc38f8a8
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Apr 24, 2020

  1. cargo-make: 0.30.5 -> 0.30.6 

    https://github.com/sagiegurari/cargo-make/releases/tag/0.30.6
(cherry picked from commit 2a77540)
    @Ma27
    Ma27 committed Apr 24, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    GPG key ID: BE743C5DD7703515
    Verified
    Learn about vigilant mode
    Copy the full SHA
    85e5cc3 View commit details
Showing with 372 additions and 388 deletions.
  1. +369 −385 pkgs/development/tools/rust/cargo-make/Cargo.lock
  2. +3 −3 pkgs/development/tools/rust/cargo-make/default.nix
754 changes: 369 additions & 385 deletions pkgs/development/tools/rust/cargo-make/Cargo.lock
View file

Large diffs are not rendered by default.

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.5";
version = "0.30.6";

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

cargoSha256 = "0l3k4k63zx4gbdp5bnamrnhib2pw6z0d1ff06n8v2z7rcrawhlyx";
cargoSha256 = "002nqa35m0b45vv1rxxiq3w6y1a8h5zp47dc0v6rkl6ihm1wmdfc";

# Some tests fail because they need network access.
# However, Travis ensures a proper build.