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: 168d253a00d9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7531309c6e9b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 1, 2019

  1. cargo-make: 0.19.3 -> 0.19.4

    @xrelkd
    xrelkd committed Jun 1, 2019
    Copy the full SHA
    e9d3a57 View commit details

Commits on Jun 3, 2019

  1. Merge pull request #62404 from xrelkd/update/cargo-make 

    cargo-make: 0.19.3 -> 0.19.4
    @marsam
    marsam authored Jun 3, 2019
    Copy the full SHA
    7531309 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/development/tools/rust/cargo-make/default.nix
10 changes: 5 additions & 5 deletions pkgs/development/tools/rust/cargo-make/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,19 +2,19 @@

rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.19.3";
version = "0.19.4";

src =
let
source = fetchFromGitHub {
owner = "sagiegurari";
repo = pname;
rev = version;
sha256 = "11mkfwvzsr86w9675zpq8gcq5avsfvwffca26h6gkc7ahqcsx3ac";
sha256 = "019dn401p4bds144fbvqxbnn8vswcj0lxr8cvgpxb2y22640z60l";
};
cargo-lock = fetchurl {
url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/3592410d14443cc6be675553a9c228401114fa5f/cargo-make-Cargo.lock";
sha256 = "0m8m2pn8y7n1js1kkva4lxahz5j4d73lj7l45h8dd30lw2w4n3hg";
url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/c5b9fde279a9f6d55d97e0ba4e0b4cd62e0ab2bf/cargo-make-Cargo.lock";
sha256 = "1d5md3m8hxwf3pwvx059fsk1b3vvqm17pxbbyiisn9v4psrsmld5";
};
in
runCommand "cargo-make-src" {} ''
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {

buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];

cargoSha256 = "00yvx87s8vngb97ldq2amdhdv3nn38liys7nilay73phx0xybx4p";
cargoSha256 = "0wf60ck0w3m9fa19dz99q84kw05sxlj2pp6bd8r1db3cfy8f8h8j";

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