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
Patrick Jackson
b44df13701
manual: update options generation code to use default values
2022-10-20 12:05:04 -07: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
Domen Kožar
b3d2a05c59
Merge pull request #7185 from NixOS/dependabot/github_actions/cachix/cachix-action-11
...
Bump cachix/cachix-action from 10 to 11
2022-10-20 07:44:00 +02:00
sternenseemann
c63646b693
tests/lang: re-enable eval-okay-eq.nix tests
...
This is a really old test case (which was originally written before the
proper Nix syntax). The tested deep comparison behavior was implemented
and reverted soon after due to performance problems, but it has been
restored in today's Nix again (thanks to the derivation comparison
optimization, presumably).
2022-10-19 18:39:26 +02:00
Johan Herland
1ec8810687
Explain how Nix handles antiquotation of paths
...
Specifically, explain why Nix does not _re_evaluate paths during a
`nix repl` session. This is a thing that bit me while playing around
with paths and antiquotation in `nix repl` while reading the Nix
language tutorial at https://nix.dev/tutorials/nix-language .
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2022-10-19 11:50:58 +02:00
Eelco Dolstra
95331cb9c9
Merge pull request #7183 from n8henrie/patch-1
...
Fix typo -- dashes not underscores
2022-10-19 11:21:52 +02:00
dependabot[bot]
0b64bac65c
Bump cachix/cachix-action from 10 to 11
...
Bumps [cachix/cachix-action](https://github.com/cachix/cachix-action ) from 10 to 11.
- [Release notes](https://github.com/cachix/cachix-action/releases )
- [Commits](https://github.com/cachix/cachix-action/compare/v10...v11 )
---
updated-dependencies:
- dependency-name: cachix/cachix-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-19 08:50:25 +00:00
Eelco Dolstra
ef77897f1d
Merge pull request #7184 from NixOS/dependabot/github_actions/cachix/install-nix-action-18
...
Bump cachix/install-nix-action from 17 to 18
2022-10-19 10:49:45 +02:00
Eelco Dolstra
4bc70b8216
Merge pull request #7187 from NixOS/path-from-hash-part
...
Add command 'nix store path-from-hash-part'
2022-10-19 10:48:26 +02:00
Patrick Jackson
11b5cf9561
fix manual defaults
2022-10-18 15:09:17 -07:00
Eelco Dolstra
e136d57f26
Implement BinaryCacheStore::queryPathFromHashPart()
2022-10-18 17:48:09 +02:00
Eelco Dolstra
61f89e954a
Add command 'nix store path-from-hash-part'
...
This exposes the Store::queryPathFromHashPart() interface in the CLI.
2022-10-18 16:51:12 +02:00
Théophane Hufschmitt
a324e9a5c8
Merge pull request #7132 from stelcodes/fix-fish-manpath
...
Fix fish shell MANPATH creation
2022-10-18 09:50:05 +02:00
dependabot[bot]
dc20395de4
Bump cachix/install-nix-action from 17 to 18
...
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action ) from 17 to 18.
- [Release notes](https://github.com/cachix/install-nix-action/releases )
- [Commits](https://github.com/cachix/install-nix-action/compare/v17...v18 )
---
updated-dependencies:
- dependency-name: cachix/install-nix-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-17 22:01:48 +00:00
Nathan Henrie
af9c9504ca
Fix typo -- dashes not underscores
2022-10-17 14:15:32 -06: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
Andrew Brooks
a259084c50
Fix #7146
...
When fetching a non-local git repo by ref (and no rev), don't consider unrelated
cached revs for the same repository.
2022-10-14 18:04:47 -05:00
Andrew Brooks
c7059c9b24
Add test for issue 7146
2022-10-14 17:27:13 -05: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
Stel Abrego
34e3fa3a4a
Fix fish shell MANPATH creation
...
Previously the MANPATH was set even if MANPATH was empty beforehand
which resulted in a MANPATH of only ~/.nix-profile/share/man which
omitted the default man page directory (commonly /opt/local/share/man)
from man page results.
2022-10-03 14:37:28 -07: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