Guillaume Maudoux
d6f5734c63
Complete genericClosure tests
2022-10-25 01:57:18 +02:00
Guillaume Maudoux
e93bf69b44
Rework error throwing, and test it
2022-10-25 01:46:10 +02:00
Guillaume Maudoux
8bd8583bc7
Try to please clang with convoluted templates
2022-10-23 00:11:44 +02:00
Guillaume Maudoux
3cd1c3b988
Revert local settings merged by error
2022-10-22 23:41:05 +02:00
Guillaume Maudoux
2a7348f986
Fixup merge typo
2022-10-22 23:38:50 +02:00
Guillaume Maudoux
8c3afd2d68
Introduce an Error builder to tackle complexity
2022-10-22 23:37:54 +02:00
Guillaume Maudoux
4a909c142c
Rollback unneeded throwFrameErrorWithTrace function
2022-10-20 14:25:11 +02:00
Guillaume Maudoux
31ce52a045
Fix context message being printed twice with forceStringNoCtx
2022-10-20 14:18:35 +02:00
Guillaume Maudoux
512f6be9b5
Reword incomparable types message
2022-10-20 14:17:05 +02:00
Guillaume Maudoux
520404f450
Revert custom position of 'if' blocks
2022-10-20 13:55:15 +02:00
Guillaume Maudoux
b945b844a9
Initial frames support
2022-10-17 03:05:02 +02:00
Guillaume Maudoux
3f9f6ae127
Merge remote-tracking branch 'origin/master' into coerce-string
2022-10-16 20:39:19 +02:00
Eelco Dolstra
3093bd3a85
Merge pull request #7168 from NixOS/rosetta-test
...
Improve Rosetta detection
2022-10-14 17:35:57 +02:00
Eelco Dolstra
9f7877abac
Merge pull request #7172 from hercules-ci/libmain-extraStackOverflowHandler
...
libmain: Make stack overflow handler configurable
2022-10-14 17:12:45 +02:00
Robert Hensing
ab4eb39386
libmain: Make the entire stack overflow handler pluggable
2022-10-14 12:53:46 +02:00
Robert Hensing
0d75675787
libmain: Add extraStackOverflowHandler
2022-10-14 12:53:07 +02:00
Eelco Dolstra
285277a61a
Remove useless debug statements
...
We haven't parsed the '-v' command line flags yet when this code executes,
so we can't actually get debug output here.
2022-10-14 00:35:33 -07:00
Eelco Dolstra
ddd5503950
Use /usr/bin/true
2022-10-14 00:34:31 -07:00
Eelco Dolstra
8196d4f4e9
Merge pull request #7169 from edolstra/fix-execve-error-msg
...
Fix error display if execve() in the builder fails
2022-10-14 09:29:31 +02:00
Eelco Dolstra
0359d6d123
Fix error display if execve() in the builder fails
...
After we've send "\2\n" to the parent, we can't send a serialized
exception anymore. It will show up garbled like
$ nix-build --store /tmp/nix --expr 'derivation { name = "foo"; system = "x86_64-linux"; builder = "/foo/bar"; }'
this derivation will be built:
/nix/store/xmdip0z5x1zqpp6gnxld3vqng7zbpapp-foo.drv
building '/nix/store/xmdip0z5x1zqpp6gnxld3vqng7zbpapp-foo.drv'...
ErrorErrorEexecuting '/foo/bar': No such file or directory
error: builder for '/nix/store/xmdip0z5x1zqpp6gnxld3vqng7zbpapp-foo.drv' failed with exit code 1
2022-10-13 21:35:16 +02:00
Eelco Dolstra
96eb5ef156
Improve Rosetta detection
...
Turns out that one of those *.plist files can exist even if Rosetta is
not installed. So let's just try to run an x86_64-darwin binary
directly.
2022-10-13 11:46:16 -07:00
Eelco Dolstra
59a304a9a8
Fix clang warnings
2022-10-13 11:25:49 -07:00
Eelco Dolstra
27ed3d0458
Merge pull request #7140 from crawford/chroot-store
...
Make warning about chroot store location more accurate
2022-10-13 16:35:31 +02:00
Steam Deck User
a86916eb72
Make warning about chroot store location more accurate
...
While trying to use an alternate directory for my Nix installation, I
noticed that nix's output didn't reflect the updated state
directory. This patch corrects that and now prints the warning before
attempting to create the directory (if the directory creation fails,
it wouldn't have been obvious why nix was attempting to create the
directory in the first place).
With this patch, I now get the following warning:
warning: '/home/deck/.var/app/org.nixos.nix/var/nix' does not
exist, so Nix will use '/home/deck/.local/share/nix/root' as a
chroot store
2022-10-12 12:12:12 -07:00
Eelco Dolstra
a6239eb570
Merge pull request #7163 from edolstra/misc-category
...
Move some options into a misc category
2022-10-12 16:10:30 +02:00
Eelco Dolstra
eba610956b
Move some options into a misc category
...
This unclutters the per-command options a bit by moving out some
global options.
2022-10-12 15:09:17 +02:00
Eelco Dolstra
ae2d330455
Merge branch 'print-common-flags' of github.com:Hoverbear/nix
2022-10-12 13:43:11 +02:00
Eelco Dolstra
f3193edd87
Merge pull request #7149 from amjoseph-nixpkgs/pr/intersectAttrs/values
...
parseDrvName: remove doc/impl discrepancy, add test covering the gap
2022-10-12 10:00:39 +02:00
Adam Joseph
5e24863d5a
tests/lang/eval-okay-versions.nix: add test for previous commit
...
This commit adds a test covering the discrepancy between parseDrvName's
implementation and documentation (the discrepancy was eliminated in the previous
commit).
2022-10-08 17:23:03 -07:00
Adam Joseph
7ef71cd21f
src/libexpr/primops.cc: parseDrvName: make documentation follow implementation
...
The documentation for `parseDrvName` does not agree with the implementation when
the derivation name contains a dash which is followed by something that is
neither a letter nor a digit. This commit corrects the documentation to agree
with the implementation.
2022-10-08 17:21:34 -07:00
Ana Hobden
069409d167
Print common flags in --help
2022-10-07 09:07:22 -07:00
Valentin Gagarin
ac0fb38e8a
Merge pull request #6652 from abathur/doc_install_tests
2022-10-05 17:45:42 +02:00
Travis A. Everett
e1418430ac
Apply suggestions from code review
...
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2022-10-05 09:52:53 -05:00
Valentin Gagarin
927234cfb2
Merge pull request #6870 from amjoseph-nixpkgs/pr/doc/explain-local-remote-binary-substituter
2022-10-05 09:01:42 +02:00
Théophane Hufschmitt
3ae9467d57
Merge pull request #6969 from fricklerhandwerk/refactor-generate-manpage
...
refactor rendering command documentation to markdown
2022-10-03 15:50:17 +02:00
Eelco Dolstra
89ca75c9f9
Merge pull request #7080 from squalus/nar-close-file
...
archive: check close errors when extracting nars
2022-09-30 12:58:28 +02:00
Eelco Dolstra
16e088c5db
Merge pull request #7108 from rapenne-s/wording
...
nix-copy-closure: improve wording
2022-09-30 12:54:25 +02:00
Valentin Gagarin
d8bef7358f
bring back lost newline
2022-09-30 01:43:57 +02:00
Valentin Gagarin
70eea97742
use more self-explanatory names
2022-09-30 01:43:57 +02:00
Valentin Gagarin
61188cb820
move final template to the top
...
this allows readers to enter the code starting with what is visible from
the outside, instead of working themselves up from purely technical details.
2022-09-30 01:43:57 +02:00
Valentin Gagarin
0e0f1832de
remove superfluous let-in pair
2022-09-30 01:43:57 +02:00
Valentin Gagarin
a85df04fcb
refactor showOptions
...
it was quite a pain to manipulate strings just with `builtins`
2022-09-30 01:43:53 +02:00
Valentin Gagarin
4655563470
refactor rendering command documentation to markdown
...
idea:
- make document structure visible, like in a template
- order functions by descending abstraction
- avoid nested let bindings
2022-09-30 01:42:46 +02:00
Valentin Gagarin
6b56bb4a79
use indented strings where appropriate
2022-09-30 01:42:46 +02:00
Théophane Hufschmitt
82ef3c470b
Merge pull request #7114 from rapenne-s/reenable_test
...
tests/build-dry: re-enable some test
2022-09-29 16:33:12 +02:00
Solene Rapenne
62d53bc8a4
tests/build-dry: re-enable some test
2022-09-28 15:54:45 +02:00
Solene Rapenne
847cd49909
nix-copy-closure: improve wording
2022-09-28 01:05:46 +02:00
Eelco Dolstra
050fcd391b
Merge pull request #7105 from SquidDev/hotfix/fish-return
...
Use exit instead of return in /etc/profile.d/nix-daemon.fish
2022-09-27 15:02:29 +02:00
Jonathan Coates
0259702219
Use exit instead of return in fish profile
...
Older versions of Fish (such as those bundled with Ubuntu LTS 22.04) do
not support return outside of functions. We need to use the equivalent
exit instead.
2022-09-27 12:59:37 +01:00
Eelco Dolstra
ace9f261da
Merge pull request #7103 from lheckemann/remove-add-root
...
nix-build: remove unused --add-root arg
2022-09-27 11:37:09 +02:00
Robert Hensing