Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rdedup: fix broken build #82616

Merged
merged 1 commit into from Mar 15, 2020
Merged

rdedup: fix broken build #82616

merged 1 commit into from Mar 15, 2020

Conversation

bhipple
Copy link
Contributor

@bhipple bhipple commented Mar 14, 2020

In the Rust platform builder, the attribute cargoPatches must be used if we
want to consistently apply a patch to the Cargo.lock in the vendored
cargoDeps and to the Cargo.lock in the src attribute.

This fixes the build by applying that patch consistently, so the coherency
checker in the newer Rust cargo builder passes.

CC @misuzu

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

In the Rust platform builder, the attribute `cargoPatches` must be used if we
want to consistently apply a patch to the `Cargo.lock` in the vendored
`cargoDeps` and to the `Cargo.lock` in the `src` attribute.

This fixes the build by applying that patch consistently, so the coherency
checker in the newer Rust cargo builder passes.
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff LGTM
shows usage

[3 built, 9 copied (957.0 MiB), 164.0 MiB DL]
https://github.com/NixOS/nixpkgs/pull/82616
1 package built:
rdedup

@jonringer jonringer merged commit 1285836 into NixOS:master Mar 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants