aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-30Merge remote-tracking branch 'upstream/master' into templated-daemon-protocolJohn Ericson
2020-09-30nix::worker_proto -> worker_protoJohn Ericson
2020-09-30Revert "Use template structs instead of phantoms"John Ericson
This reverts commit 9ab07e99f527d1fa3adfa02839da477a1528d64b.
2020-09-29Remove github-access-token in favor of access-token.Kevin Quick
2020-09-29Merge branch 'kwq/path-dir-query' of https://github.com/kquick/nixEelco Dolstra
2020-09-29nix registry list: Show 'dir' attributeEelco Dolstra
Issue #4050.
2020-09-29Merge branch 'master' into access-tokensKevin Quick
2020-09-29Merge branch 'master' of github.com:NixOS/nixEelco Dolstra
2020-09-29Make Headers an optional argumentEelco Dolstra
2020-09-29CleanupEelco Dolstra
2020-09-29Merge pull request #4084 from ↵Domen Kožar
NixOS/dependabot/github_actions/cachix/install-nix-action-v11 Bump cachix/install-nix-action from v10 to v11
2020-09-29Merge branch 'github-api-token' of https://github.com/imalsogreg/nixEelco Dolstra
2020-09-29Merge pull request #3958 from obsidiansystems/ca-floating-upstreamEelco Dolstra
CA derivations that depend on other CA derivations
2020-09-29Merge pull request #4085 from 0mp/patch-2Eelco Dolstra
Fix tar invocation on FreeBSD
2020-09-28Clarify comment a bitJohn Ericson
2020-09-28Update .github/workflows/test.ymlDomen Kožar
2020-09-28Update .github/workflows/test.ymlDomen Kožar
2020-09-28Use `drvPath2` and give it a better nameJohn Ericson
2020-09-28Merge remote-tracking branch 'upstream/master' into ca-floating-upstreamJohn Ericson
2020-09-28Update src/libstore/binary-cache-store.ccJohn Ericson
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2020-09-28Fix tar invocation on FreeBSDMateusz Piotrowski
tar(1) on FreeBSD does not use standard output or input when the -f flag is not provided. Instead, it defaults to /dev/sa0 on FreeBSD. Make this tar invocation a bit more robust and explicitly tell tar(1) to use standard output. This is one of the issues discovered while porting Nix to FreeBSD. It has been tested and committed locally to FreeBSD ports: https://svnweb.freebsd.org/ports/head/sysutils/nix/Makefile?revision=550026&view=markup#l108
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-28Bump cachix/install-nix-action from v10 to v11dependabot[bot]
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from v10 to v11. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](https://github.com/cachix/install-nix-action/compare/v10...95a8068e317b8def9482980abe762f36c77ccc99) Signed-off-by: dependabot[bot] <support@github.com>
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-26Remove redundant nar hash and size settingJohn Ericson
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2020-09-26Fix a typo (#4073)Mateusz Piotrowski
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-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-25Merge pull request #4065 from paulopiyo777/flakeBranchEelco Dolstra
Remove redundant value checks
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-24Update document generation for empty json object values.Kevin Quick
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 12:45:15 +0000