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
base: ba5717a6f5d2
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 8a948668174c
Choose a head ref
  • 8 commits
  • 5 files changed
  • 5 contributors

Commits on Sep 11, 2018

  1. buildRustPackage, fetchcargo: optionally use vendor config from cargo… 

    …-vendor

By setting useRealVendorConfig explicitly to true, the actual (slightly
modified) config generated by cargo-vendor is used.

This solves a problem, where the static vendor config in
pkgs/build-support/rust/default.nix would not sufficiently replace all
crates Cargo is looking for.

As useRealVendorConfig (and writeVendorConfig in fetchcargo) default to
false, there should be no breakage in existing cargoSha256 hashes.

Nethertheless, imho using this new feature should become standard. A
possible deprecation path could be:

- introduce this patch
- set useRealVendorConfig explicitly to false whereever cargoSha256 is
  set but migration is not wanted yet.
- after some time, let writeVendorConfig default to true
- when useRealVendorConfig is true everywhere cargoSha256 is set and
  enough time is passed, `assert cargoVendorDir == null ->
  useRealVendorConfig;`, remove old behaviour
- after some time, remove all appearences of useRealVendorConfig and the
  parameter itself
    @erictapen @symphorien
    erictapen authored and symphorien committed Sep 11, 2018
    Copy the full SHA
    b66ef28 View commit details
    Browse the repository at this point in the history

  2. fetchcargo: normalise cargo config to ensure determinism

    @symphorien
    symphorien committed Sep 11, 2018
    Copy the full SHA
    ccf72b8 View commit details
    Browse the repository at this point in the history

  3. fectchcargo: don't break old sha256

    @symphorien
    symphorien committed Sep 11, 2018
    Copy the full SHA
    f20b229 View commit details
    Browse the repository at this point in the history

  4. fetchcargo: add type checking to cargo-vendor-normalise.py

    @Mic92 @symphorien
    Mic92 authored and symphorien committed Sep 11, 2018
    Copy the full SHA
    7bfa201 View commit details
    Browse the repository at this point in the history

  5. alacritty: switch back to upstream source 

    Thanks to #46362
We can now support git dependencies!
    @Mic92 @symphorien
    Mic92 authored and symphorien committed Sep 11, 2018
    Copy the full SHA
    33dab23 View commit details
    Browse the repository at this point in the history

  6. cargo-vendor-normalise: add a small install check

    @symphorien
    symphorien committed Sep 11, 2018
    Copy the full SHA
    a3e1da1 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2018

  1. fetchcargo: Fix cargo-vendor-normalise for darwin

    @infinisil
    infinisil committed Sep 17, 2018
    Copy the full SHA
    50578ab View commit details
    Browse the repository at this point in the history

  2. Merge pull request #46362 from symphorien/non-broken-fetchcargo 

    Non broken fetchcargo
    @Mic92
    Mic92 committed Sep 17, 2018
    Copy the full SHA
    8a94866 View commit details
    Browse the repository at this point in the history