Eelco Dolstra
c3aaf3b8da
nix-env: Ignore failures creating ~/.nix-profile and ~/.nix-defexpr
...
https://hydra.nixos.org/build/102803093
2019-10-10 09:14:05 +02:00
Eelco Dolstra
bda64a2b0f
Doh
...
https://hydra.nixos.org/build/102803044
2019-10-10 00:12:30 +02:00
Eelco Dolstra
94dfb6b1fe
Merge pull request #3136 from NixOS/no-world-writable
...
Remove world-writability from {profiles,gcroots}/per-user
2019-10-09 23:35:45 +02:00
Eelco Dolstra
20eec802ff
Force per-user group to a known value
2019-10-09 23:35:02 +02:00
Eelco Dolstra
9277e72cb0
Typo
2019-10-09 23:35:02 +02:00
Eelco Dolstra
d7bae5680f
Go back to 755 permission on per-user directories
...
700 is pointless since the store is world-readable anyway. And
per-user/root/channels must be world-readable.
2019-10-09 23:35:02 +02:00
Eelco Dolstra
c9159f86cc
nix-env: Create ~/.nix-defexpr automatically
2019-10-09 23:35:02 +02:00
Eelco Dolstra
61a6176aca
nix-profile.sh: Remove coreutils dependency
2019-10-09 23:35:02 +02:00
Eelco Dolstra
9348f9291e
nix-env: Create ~/.nix-profile automatically
2019-10-09 23:35:01 +02:00
Eelco Dolstra
26762ceb86
nix-profile.sh: Don't create .nix-channels
...
This is already done by the installer, so no need to do it again.
2019-10-09 23:35:01 +02:00
Eelco Dolstra
c43d9f6131
Remove some redundant initialization
2019-10-09 23:35:01 +02:00
Eelco Dolstra
5a303093dc
Remove world-writability from per-user directories
...
'nix-daemon' now creates subdirectories for users when they first
connect.
Fixes #509 (CVE-2019-17365).
Should also fix #3127 .
2019-10-09 23:34:48 +02:00
Eelco Dolstra
4331eeb13d
Filter ANSI escape sequences in -L output
...
Otherwise, builds like NixOS VM tests may leave the terminal in a
weird state and do resets.
2019-10-09 23:25:06 +02:00
Eelco Dolstra
55bba8e4f5
Make std::uncaught_exception warning less noisy
2019-10-09 23:04:11 +02:00
Eelco Dolstra
926d3e5bb0
Fix Bison 2.4 warning
2019-10-09 22:57:37 +02:00
Eelco Dolstra
99b73fb507
OCD performance fix: {find,count}+insert => insert
2019-10-09 16:06:29 +02:00
Eelco Dolstra
e6e61f0a54
getSourceExpr(): Handle channels
...
Fixes #1892 .
Fixes #1865 .
Fixes #3119 .
2019-10-09 15:36:51 +02:00
Eelco Dolstra
08ad9714e1
Merge pull request #3132 from matthewbauer/handle-sandbox-shell
...
Handle empty sandbox_shell
2019-10-09 14:52:51 +02:00
Eelco Dolstra
7c74f075f4
nix search: Don't quietly ignore errors
2019-10-09 14:46:58 +02:00
Eelco Dolstra
64d8872900
nix-build: Fix compilation
2019-10-09 14:46:44 +02:00
Eelco Dolstra
335504a58e
Merge pull request #3133 from callahad/launchd
...
Make nix-daemon.plist less fragile on macOS
2019-10-09 14:32:18 +02:00
Dan Callahan
8c4a5e7ba1
Make nix-daemon.plist less fragile on macOS
...
We're calling `wait4path` on the full, resolved `@bindir@/nix-daemon` path.
That means we're hardcoding something like:
/bin/wait4path /nix/store/zs9c5xhp3zv9p23qnjxp87nl5injsi1i-nix-2.3/bin/nix-daemon && /nix/var/nix/profiles/default/bin/nix-daemon
That seems unnecessarily fragile.
It might be better to wait4path on the path we intend to call.
2019-10-09 12:52:01 +01:00
Eelco Dolstra
7bb5ddbe15
Merge pull request #3128 from matthewbauer/dont-symlink-launchagent
...
Don't symlink org.nixos.nix-daemon.plist in installer
2019-10-09 09:37:11 +02:00
Eelco Dolstra
6b3a6fe5a2
Merge pull request #3131 from matthewbauer/dont-source-bashrc-in-pure-mode
...
Don’t source bashrc in pure mode
2019-10-09 09:25:44 +02:00
Matthew Bauer
199e888785
Handle empty sandbox_shell
...
Previously, SANDBOX_SHELL was set to empty when unavailable. This
caused issues when actually generating the sandbox. Instead, just set
SANDBOX_SHELL when --with-sandbox-shell= is non-empty. Alternative
implementation to https://github.com/NixOS/nix/pull/3038 .
2019-10-08 23:12:54 -04:00
Matthew Bauer
65f6d5db6f
Don’t source bashrc in pure mode
...
Pure mode should not try to source the user’s bashrc file. These may
have many impurities that the user does not expect to get into their
shell.
Fixes #3090
2019-10-08 22:41:59 -04:00
Matthew Bauer
d4e51aac08
Make preexisting Nix install a warning, not a failure
...
In the multi-user install script, we originally made sure no previous
references to Nix existed. This prevented any previous installs from
contaminating the new install. However, some users need the ability to
repair their existing Nix installation without uninstalling all
references to Nix. This change allows users with existing Nix
installations to use the installer, while still outputing a warning
message on the dangers of this. As a result, the multi-user install
script work much more like the single-user install script has worked
in the past.
This is a requirement for macOS Catalina users now that
/Library/LaunchDaemons/org.nixos.nix-daemon.plisg is not managed by
the Nix store. If there is ever a change to the .plist, all users will
need to rerun this install script to get the new changes. Otherwise,
changes to the launch daemon will require manual interventions.
2019-10-08 21:53:06 -04:00
Matthew Bauer
0847f2f1b3
Copy instead of linking launch agent
...
On Catalina, the /nix filesystem might not be mounted at start time.
To avoid this service not starting, we need to keep the launch agent
outside of the Nix store. A wait4pid will hold for our /nix dir to be
mounted.
Fixes #3125 .
2019-10-08 21:52:17 -04:00
Eelco Dolstra
a7e9286359
Merge pull request #3126 from PyroLagus/fix-typos
...
Fix typos in the Nix Manual.
2019-10-08 20:40:24 +02:00
Danny Bautista
00a567588e
Fix typos in the Nix Manual.
2019-10-08 14:02:40 -04:00
Eelco Dolstra
8ccae55dab
Merge pull request #3120 from samdoshi/remove-search-verbose
...
nix search: remove verbose example
2019-10-07 14:36:44 +02:00
Sam Doshi
6f6cb5e388
nix search: remove verbose example
2019-10-07 11:40:42 +01:00
Eelco Dolstra
93b1ce1ac5
Revert "std::uncaught_exception() -> std::uncaught_exceptions()"
...
This reverts commit 6b83174fff
because
it doesn't work on macOS yet.
https://hydra.nixos.org/build/102617587
2019-10-04 16:34:59 +02:00
Eelco Dolstra
15e70c662e
Fix indentation
2019-10-02 16:26:15 +02:00
Eelco Dolstra
4e60c5ec65
Merge pull request #3112 from zimbatm/fetchTarball-with-chroot
...
Fix fetchTarball with chroot stores
2019-10-01 11:33:57 +02:00
Eelco Dolstra
168a887916
Fix fetchTarball with chroot stores
...
Fixes #2405 .
2019-10-01 07:51:06 +00:00
Domen Kožar
2d2769f68c
Merge pull request #2338 from bobvanderlinden/pr-cannot-delete-alive-why
...
mention `nix-store --query --roots` when a path cannot be deleted
2019-09-30 14:06:52 +02:00
Domen Kožar
043365c2fb
Merge pull request #3080 from Infinisil/tryEval-docs
...
docs: Note that tryEval doesn't do deep evaluation
2019-09-30 14:03:16 +02:00
Domen Kožar
a3bb929798
Merge pull request #3106 from JosephLucas/patch-1
...
Update garbage-collection.xml readability
2019-09-30 14:02:26 +02:00
Joseph Lucas
10bfc5c0d0
Update garbage-collection.xml readability
...
1. remove a typo space
2. Simplify negative style by using affirmative style
2019-09-23 13:18:59 +00:00
Eelco Dolstra
5038e1bec4
Merge pull request #3103 from bhipple/fix/spelling
...
Fix spelling in comment
2019-09-23 10:46:40 +02:00
Eelco Dolstra
02b4632e77
Merge pull request #3104 from zimbatm/no-show-trace-forwarding
...
libstore: don't forward --show-trace
2019-09-23 10:44:42 +02:00
Eelco Dolstra
3a022d4599
Shut up some warnings
...
(cherry picked from commit 99e8e58f2d
)
2019-09-22 21:57:05 +02:00
Eelco Dolstra
bd79c1f6f6
Don't catch exceptions by value
...
(cherry picked from commit 893be6f5e3
)
2019-09-22 21:56:56 +02:00
zimbatm
e63c9e73e3
libstore: don't forward --show-trace
2019-09-22 10:57:20 +00:00
Benjamin Hipple
c6a542f22a
Fix spelling in comment
2019-09-21 18:53:15 -04:00
Eelco Dolstra
7f9a0033c7
Merge pull request #3097 from zimbatm/show-traces
...
function-trace: always show the trace
2019-09-19 00:16:55 +02:00
zimbatm
619cc4af85
function-trace: always show the trace
...
If the user invokes nix with --trace-function-calls it means that they
want to see the trace.
2019-09-18 23:23:21 +02:00
Eelco Dolstra
c6a0f4c393
Merge pull request #3094 from alexfmpe/fix-builtins-order
...
Move 'builtins.splitVersion' to position respecting alphabetical order
2019-09-18 09:47:39 +02:00
Alexandre Esteves
9533d85ce0
Move 'builtins.splitVersion' to position respecting alphabetical order
2019-09-17 23:40:49 +01:00