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

Commits on Jan 12, 2020

  1. rustPlatform.buildRustPackage: cleaner output on verifyCargoDeps (#77567 

    )

When this fails, the user may want to copy-paste the path to the "bad"
Cargo.lock file to inspect. The trailing `.` on `$cargoDeps.` gets caught in
most terminal copy-pastes. Since half the lines already don't have it, this
removes it from all of them for consistent output.
    @bhipple @zimbatm
    bhipple authored and zimbatm committed Jan 12, 2020
    Copy the full SHA
    6e8c377 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/build-support/rust/default.nix
4 changes: 2 additions & 2 deletions pkgs/build-support/rust/default.nix
View file
Original file line number Diff line number Diff line change
@@ -100,9 +100,9 @@ stdenv.mkDerivation (args // {
'' + stdenv.lib.optionalString verifyCargoDeps ''
if ! diff source/Cargo.lock $cargoDeps/Cargo.lock ; then
echo
echo "ERROR: cargoSha256 is out of date."
echo "ERROR: cargoSha256 is out of date"
echo
echo "Cargo.lock is not the same in $cargoDeps."
echo "Cargo.lock is not the same in $cargoDeps"
echo
echo "To fix the issue:"
echo '1. Use "1111111111111111111111111111111111111111111111111111" as the cargoSha256 value'