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: be7c11c439ad
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 677e3960b51e
Choose a head ref
  • 13 commits
  • 13 files changed
  • 4 contributors

Commits on May 6, 2020

  1. rustPlatform: increase build-speed of checkPhase for rust-packages

    When running `cargo test --release`, the artifacts from `buildPhase`
    will be reused here. Previously, most of the stuff had to be recompiled
    without optimizations.
    Ma27 committed May 6, 2020
    Copy the full SHA
    04248f6 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2020

  1. rustPlatform: don't install test executables

    This is done by gathering all binaries to install before running the
    checkPhase.
    Ma27 committed May 8, 2020
    Copy the full SHA
    e32c005 View commit details
    Browse the repository at this point in the history
  2. rustPlatform: fix log

    Ma27 committed May 8, 2020
    Copy the full SHA
    f236714 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2020

  1. Merge branch 'staging-next' into PR 82342

    Hydra nixpkgs: ?compare=1586582
    vcunat committed May 11, 2020
    Copy the full SHA
    5eaabaf View commit details
    Browse the repository at this point in the history

Commits on May 12, 2020

  1. Copy the full SHA
    736462d View commit details
    Browse the repository at this point in the history
  2. rustPlatform: add buildAndTestSubdir-argument

    There are several tarballs (such as the `rust-lang/rust`-source) with a
    `Cargo.toml` at root and several sub-packages (with their own Cargo.toml)
    without using workspaces[1].
    
    In such a case it's needed to move into a subdir to only build the
    specified sub-package (e.g. `rustfmt` or `rsl`), however the artifacts
    are at `/target` in the root-dir of the build environment. This breaks
    the build since `buildRustPackage` searches for executables in `target`
    (which is at the build-env's root) at the end of the `buildPhase`.
    
    With the optional `buildAndTestSubdir`-argument, the builder moves into
    the specified subdir using `pushd`/`popd` during `buildPhase` and
    `checkPhase`.
    
    Also moved the logic to find executables and libs to the end of the `buildPhase`
    from a custom `postBuild`-hook to fix packages with custom `build`/`install`-procedures
    such as `uutils-coreutils`.
    
    [1] https://doc.rust-lang.org/book/ch14-03-cargo-workspaces.html
    Ma27 committed May 12, 2020
    Copy the full SHA
    6b23cfe View commit details
    Browse the repository at this point in the history
  3. cargo-deb: fix build

    Ma27 committed May 12, 2020
    Copy the full SHA
    0d7f889 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2020

  1. nym: fix tests

    A lot of tests are using `debug_assert!` which isn't available in
    release-mode.
    Ma27 committed May 13, 2020
    Copy the full SHA
    e49f3a4 View commit details
    Browse the repository at this point in the history
  2. gnvim: fix build

    When running the default builder for Rust, the artifacts would be stored
    in `target/<arch>/<profile>`, however the `install`-target expects the
    default structure (`target/<profile>`) of `cargo`-builds.
    
    When using the Makefile for building as well, the expected structure is
    created instead.
    Ma27 committed May 13, 2020
    Copy the full SHA
    068beb2 View commit details
    Browse the repository at this point in the history
  3. ripasso-cursive: fix tests

    Needed since we store artifacts in `target/<arch>/<profile>`.
    Ma27 committed May 13, 2020
    Copy the full SHA
    913dcdd View commit details
    Browse the repository at this point in the history

Commits on May 24, 2020

  1. Copy the full SHA
    6574ba1 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2020

  1. rust: improve docs

    Co-authored-by: cole-h <cole.e.helbling@outlook.com>
    Co-authored-by: asymmetric <lorenzo@mailbox.org>
    3 people committed May 31, 2020
    Copy the full SHA
    59e8e7a View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2020

  1. Merge #82342: rustPlatform: increase build-speed of checkPhase

    ...for rust-packages (into staging)
    vcunat committed Jun 5, 2020
    Copy the full SHA
    677e396 View commit details
    Browse the repository at this point in the history