48353d1a51
Merge remote-tracking branch 'nixos/master'
2022-06-01 21:14:33 +02:00
Eelco Dolstra
8e8e9d8705
Respect the outputSpecified attribute
...
E.g. 'nix build nixpkgs#libxml2.dev' will build the 'dev' output.
2022-05-30 11:34:47 +02:00
bc2647312a
Merge remote-tracking branch 'nixos/master'
2022-05-29 18:14:31 +02:00
Eelco Dolstra
ec07a70979
Style fix
2022-05-27 11:25:05 +02:00
Eelco Dolstra
9acc770ce4
Remove pre-C++11 hackiness
2022-05-26 12:40:01 +02:00
Eelco Dolstra
762fa2b2ff
Merge pull request #6570 from edolstra/eof-in-string
...
Handle EOFs in string literals correctly
2022-05-26 08:13:39 +02:00
Ben Burdette
9a5ea6c359
Merge branch 'master' into debug-exploratory-PR
2022-05-25 10:41:10 -06:00
Ben Burdette
b4c24a29c6
back to ref<EvalState> in NixRepl
2022-05-25 10:21:20 -06:00
Eelco Dolstra
27ebb97d0a
Handle EOFs in string literals correctly
...
We can't return a STR token without setting a valid StringToken,
otherwise the parser will crash.
Fixes #6562 .
2022-05-25 17:58:13 +02:00
Eelco Dolstra
91b7d5373a
Style tweaks
2022-05-25 12:32:22 +02:00
Ben Burdette
13d02af079
remove redundant 'debugMode' flag
2022-05-22 21:45:24 -06:00
Ben Burdette
7ccb2700c0
comments
2022-05-22 19:15:58 -06:00
Ben Burdette
5bc97fdfa6
change state derefs
2022-05-22 19:12:03 -06:00
Ben Burdette
982c8a959b
remove special tryEval behavior
2022-05-20 12:45:36 -06:00
Ben Burdette
884d591787
debugRepl ftn pointer
2022-05-20 10:33:50 -06:00
Ben Burdette
0600df86b8
'debugMode'
2022-05-19 17:01:23 -06:00
Ben Burdette
7ddef73d02
de-const evalState exceptions
2022-05-19 12:44:40 -06:00
Ben Burdette
f9cdb6af8d
Merge branch 'debug-exploratory-PR' into debuggerHook-eval-arg
2022-05-19 11:07:18 -06:00
Ben Burdette
357fb84dba
use an expr->StaticEnv table in evalState
2022-05-19 10:48:10 -06:00
Théophane Hufschmitt
78dc64ec1e
Merge pull request #6544 from ncfavier/getFlake-no-write-lock-file
...
Do not attempt to write a lock file in builtins.getFlake
2022-05-18 16:41:13 +02:00
Naïm Favier
169384abb2
Do not attempt to write a lock file in builtins.getFlake
...
Fixes https://github.com/NixOS/nix/issues/6541
2022-05-18 15:45:06 +02:00
zhujun
b8e44dc62b
primop_match: fix example letter case in document
2022-05-18 14:05:26 +08:00
2e3c7f0fed
Merge remote-tracking branch 'nixos/master'
2022-05-16 20:01:39 +02:00
Ben Burdette
667074b586
first whack at passing evalState as an arg to debuggerHook.
2022-05-16 09:20:51 -06:00
Théophane Hufschmitt
43a2c13672
Make nix::eval_cache::int_t more idiomatic
...
Don’t explicitely give it a constructor, but use aggregate
initialization instead (also prevents having an implicit coertion, which
is probably good here)
2022-05-16 16:36:21 +02:00
Eli Kogan-Wang
27d0f6747d
resolve redundant priority passing, wrap NixInt in eval-cache variant
2022-05-16 15:17:35 +02:00
Eli Kogan-Wang
c81d24f1c7
Add int to eval-cache, bump eval cache schema version
2022-05-16 02:29:29 +02:00
elikoga
0cea59ab4b
Merge branch 'NixOS:master' into master
2022-05-16 01:01:37 +02:00
Ben Burdette
86ba0a702c
fix thunk issue
2022-05-15 12:05:51 -06:00
Eli Kogan-Wang
be2b19041e
Integrate review changes
2022-05-13 22:02:28 +02:00
Eelco Dolstra
bf89cd95a4
Merge pull request #6525 from J-Swift/feature/bash-prefix
...
Add `bash-prompt-prefix` option
2022-05-13 14:06:07 +02:00
Ben Burdette
2acdb90438
remove debug code
2022-05-12 14:20:45 -06:00
Ben Burdette
2d0d1ec99d
remove debug code
2022-05-12 14:15:35 -06:00
Ben Burdette
4f48095c66
Merge branch 'debugThrow' into debug-exploratory-PR
2022-05-12 14:11:35 -06:00
Ben Burdette
1ea13084c9
template-ize debugThrow
2022-05-12 13:59:58 -06:00
Eelco Dolstra
54457382f9
Fix static build
...
https://hydra.nixos.org/build/176211267
2022-05-11 11:36:56 +02:00
Jimmy Reichley
2998527b18
Allow setting bash-prompt-prefix nix develop configuration
2022-05-10 16:53:22 -04:00
Ben Burdette
7cd7c7c91a
Merge branch 'master' into debug-exploratory-PR
2022-05-09 09:30:44 -06:00
Jan Tojnar
59d9551c25
libexpr: Fix manual link in error message
...
It was changed to the old manual in 8895fa70a4
2022-05-08 18:59:00 +02:00
54eb641646
Merge remote-tracking branch 'nixos/master'
2022-05-08 16:24:35 +02:00
Andreas Rammhold
059ae7f6c4
Add unit tests for libexpr ( #5377 )
...
* libexpr: fix builtins.split example
The example was previously indicating that multiple whitespaces would be
collapsed into a single captured whitespace. That isn't true and was
likely a mistake when being documented initially.
* Fix segfault on unitilized list when printing value
Since lists are just chunks of memory the individual elements in the
list might be unitilized when a programming error happens within Nix.
In this case the values are null-initialized (at least with Boehm GC)
and we can avoid a nullptr deref when printing them.
I ran into this issue while ensuring that new expression tests would
show the actual value on an assertion failure.
This is unlikely to cause any runtime performance regressions as
printing values is not really in the hot path (unless the repl is the
primary use case).
* Add operator<< for ValueTypes
* Add libexpr tests
This introduces tests for libexpr that evalulate various trivial Nix
language expressions and primop invocations that should be good smoke
tests wheter or not the implementation is behaving as expected.
2022-05-06 18:05:27 +02:00
Ben Burdette
fc66f48812
debugError()
2022-05-06 09:09:49 -06:00
Ben Burdette
2c9fafdc9e
trying debugThrow
2022-05-06 08:47:21 -06:00
Ben Burdette
dea998b2f2
traceable_allocator
2022-05-05 20:26:10 -06:00
Ben Burdette
f400c5466d
rename valmap
2022-05-05 15:43:23 -06:00
Ben Burdette
09fcfee925
don't print the 'break' argument
2022-05-05 15:34:59 -06:00
Ben Burdette
0ac121a094
Merge branch 'NixOS:master' into debug-exploratory-PR
2022-05-05 13:54:20 -06:00
Eelco Dolstra
58645a78ab
builtins.break: Return argument when debugging is not enabled
2022-05-05 17:17:03 +02:00
Eelco Dolstra
dd8b91eebc
Style fixes
...
In particular, use std::make_shared and enumerate(). Also renamed some
fields to fit naming conventions.
2022-05-05 17:17:03 +02:00
234038a824
Merge remote-tracking branch 'nixos/master'
2022-05-04 23:28:25 +02:00
