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

Commits on Feb 28, 2020

  1. diffr: upgrade cargo fetcher and cargoSha256 

    Infra upgrade as part of #79975; no functional change expected.
    @bhipple
    bhipple committed Feb 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has been revoked.
    joachifm Joachim F.
    GPG key ID: 5C204DF675C90294
    Revoked
    Verified
    Learn about vigilant mode
    Copy the full SHA
    af30934 View commit details

  2. Merge pull request #81230 from bhipple/u/rust-cargo-diffr 

    diffr: upgrade cargo fetcher and cargoSha256
    @marsam
    marsam authored Feb 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has been revoked.
    joachifm Joachim F.
    GPG key ID: 5C204DF675C90294
    Revoked
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cec07cf View commit details
Showing with 1 addition and 4 deletions.
  1. +1 −4 pkgs/tools/text/diffr/default.nix
5 changes: 1 addition & 4 deletions pkgs/tools/text/diffr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1fpcyl4kc4djfl6a2jlj56xqra42334vygz8n7614zgjpyxz3zx2";
};

# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;

cargoSha256 = "1dddb3a547qnpm1vvrgffb3v9m8sh19hmhy0fg6xjqpm032lqx3v";
cargoSha256 = "17xgjk8li29b8q8p2bi56klqg0v2q0j6ich438c4p06jrszccx1f";

nativeBuildInputs = [];
buildInputs = (stdenv.lib.optional stdenv.isDarwin Security);