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

Commits on Jan 12, 2021

  1. Don't let 'preferLocalBuild' override 'max-jobs=0' 

    This resolves #3810 by changing the behavior of `max-jobs = 0`, so
that specifying the option also avoids local building of derivations
with the attribute `preferLocalBuild = true`.
    @rickynils
    rickynils committed Jan 12, 2021
    Copy the full SHA
    44fd7a0 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2021

  1. Remove a redundant condition in DerivationGoal::tryLocalBuild()

    @rickynils
    rickynils committed Jan 13, 2021
    Copy the full SHA
    0ca1a50 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4443 from rickynils/prefer-local-build-respect-ze… 

    …ro-max-jobs

Don't let 'preferLocalBuild' override 'max-jobs=0'
    @edolstra
    edolstra committed Jan 13, 2021
    Copy the full SHA
    fbfa70d View commit details
    Browse the repository at this point in the history