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: 284eca792fdd
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d492f53faf4b
Choose a head ref
  • 11 commits
  • 26 files changed
  • 1 contributor

Commits on Nov 19, 2018

  1. ninja: make setup-hook.sh closer to setup.sh

    Things changed in the Ninja setup-hook:
    - Respect installFlags
    - Automatically add checkPhase (can be disabled with dontUseNinjaCheck
      in the same way as dontUseNinjaBuild and dontUseNinjaInstall). Tests
      are only run when "ninja test" exists.
    - Error in build phase when build.ninja is missing. We don’t have a
      way to fall back to other build methods, so it’s best to be very
      clear when we aren’t able to build with ninja
    - Set -l flag to 1 when enableParallelBuilding is disabled
    matthewbauer committed Nov 19, 2018
    Copy the full SHA
    69d1151 View commit details
    Browse the repository at this point in the history
  2. treewide: remove "ninja test" checkPhase

    This is now handled in the ninja setup hook.
    
    (cherry picked from commit f5e0997)
    matthewbauer committed Nov 19, 2018
    Copy the full SHA
    955fd85 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    9433a38 View commit details
    Browse the repository at this point in the history
  4. meson: remove check phase

    This is now handled in ninja.
    matthewbauer committed Nov 19, 2018
    Copy the full SHA
    f6f7283 View commit details
    Browse the repository at this point in the history
  5. treewide: remove ctest usages

    These are already in the generated makefiles!
    matthewbauer committed Nov 19, 2018
    Copy the full SHA
    2c47a42 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    4ebab3d View commit details
    Browse the repository at this point in the history
  7. ninja: don’t use build/install/check flags in setup-hook

    These don’t have much use in ninja, so easiest to leave them out.
    matthewbauer committed Nov 19, 2018
    Copy the full SHA
    a16c04c View commit details
    Browse the repository at this point in the history
  8. ninja: restore old -l flag value

    This can be set unconditionally to $NIX_BUILD_CORES according to
    @orivej.
    matthewbauer committed Nov 19, 2018
    Copy the full SHA
    b75d5ad View commit details
    Browse the repository at this point in the history
  9. cmake: set CTEST_OUTPUT_ON_FAILURE globally

    We should always use this.
    matthewbauer committed Nov 19, 2018
    Copy the full SHA
    285eb9a View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2018

  1. Copy the full SHA
    70e2b0b View commit details
    Browse the repository at this point in the history
  2. Merge pull request #50527 from matthewbauer/ninja-check-phase

    Add check phase to ninja setup hook
    matthewbauer committed Nov 20, 2018
    Copy the full SHA
    d492f53 View commit details
    Browse the repository at this point in the history