Graham Christensen
f11acbaf17
nix-shell: add bashInteractive to the start of the PATH, set SHELL
...
Tools which re-exec `$SHELL` or `$0` or `basename $SHELL` or even just
`bash` will otherwise get the non-interactive bash, providing a
broken shell for the same reasons described in
https://github.com/NixOS/nixpkgs/issues/27493 .
Extends c94f3d5575
2018-09-27 15:12:56 -04:00
Eelco Dolstra
7cba4214a8
Don't talk about a "current folder build output"
...
Presumably this refers to ./default.nix but the support for that in
'nix' is tenuous. Also folders are a Mac thing.
2018-09-27 21:01:19 +02:00
Daiderd Jordan
ed25753501
nix doctor: reimplement profile warning without gcroot check
...
Calculating roots seems significantly slower on darwin compared to
linux. Checking for /profile/ links could show some false positives but
should still catch most issues.
2018-09-26 23:13:17 +02:00
Will Dietz
d4f78a6b64
bump base nixpkgs used by default 18.03 -> 18.09
2018-09-26 15:37:13 -05:00
Eelco Dolstra
9750430003
Ensure download thread liveness
...
* Don't wait forever for the client to remove data from the
buffer. This does mean that the buffer can grow without bounds
(e.g. when downloading is faster than writing to disk), but meh.
* Don't hold the state lock while calling the sink. The sink could
take any amount of time to process the data (in particular when it's
actually a coroutine), so we don't want to block the download
thread.
2018-09-26 21:47:34 +02:00
Eelco Dolstra
98b2cc2e6e
Untabify
2018-09-26 21:39:06 +02:00
Eelco Dolstra
ed78582847
sinkToSource(): Start the coroutine lazily
...
In particular this causes copyStorePath() from HttpBinaryCacheStore to
only start a download if needed. E.g. if the destination LocalStore
goes to sleep waiting for the path lock and another process creates
the path, then LocalStore::addToStore() will never read from the
source so we don't have to do the download.
2018-09-26 21:19:34 +02:00
Eelco Dolstra
44e86304b6
Make NAR header check more robust
...
Changes
std::bad_alloc
into
bad archive: input doesn't look like a Nix archive
2018-09-26 12:03:58 +02:00
Will Fancher
b7091ce41e
Add a test for signed content-addressed paths
2018-09-25 22:18:52 -04:00
Will Fancher
0ae8d4033d
Fix overflow when verifying signatures of content addressable paths
2018-09-25 21:19:24 -04:00
Eelco Dolstra
7ccdcc7fed
Merge pull request #2448 from dtzWill/feature/nix-daemon-accept-empty-builders-untrusted
...
nix-daemon: allow setting builders to "" by any user (untrusted)
2018-09-25 14:09:00 +02:00
Will Dietz
8df367a92d
nix-daemon: allow setting builders to "" by any user (untrusted)
...
(cherry picked from commit a94a2eb1cb1c81e90a7529be5fecac27899a3442)
2018-09-25 03:22:08 -05:00
Eelco Dolstra
42e4ea2b6d
Merge pull request #2312 from dtzWill/fix/matched-names-should-still-print-version
...
search: include version for matches too!
2018-09-24 13:03:28 +02:00
Luke Clifton
fb72104b80
Search NIX_PROFILE for SSL CA
2018-09-20 07:33:35 +08:00
Eelco Dolstra
a48c2e3411
Merge pull request #2434 from grahamc/graham-improve-upgrade
...
Upgrade docs: improve the upgrade command
2018-09-19 21:53:50 +02:00
Anders Riutta
1915862767
Upgrade docs: improve the upgrade command
...
and make it more copy-pastable.
2018-09-19 14:17:06 -04:00
Eelco Dolstra
43b7eebfab
Merge pull request #2433 from grahamc/doc-shebang-quotes
...
Document that nix-shell's shebang requires double quotes for expressions
2018-09-19 20:08:45 +02:00
Graham Christensen
be9e356e61
nix-shell: document double quotes being necessary for a simple Nix expression in the shebang
2018-09-19 13:01:27 -04:00
Graham Christensen
10a7f19937
nix-shell: explain the merging property close to the example
2018-09-19 12:48:08 -04:00
Luke Clifton
1241a58975
Look inside the user profile
2018-09-19 15:22:39 +08:00
Eelco Dolstra
2ca6ef0fec
Merge pull request #2428 from grahamc/docs-aliases
...
Document Aliases
2018-09-18 20:24:24 +02:00
Graham Christensen
0cd863197b
docs: document deprecated aliases
2018-09-18 12:23:32 -04:00
Eelco Dolstra
52f6d541b9
nix-env: Fix segfault if -f argument is not a directory or a Nix expression
...
Fixes #2425 .
2018-09-17 16:36:30 +02:00
Eelco Dolstra
901dfc7978
Fix build failure if parallel xz is not available
2018-09-17 16:36:11 +02:00
Eelco Dolstra
8327a7a8fa
Merge branch 'dirOf-relative' of https://github.com/lheckemann/nix
2018-09-13 14:33:12 +02:00
Graham Christensen
0aca1ffb6e
Prefer 'remote builder' over 'slave'
2018-09-10 18:57:46 +02:00
Eelco Dolstra
5b2fdfdca2
Merge pull request #2412 from dingxiangfei2009/patch-repl-autoargs
...
nix repl respects --arg and --argstr
2018-09-10 10:50:51 +02:00
Ding Xiang Fei
d6ac762bf7
auto args on repl
2018-09-10 15:43:17 +08:00
Eelco Dolstra
bba3f0a308
If fallback is enabled, temporarily disable substituters after a failure
...
Otherwise, we just keep asking the substituter for other .narinfo
files, which can take a very long time due to retries/timeouts.
2018-09-07 17:08:43 +02:00
Eelco Dolstra
33c3f91885
Handle queryPathInfo() failure from substituters when fallback is enabled
...
Fixes #1990 .
2018-09-07 16:35:48 +02:00
Eelco Dolstra
91405986f4
Convert NIX_COUNT_CALLS to JSON too
2018-09-05 21:57:54 +02:00
Eelco Dolstra
0a2545f95c
Log stats to stderr
...
We shouldn't pollute stdout.
2018-09-05 21:35:58 +02:00
Eelco Dolstra
c4ba5f4be9
Merge branch 'improve-stats' of https://github.com/cleverca22/nix
2018-09-05 21:28:05 +02:00
Eelco Dolstra
2d91012754
fetchurl: Respect unpack
...
Fixes #2393 .
2018-09-05 21:22:37 +02:00
Eelco Dolstra
e0ddabb0d6
Merge pull request #2400 from matthewbauer/patch-9
...
Get effective user in Nix commands
2018-09-05 13:28:23 +02:00
Matthew Bauer
74f6d8767d
Get effective user in Nix commands
...
‘geteuid’ gives us the user that the command is being run as,
including in setuid modes. By using geteuid to determind id, we can
avoid the ‘sudo -i’ hack when upgrading Nix. So now, upgrading Nix on
macOS is as simple as:
$ sudo nix-channel --update
$ sudo nix-env -u
$ sudo launchctl stop org.nixos.nix-daemon
$ sudo launchctl start org.nixos.nix-daemon
or
$ sudo systemctl restart nix-daemon
2018-09-04 19:32:39 -05:00
Eelco Dolstra
5e0a7206f5
Merge pull request #2397 from dtzWill/fix/reported-dl-size-with-callback
...
download: fix size reported to progress bar
2018-09-04 12:16:51 +02:00
Will Dietz
28418af920
download: fix size reported to progress bar
2018-09-03 14:12:54 -05:00
Vladimír Čunát
5f3b72cfc2
docs: change expired bzip2.org to archive.org
...
Fixes #2396 .
2018-09-03 17:57:13 +02:00
Michael Bishop
4b034f390c
remove the old text format output
2018-09-02 18:25:23 -03:00
Eelco Dolstra
54996b51fb
Bump version
2018-09-02 22:12:00 +02:00
Eelco Dolstra
4dd09210d7
Release notes tweaks
2018-09-02 21:47:10 +02:00
Daiderd Jordan
80a4b44d3d
nix doctor: only perform path/profile checks with a daemon/local store
...
Not all store types LegacySSHStore support these operations and it
doesn't really make sense to check those.
2018-09-02 13:41:55 +02:00
Daiderd Jordan
bfdca55868
nix doctor: add check for profile roots
...
In most cases profiles that are in PATH should have a gcroot.
2018-09-02 12:56:28 +02:00
Daiderd Jordan
0f18dc5479
nix doctor: add warning for multiple versions
...
It's pretty easy to unintentionally install a second version of nix
into the user profile when using a daemon install. In this case it
looks like nix was upgraded while the nix-daemon is probably still
unning an older version.
2018-09-02 12:56:28 +02:00
Daiderd Jordan
246acf93f2
nix doctor: handle serve protocol
...
The serve protocol used by LegacySSHStore has a different major and
shouldn't be compared to PROTOCOL_VERSION.
2018-09-02 12:54:42 +02:00
Daiderd Jordan
7314dc7f07
nix doctor: add warning if client/daemon protocol mismatches
...
A protocol mismatch can sometimes cause problems when using specific
features with an older daemon. For example:
Nix 2.0 changed the way files are compied to the store. The daemon is
backwards compatible and can still handle older clients, however a 1.11
nix-daemon isn't forwards compatible.
2018-09-02 12:54:39 +02:00
Daiderd Jordan
070823baa4
Store: expose the protocol version used by a store
2018-09-02 12:54:29 +02:00
Daiderd Jordan
c9a08540c3
nix doctor: add command
...
Inspired by the homebrew command, shows a combination of debugging
information and warnings with potential issues with a nix installation.
2018-09-02 12:54:20 +02:00
Michael Bishop
2fd1008c70
add JSON to NIX_SHOW_STATS
2018-09-01 20:05:06 -03:00
