aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2020-09-28Merge pull request #4077 from Ma27/left-whitespace-logEelco Dolstra
libmain/progress-bar: don't trim whitespace on the left
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-26Remove redundant nar hash and size settingJohn Ericson
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2020-09-26Fix up BinaryCacheStore::addToStore taking a pathJohn Ericson
2020-09-26BinaryCacheStore::addTextToStore include CA fieldJohn Ericson
2020-09-26Merge remote-tracking branch 'obsidian/master' into ↵John Ericson
binary-cache-addToStoreFromDump
2020-09-25Use "?dir=..." portion of "registry add" local path specification.Kevin Quick
The registry targets generally follow a URL formatting schema with support for a query parameter of "?dir=subpath" to specify a sub-path location below the URL root. Alternatively, an absolute path can be specified. This specification mode accepts the query parameter but ignores/drops it. It would probably be better to either (a) disallow the query parameter for the path form, or (b) recognize the query parameter and add to the path. This patch implements (b) for consistency, and to make it easier for tooling that might switch between a remote git reference and a local path reference. See also issue #4050.
2020-09-25Merge remote-tracking branch 'origin/master' into github-api-tokenGregory Hale
2020-09-25stdout_ -> coutJohn Ericson
Better to get creative than just sprinkle arbitrary underscores.
2020-09-25Merge pull request #3953 from obsidiansystems/basic-derivation-goal-outputsEelco Dolstra
Deduplicate basic derivation goals too
2020-09-25Re-add support for github-access-token, but mark as deprecated.Kevin Quick
2020-09-25Fix reference to older name for access-tokens config value.Kevin Quick
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-24Update to use access-tokens configuration for github/gitlab access.Kevin Quick
This change provides support for using access tokens with other instances of GitHub and GitLab beyond just github.com and gitlab.com (especially company-specific or foundation-specific instances). This change also provides the ability to specify the type of access token being used, where different types may have different handling, based on the forge type.
2020-09-24Complete conversion of "url" to "host" with associated variable renaming.Kevin Quick
Completes the change begun in commit 56f1e0d to consistently use the "host" attribute for "github" and "gitlab" inputs instead of a "url" attribute.
2020-09-24Support StringMap configuration settings.Kevin Quick
Allows Configuration values that are space-separated key=value pairs.
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-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-23lstat() cleanupEelco Dolstra
2020-09-23After rewriting a path, make it 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-23Return more info from `BinaryCacheStore::addToStoreCommon`John Ericson
We don't need it yet, but we could/should in the future, and it's a cost-free change since we already have the reference. I like it. Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2020-09-23Clarify FIXME in `BinaryCacheStore::addToStoreCommon`John Ericson
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2020-09-23Remove unused Flake::vOutputs fieldEelco Dolstra
2020-09-23Merge pull request #4052 from ujjwaljainnn/fix-typoDomen Kožar
fixed typo
2020-09-23Get rid of Hash::dummy from BinaryCacheStoreJohn Ericson
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 'upstream/master' into templated-daemon-protocolJohn Ericson
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-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-22Merge remote-tracking branch 'upstream/master' into ca-floating-upstreamJohn Ericson
2020-09-22Merge remote-tracking branch 'upstream/master' into templated-daemon-protocolJohn 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.