aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-28Merge remote-tracking branch 'upstream/master' into ca-floating-upstreamJohn Ericson
2020-09-28Merge pull request #4064 from serokell/balsoft/fix-max-jobsEelco Dolstra
Fix max-jobs option
2020-09-28Merge pull request #4077 from Ma27/left-whitespace-logEelco Dolstra
libmain/progress-bar: don't trim whitespace on the left
2020-09-27doc/manual: update hacking docs (#4078)Maximilian Bosch
* By default, build artifacts should be installed into `outputs/` rather than `inst/`[1]. * Add instructions on how to run unit-tests. [1] 733d2e9402807e54d503c3113e854bfddb3d44e0
2020-09-27Miscellaneous spelling fixes in comments. (#4071)Kevin Quick
2020-09-26libmain/progress-bar: don't trim whitespace on the leftMaximilian Bosch
When running `nix build -L` it can be fairly hard to read the output if the build program intentionally renders whitespace on the left. A typical example is `g++` displaying compilation errors. With this patch, the whitespace on the left is retained to make the log more readable: ``` foo> no configure script, doing nothing foo> building foo> foobar.cc: In function 'int main()': foo> foobar.cc:5:5: error: 'wrong_func' was not declared in this scope foo> 5 | wrong_func(1); foo> | ^~~~~~~~~~ error: --- Error ------------------------------------------------------------------------------------- nix error: --- Error --- nix-daemon builder for '/nix/store/i1q76cw6cyh91raaqg5p5isd1l2x6rx2-foo-1.0.drv' failed with exit code 1 ```
2020-09-26Fix a typo (#4073)Mateusz Piotrowski
2020-09-25Merge pull request #3953 from obsidiansystems/basic-derivation-goal-outputsEelco Dolstra
Deduplicate basic derivation goals too
2020-09-25Merge pull request #3626 from W95Psp/masterEelco Dolstra
Make `functionArgs` primitive accept primops (fix #3624)
2020-09-25expectArg(): Respect the 'optional' flagEelco Dolstra
2020-09-25Merge pull request #4065 from paulopiyo777/flakeBranchEelco Dolstra
Remove redundant value checks
2020-09-24Remove redundant value checksPaul Opiyo
std::optional had redundant checks for whether it had a value. An object is emplaced either way so it can be dereferenced without repeating a value check
2020-09-25Fix max-jobs optionAlexander Bantyev
After 0ed946aa616bbf7ffe7f90d3309abdd27d875b10, 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 https://github.com/nixos/nix/issues/3763
2020-09-24Merge pull request #4063 from kquick/fix_hash-file_descEelco Dolstra
Fixes fall-through to report correct description of hash-file command.
2020-09-24Fixes fall-through to report correct description of hash-file command.Kevin Quick
2020-09-23Merge pull request #4054 from edolstra/fix-4021Eelco Dolstra
registerOutputs(): Don't call canonicalisePathMetaData() twice
2020-09-23Hopefully fix EPERM on macOSEelco Dolstra
2020-09-23Fix exceptionEelco Dolstra
2020-09-23Merge pull request #4057 from martinetd/btrfs-compressionEelco Dolstra
nix/store on btrfs compression: add workaround
2020-09-23lstat() cleanupEelco Dolstra
2020-09-23After rewriting a path, make it read-onlyEelco Dolstra
2020-09-23Test whether build/repair results are read-onlyEelco Dolstra
2020-09-23libutil/archive: add preallocate-contents optionDominique Martinet
Make archive preallocation (fallocate) optional because some filesystems like btrfs do not behave as expected with fallocate. See #3550.
2020-09-23DerivationGoal::registerOutputs(): Don't canonicalize twiceEelco Dolstra
Fixes #4021.
2020-09-23canonicalisePathMetaData_(): Change assertion to error messageEelco Dolstra
2020-09-23DerivationGoal::registerOutputs(): Fix bad format stringEelco Dolstra
2020-09-23Merge pull request #4055 from tweag/link-with-goldEelco Dolstra
Use gold as the linker on Linux
2020-09-23Use gold as the linker on Linuxregnat
Saves ~7s in the linking phase
2020-09-23Remove unused Flake::vOutputs fieldEelco Dolstra
2020-09-23Merge pull request #4052 from ujjwaljainnn/fix-typoDomen Kožar
fixed typo
2020-09-22fixed typoujjwal
2020-09-22Deduplicate basic derivation goals tooJohn Ericson
See comments for security concerns. Also optimize goal creation by not traversing map twice.
2020-09-22Merge remote-tracking branch 'origin/master' into non-ca-depending-on-caregnat
2020-09-22RemoteStore::addCAToStore(): Don't hold connection while calling queryPathInfo()Eelco Dolstra
This leads to a deadlock if we're at the connection limit.
2020-09-22Merge pull request #4038 from maljub01/masterEelco Dolstra
Add a nix.conf option for allowing a symlinked store
2020-09-22Style fixesEelco Dolstra
2020-09-22Merge branch 'add-ca-to-store' of https://github.com/hercules-ci/nixEelco Dolstra
2020-09-22Merge pull request #4040 from OmnipotentEntity/masterEelco Dolstra
Fix compatibility with nlohmann-json 3.9.1
2020-09-22Merge pull request #4041 from cole-h/enum-stringifyEelco Dolstra
Serialize SandboxMode enum to string for JSON
2020-09-22Merge pull request #4049 from tweag/remove-signed-unsigned-warningEelco Dolstra
Silence a compiler warning in serialise.hh
2020-09-22Merge pull request #4048 from tweag/dont-fortify-on-devEelco Dolstra
Disable `FORTIFY_SOURCE` when compiling without optims
2020-09-22Silence a compiler warning in serialise.hhregnat
Explicitely cast to `uint64_t` in `readNum` to avoid a "comparison between signed and unsigned" warning
2020-09-22Disable `FORTIFY_SOURCE` when compiling without optimsregnat
Otherwise the build is cluttered with ``` /nix/store/fwpn2f7a4iqszyydw7ag61zlnp6xk5d3-glibc-2.30-dev/include/features.h:382:4: warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp] 382 | # warning _FORTIFY_SOURCE requires compiling with optimization (-O) | ^~~~~~~ ``` when building with `OPTIMIZE=0`
2020-09-22Merge remote-tracking branch 'upstream/master' into ca-floating-upstreamJohn Ericson
2020-09-21Bump nlohmann-json version to 3.9.1Michael Reilly
2020-09-21Serialize SandboxMode enum to string for JSONCole Helbling
Rather than showing an integer as the default, instead show the boolean referenced in the description. The nix.conf.5 manpage used to show "default: 0", which is unnecessarily opaque and confusing (doesn't 0 mean false, even though the default is true?); now it properly shows that the default is true.
2020-09-21fmt.hh: Don't include boost/algorithm/string/replace.hppEelco Dolstra
This cuts compilation time by ~49s. Issue #4045.
2020-09-21Random header cleanupEelco Dolstra
2020-09-21abstractsettingtojson.hh -> abstract-setting-to-json.hhEelco Dolstra
2020-09-21Don't include nlohmann/json.hpp in globals.hhEelco Dolstra
This reduces compilation time by 207s. Issue #4045.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 13:19:53 +0000