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

Commits on Jan 24, 2020

  1. cargo-make: 0.26.1 -> 0.26.2 

    https://github.com/sagiegurari/cargo-make/releases/tag/0.26.2
    @Ma27
    Ma27 committed Jan 24, 2020
    Copy the full SHA
    7f723b1 View commit details
Showing with 315 additions and 149 deletions.
  1. +307 −144 pkgs/development/tools/rust/cargo-make/Cargo.lock
  2. +8 −5 pkgs/development/tools/rust/cargo-make/default.nix
451 changes: 307 additions & 144 deletions pkgs/development/tools/rust/cargo-make/Cargo.lock
View file
13 changes: 8 additions & 5 deletions pkgs/development/tools/rust/cargo-make/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, runCommand, fetchFromGitHub, rustPlatform, Security }:
{ stdenv, fetchurl, runCommand, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config }:

rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.26.1";
version = "0.26.2";

src =
let
source = fetchFromGitHub {
owner = "sagiegurari";
repo = pname;
rev = version;
sha256 = "04h8vr8k790kkn09yrqv7py0sn2fmj4b51c4kjhplr0pcxkbdbdn";
sha256 = "022krw38kyvv9wr8v7rnwp21d64pdiivwgvbmdix725dlypl43h4";
};
in
runCommand "cargo-make-src" {} ''
@@ -19,9 +19,12 @@ rustPlatform.buildRustPackage rec {
cp ${./Cargo.lock} $out/Cargo.lock
'';

buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
nativeBuildInputs = [ pkg-config ];

cargoSha256 = "05m966h58mgq1bm92yfzzpd4ivlv4jh5fy1kfazcfsfw2k0kqmka";
buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];

cargoSha256 = "10ij0k428ia9yy8j1dr9f6xf1cgc8778prry4bp8ribd3wymxs1j";

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