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: d0fcf24c6195
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 60fea726dea1
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 16, 2020

  1. buildRustCrate: remove one of the odd library filename cases

    It used to be the case (ref missing) that cargo did treat
    `src/$libName.rs` as an alternative to `src/lib.rs` when the latter
    wasn't present. Recently I failed to reproduce that with vanilla cargo
    and it started to cause pain with some crates of the form:
    
    some_crate/
     `- src
       `- main.rs
       `- some_crate.rs
    
    We would build `src/some_crate.rs` and thing it is a library while that
    might not be the actual case. This crate is a valid `bin` crate not a
    `lib` crate as far as I can tell from the samples I took.
    
    I removed support for the previously required heuristic and commented
    out the test cases in case we will need them again. We could crawl in
    the Git history but chances are that the next person looking into this
    doesn't know about the history.
    andir committed Jan 16, 2020
    Copy the full SHA
    29a8575 View commit details
    Browse the repository at this point in the history
  2. buildRustCrateTests: use releaseTools.aggregate

    Previously I did use `runCommand` to do the same. Using
    releaseTools.aggregate seems a lot saner and we might get nicer hydra
    output of the tests that are failing.
    andir committed Jan 16, 2020
    Copy the full SHA
    69c96ad View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2020

  1. Merge pull request #77822 from andir/buildRustCrate-remove-custom-lib…

    …-path
    
    buildRustCrate: remove custom lib path heuristic
    andir committed Jan 21, 2020
    Copy the full SHA
    60fea72 View commit details
    Browse the repository at this point in the history