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: d49b38b73ccb
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: ba20bc872f32
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 14, 2020

  1. Revert "buildRustPackage: fix cargoBuildFlags"

    This reverts commit deb7815.
    
    Mixing up two distinct phases of a derivation's build is not a good idea. See
    also #91689 (comment).
    Ma27 committed Jul 14, 2020
    Copy the full SHA
    7713fba View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2020

  1. rustPlatform: don't install artifacts modified by checkPhase

    While the artifacts from `buildPhase` should be used for testing as
    well, it should be avoided that those are modified during `checkPhase`.
    
    This can happen if a package is built e.g. with special
    `cargoBuildFlags` that don't apply to the `checkPhase`. In that case, a
    binary would be installed into `$out` without those flags since
    `checkPhase` overrides the binary in the `target`-directory.
    
    This patch copies the state of `target/release` into a temporary
    location at the end of the `buildPhase` and installs the results from
    that temporary directory into `$out` while `checkPhase` can continue
    using the configured build-dir.
    
    cc #91689
    Closes #93119
    Closes #91191
    Ma27 committed Jul 15, 2020
    Copy the full SHA
    d2694d9 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2020

  1. Merge pull request #93128 from Ma27/fix-rust-build-flags

    rust: Fix build flags
    flokli committed Jul 16, 2020
    Copy the full SHA
    ba20bc8 View commit details
    Browse the repository at this point in the history