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

Commits on Oct 15, 2019

  1. cargo-make: 0.22.1 -> 0.22.2 

    https://github.com/sagiegurari/cargo-make/releases/tag/0.22.2

Also regenerated the lockfile and added it to the repo itself rather
than fetching it from a GitHub gist.
    @Ma27
    Ma27 committed Oct 15, 2019
    Copy the full SHA
    e071809 View commit details
Showing with 731 additions and 8 deletions.
  1. +727 −0 pkgs/development/tools/rust/cargo-make/Cargo.lock
  2. +4 −8 pkgs/development/tools/rust/cargo-make/default.nix
727 changes: 727 additions & 0 deletions pkgs/development/tools/rust/cargo-make/Cargo.lock
View file
12 changes: 4 additions & 8 deletions pkgs/development/tools/rust/cargo-make/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,30 +2,26 @@

rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.22.1";
version = "0.22.2";

src =
let
source = fetchFromGitHub {
owner = "sagiegurari";
repo = pname;
rev = version;
sha256 = "1wsams41zl56mkb8671n5fqkkchs68jd9nvfzry8axxiv7n175gc";
};
cargo-lock = fetchurl {
url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/850e9830f4ab4bc65da6eb5cd8b0911970a7739f/cargo-make-Cargo.lock";
sha256 = "0knmzplxmh8vksmpg56l2p1a10hpqbr9hmbk3hv0aj63125rhhqy";
sha256 = "17q6lcrn9xwgy20vvv7m3wxnf85k334751iksk89h9l1s2d36bcl";
};
in
runCommand "cargo-make-src" {} ''
cp -R ${source} $out
chmod +w $out
cp ${cargo-lock} $out/Cargo.lock
cp ${./Cargo.lock} $out/Cargo.lock
'';

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

cargoSha256 = "18j0nflf997z4nwdxifxp1ji1rbwqbg6zm2256j21am4ak45krsy";
cargoSha256 = "1mfsjxvyybq9d5702habxq5abcp9h11qx0ci2rqs2rgkbcnksk98";

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