John Ericson
|
422affe102
|
tabs -> spaces
Sorry I let the tab sneak in there in the first place.
|
2020-08-21 19:19:24 +00:00 |
|
John Ericson
|
c265e0ea82
|
Merge remote-tracking branch 'upstream/master' into templated-daemon-protocol
|
2020-08-20 20:24:22 +00:00 |
|
John Ericson
|
27a3f82c0b
|
Merge remote-tracking branch 'upstream/master' into single-ca-drv-build
|
2020-08-20 18:28:17 +00:00 |
|
John Ericson
|
45a2f1baab
|
Rename drv output querying functions, like master
- `queryDerivationOutputMapAssumeTotal` -> `queryPartialDerivationOutputMap`
- `queryDerivationOutputMapAssumeTotal` -> `queryDerivationOutputMap
|
2020-08-20 18:14:12 +00:00 |
|
Eelco Dolstra
|
4d77513d97
|
Merge pull request #3859 from obsidiansystems/drv-outputs-map-allow-missing
`queryDerivationOutputMap` no longer assumes all outputs have a mapping
|
2020-08-20 16:49:23 +02:00 |
|
John Ericson
|
9a9d834dc7
|
Rename drv output querying functions
- `queryDerivationOutputMapAssumeTotal` -> `queryPartialDerivationOutputMap`
- `queryDerivationOutputMapAssumeTotal` -> `queryDerivationOutputMap`
|
2020-08-20 14:12:51 +00:00 |
|
Rok Garbas
|
8ce88adad9
|
set Content-Type to "text/plain" for install script
fixes #3947
|
2020-08-20 13:21:22 +02:00 |
|
Eelco Dolstra
|
25ecfffdc3
|
Remove PrimOp constructor
|
2020-08-20 12:34:04 +02:00 |
|
Eelco Dolstra
|
dc2f278c95
|
Allow 'nix' subcommands to provide docs in Markdown format
|
2020-08-20 12:21:46 +02:00 |
|
Eelco Dolstra
|
3c4f8c9175
|
List deprecated option aliases in the docs
|
2020-08-20 11:13:17 +02:00 |
|
Eelco Dolstra
|
acb99f03f9
|
Config: Use nlohmann/json
|
2020-08-20 11:02:16 +02:00 |
|
Eelco Dolstra
|
0d7376bd8a
|
Merge pull request #3945 from ryantm/patch-1
fix spelling
|
2020-08-20 10:24:32 +02:00 |
|
John Ericson
|
3df78858f2
|
Fix max fd calc and add test
|
2020-08-20 05:08:50 +00:00 |
|
Ryan Mulligan
|
f36793c7b9
|
fix spelling
|
2020-08-19 20:31:01 -07:00 |
|
John Ericson
|
a83694c7a1
|
Use RemoteStore to open connection for proxying daemon
Removes duplicate websocket opening code, and also means we should be
able to to ssh-ssh-... daemon relays, not just uds-uds-... ones.
|
2020-08-19 19:34:47 +00:00 |
|
Eelco Dolstra
|
b4ef3d7078
|
Revert "Add a separate manual job"
This reverts commit 5e3ad1dde0. Manual
generation now depends on the 'nix' command.
|
2020-08-19 21:00:57 +02:00 |
|
Eelco Dolstra
|
c3e20d8c28
|
Consistency
|
2020-08-19 18:30:17 +02:00 |
|
Eelco Dolstra
|
c8fa39324a
|
Generate the nix.conf docs from the source code
This means we don't have two (divergent) sets of option descriptions
anymore.
|
2020-08-19 18:28:04 +02:00 |
|
John Ericson
|
d5af5763cf
|
Merge branch 'master' of github.com:NixOS/nix into remove-storetype-delegate-regStore
|
2020-08-19 15:54:50 +00:00 |
|
Eelco Dolstra
|
34b22e0123
|
Change option descriptions to Markdown
|
2020-08-19 14:21:27 +02:00 |
|
Eelco Dolstra
|
8a97b11374
|
Improve margins between sections
The default CSS puts almost no space between sections, but a lot of
space between subsections. This flips that around.
|
2020-08-19 12:31:18 +02:00 |
|
John Ericson
|
be0d429b95
|
Merge branch 'master' of github.com:NixOS/nix into templated-daemon-protocol
|
2020-08-19 03:17:41 +00:00 |
|
John Ericson
|
950ddfdb82
|
Merge remote-tracking branch 'upstream/master' into derivation-header-include-order
|
2020-08-18 14:36:44 +00:00 |
|
John Ericson
|
c08514c589
|
Merge remote-tracking branch 'upstream/master' into trustless-remote-builder-simple
|
2020-08-18 14:28:48 +00:00 |
|
Eelco Dolstra
|
1c8b550e34
|
Merge pull request #3917 from obsidiansystems/output-env-var-unconditional
Simplify code as output env vars are unconditional
|
2020-08-18 16:21:17 +02:00 |
|
Eelco Dolstra
|
0c9365c6ba
|
Merge pull request #3940 from obsidiansystems/fixed-output-remote-builder-test
Add commented-out test for remote building with fixed output derivations
|
2020-08-18 16:12:35 +02:00 |
|
Eelco Dolstra
|
dfeb76dbf9
|
Merge pull request #3930 from obsidiansystems/legacy-ssh-build-paths
Define `LegacySSHStore::buildPaths` using `cmdBuildPaths`
|
2020-08-18 16:07:40 +02:00 |
|
John Ericson
|
7c4f383b37
|
Merge branch 'fixed-output-remote-builder-test' of github.com:obsidiansystems/nix into trustless-remote-builder-simple
|
2020-08-18 13:56:00 +00:00 |
|
Eelco Dolstra
|
069340179e
|
Improve nix.1 manpage generator
|
2020-08-18 15:15:35 +02:00 |
|
Carlo Nucera
|
07975979aa
|
Comment out fixed content address test
|
2020-08-17 15:04:54 -04:00 |
|
John Ericson
|
36758a1a09
|
But back check.sh
Whether it fails or not, it is no a new test so we have to leave it.
|
2020-08-17 18:01:38 +00:00 |
|
Eelco Dolstra
|
6f19c776db
|
Start generation of the nix.1 manpage
|
2020-08-17 19:33:18 +02:00 |
|
Carlo Nucera
|
1bf31bad5f
|
Disable failing tests
|
2020-08-17 13:15:08 -04:00 |
|
Eelco Dolstra
|
a72a20d68f
|
Add 'nix dump-args' to dump all commands/flags for manpage generation
|
2020-08-17 17:44:52 +02:00 |
|
John Ericson
|
66321463e1
|
Merge remote-tracking branch 'upstream/master' into trustless-remote-builder-simple
|
2020-08-17 13:07:28 +00:00 |
|
Eelco Dolstra
|
7cdc739ece
|
Merge remote-tracking branch 'origin/master' into markdown
|
2020-08-17 13:43:39 +02:00 |
|
Eelco Dolstra
|
e849b19872
|
Merge pull request #3932 from chkno/no-show-signature
Don't try to parse signature check as commit timestamp
|
2020-08-17 11:00:24 +02:00 |
|
Eelco Dolstra
|
847a5392f4
|
Merge branch 'ca-no-need-trust' of https://github.com/obsidiansystems/nix
|
2020-08-17 10:57:02 +02:00 |
|
Eelco Dolstra
|
3c619f6290
|
Merge branch 'test-RemoteStore-buildDerivation' of https://github.com/obsidiansystems/nix
|
2020-08-17 10:53:18 +02:00 |
|
John Ericson
|
767e0b7726
|
Merge branch 'fixed-output-remote-builder-test' into trustless-remote-builder-simple
|
2020-08-16 18:54:12 +00:00 |
|
John Ericson
|
dbf96e10ec
|
Test remote building with fixed output derivations
|
2020-08-16 17:38:12 +00:00 |
|
John Ericson
|
9dd28a65c8
|
Merge remote-tracking branch 'upstream/master' into trustless-remote-builder-simple
|
2020-08-16 16:05:54 +00:00 |
|
John Ericson
|
6f7ac5e865
|
Remove extra closing paren
|
2020-08-14 21:59:31 +00:00 |
|
John Ericson
|
f899a7c6d7
|
Work around clang bug
|
2020-08-14 18:51:31 +00:00 |
|
John Ericson
|
3c8b5b6219
|
Merge remote-tracking branch 'upstream/master' into single-ca-drv-build
|
2020-08-14 17:00:13 +00:00 |
|
John Ericson
|
4b571ea321
|
Update src/libstore/daemon.cc
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
|
2020-08-14 11:52:37 -04:00 |
|
Eelco Dolstra
|
13e49be660
|
Merge pull request #3875 from obsidiansystems/new-interface-for-path-pathOpt
Offer a safer interface for path and pathOpt
|
2020-08-14 17:19:19 +02:00 |
|
Eelco Dolstra
|
7714d9a943
|
Merge pull request #3924 from obsidiansystems/features-per-store
Make `system-features` a store setting
|
2020-08-14 17:13:07 +02:00 |
|
Eelco Dolstra
|
9b9d5297ba
|
Merge pull request #3909 from matthewbauer/readd-hashed-mirrors
Add hashed-mirrors back
|
2020-08-14 17:05:47 +02:00 |
|
Eelco Dolstra
|
d81f13f7cb
|
Merge pull request #3899 from obsidiansystems/make-narHash-not-optional
Make narHash in ValidPathInfo not optional
|
2020-08-14 17:00:18 +02:00 |
|