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: 5df687c31602
Choose a base ref
...
head repository: NixOS/nix
compare: 649c465873b2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 24, 2020

  1. Fix max-jobs option 

    After 0ed946a, max-jobs setting (-j/--max-jobs)
stopped working.

The reason was that nrLocalBuilds (which compared to maxBuildJobs to figure
out whether the limit is reached or not) is not incremented yet when tryBuild
is started; So, the solution is to move the check to tryLocalBuild.

Closes #3763
    @balsoft
    balsoft committed Sep 24, 2020
    Copy the full SHA
    ed218e1 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2020

  1. Merge pull request #4064 from serokell/balsoft/fix-max-jobs 

    Fix max-jobs option
    @edolstra
    edolstra committed Sep 28, 2020
    Copy the full SHA
    649c465 View commit details
    Browse the repository at this point in the history