Eelco Dolstra
cd35bbbeef
Merge branch 'more-stringviews' of https://github.com/pennae/nix
2022-02-02 12:38:37 +01:00
Eelco Dolstra and GitHub
59b6afec07
Merge pull request #6022 from thkoch2001/fix-lowdown_libs
...
use LOWDOWN_LIBS variable
2022-01-31 13:40:54 +01:00
Eelco Dolstra and GitHub
cc730bd46b
Merge pull request #5990 from lincolnauster/flakes-nixconfig-docs
...
flakes: document nixConfig option
2022-01-31 10:21:15 +01:00
Thomas Koch
43509cc69d
use LOWDOWN_LIBS variable
...
fixes : #5931
2022-01-30 20:59:58 +02:00
Eelco Dolstra and GitHub
08fc3d6552
Merge pull request #6018 from dtzWill/fix/issue-6017
...
canonPath: fix missing slash when resolving links
2022-01-30 12:32:02 +01:00
Thomas Koch
85b1427662
fix spelling mistakes reported by Debian's lintian tool
2022-01-30 10:51:39 +02:00
Will Dietz
a0357abda7
canonPath: fix missing slash when resolving links
...
Fixes #6017
2022-01-29 16:32:27 -06:00
Tom Bereknyei
6e5e64fc74
bundler: suggested doc fixes
2022-01-28 10:25:05 -05:00
tomberek and GitHub
2bf96bd9f2
Merge branch 'master' into bundler_drv
2022-01-28 10:18:29 -05:00
Tom Bereknyei
4ebc50d92e
bundler: revert default behavior to use defaultApp
...
Bundlers are now responsible for correctly handling their inputs which
are no longer constrained to be (Drv->Drv)->Drv->Drv, but can be of
type (attrset->Drv)->attrset->Drv.
2022-01-28 09:56:58 -05:00
Eelco Dolstra
4bf6af7b55
Remove a repeated std::move in a for loop
2022-01-28 15:10:43 +01:00
pennae
d439dceb3b
optionally return string_view from coerceToString
...
we'll retain the old coerceToString interface that returns a string, but callers
that don't need the returned value to outlive the Value it came from can save
copies by using the new interface instead. for values that weren't stringy we'll
pass a new buffer argument that'll be used for storage and shouldn't be
inspected.
2022-01-27 22:15:30 +01:00
pennae
41d70a2fc8
return string_views from forceString*
...
once a string has been forced we already have dynamic storage allocated for it,
so we can easily reuse that storage instead of copying.
2022-01-27 17:15:43 +01:00
pennae
0d7fae6a57
convert a for more utilities to string_view
2022-01-27 17:15:43 +01:00
regnat
fcdc60ed22
Don’t require NIX_PATH entries to be valid paths
...
It’s totally valid to have entries in `NIX_PATH` that aren’t valid paths
(they can even be arbitrary urls or `channel:<channel-name>`).
Fix #5998 and #5980
2022-01-27 16:26:39 +01:00
Eelco Dolstra
9691f86ff7
Stop vendoring nlohmann_json
2022-01-26 11:50:53 +01:00
Eelco Dolstra and GitHub
4f24a33d34
Merge pull request #5991 from edolstra/remote-nix-version
...
nix store ping: Report Nix daemon version
2022-01-26 09:59:59 +01:00
c746a429db
fix typo
...
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com >
2022-01-25 14:55:49 -07:00
Eelco Dolstra
35dbdbedd4
nix store ping: Report Nix daemon version
...
Fixes #5952 .
2022-01-25 21:15:58 +01:00
lincoln auster [they/them]
203ef26974
flakes: document nixConfig option
...
Fixes #5988 .
2022-01-25 12:23:52 -07:00
Eelco Dolstra and GitHub
5fa624f59a
Merge pull request #5987 from edolstra/rust-cleanup
...
Remove unused Rust stuff
2022-01-25 13:57:22 +01:00
Eelco Dolstra and GitHub
a04a66c196
Merge pull request #5922 from fzakaria/fzakaria/json-ignore-assertion
...
Add try/catch to queryJSON for assertion and errors
2022-01-25 12:44:20 +01:00
Eelco Dolstra
fcf3528ad1
Remove unused Rust stuff
...
In particular we were still compiling rust-ffi.cc even though we're
not using it.
2022-01-25 11:58:00 +01:00
regnat
f113ea6c73
Fix parsing of variable names that are a suffix of '__curPos'
...
Follow-up from #5969
Fix #5982
2022-01-25 10:49:27 +01:00
Tom Bereknyei
dc85e20684
bundler: notes and doc update to include bundlers repo
2022-01-25 03:48:44 -05:00
Tom Bereknyei
93299efc7c
bundler: add tests and change defaults to use a derivation
2022-01-25 03:39:18 -05:00
Farid Zakaria
8ba7a2d3a8
Do not suppress errors in nix-env from feedback by Eelco
2022-01-24 19:12:13 -08:00
Tom Bereknyei
c94db0535c
Refactor bundler API
...
Bundlers now expect to be located at bundlers.<system>.<name> and are a
function from derivations to derivations.
2022-01-24 21:43:04 -05:00
Tom Bereknyei
3be810f5db
bundler: pass drv attrset instead of path
2022-01-24 21:43:04 -05:00
Eelco Dolstra
8cbbaf23e8
Allow builtins.{readFile,path} on invalid paths
...
Stop-gap measure to fix #5975 .
2022-01-24 23:02:28 +01:00
Eelco Dolstra
bed8270c0c
Fix parsing of variable names that are a prefix of '__curPos'
...
Fixes
$ nix-instantiate --parse -E 'x: with x; _'
(x: (with x; __curPos))
2022-01-24 15:18:18 +01:00
Eelco Dolstra
c4fc9b6a8d
ExprConcatStrings::show(): Print values instead of pointers
2022-01-24 15:08:16 +01:00
Eelco Dolstra
7afbdf2545
hiliteMatches(): Style fixes, pass more stuff by reference
2022-01-24 14:47:34 +01:00
Théophane Hufschmitt and GitHub
4530574363
Merge pull request #5945 from afishhh/master
...
Make `nix search` highlight all regexes and matches
2022-01-24 13:02:51 +01:00
Eelco Dolstra and GitHub
8c778e3d9d
Merge pull request #5964 from pennae/fix-bulk-alloc
...
allocate a GC root value for the Value cache pointer
2022-01-24 12:43:14 +01:00
Eelco Dolstra and GitHub
1e2bfd3da5
Merge pull request #5965 from SuperSandro2000/nix-shell-rm
...
nix-shell: use clean rm, not any aliases/functions
2022-01-24 12:40:53 +01:00
Eelco Dolstra and GitHub
076945c808
Merge pull request #5875 from hercules-ci/fix-large-drv-field-stack-overflow
...
Fix segfault or stack overflow caused by large derivation fields
2022-01-24 12:05:30 +01:00
regnat
ffb28eaa1e
Add a small documentation for hiliteMatches
2022-01-24 10:07:02 +01:00
Sandro Jäckel
040cb7304a
nix-shell: use clean rm, not any aliases/functions
2022-01-23 04:58:00 +01:00
pennae
fd5aa6ee3e
allocate a GC root value for the Value cache pointer
...
keeping it as a simple data member means it won't be scanned by the GC, so
eventually the GC will collect a cache that is still referenced (resulting in
use-after-free of cache elements).
fixes #5962
2022-01-22 21:19:56 +01:00
Kevin Amado
50efc5499a
determinePos: remove from critical path
2022-01-21 16:32:43 -05:00
Kevin Amado
3d2ad2b70b
forceList: make pos mandatory
2022-01-21 16:32:43 -05:00
Kevin Amado
c3896e19d0
forceAttrs: make pos mandatory
2022-01-21 16:32:43 -05:00
Kevin Amado
1472e045a7
avoid unnecesary calls
2022-01-21 16:32:43 -05:00
Kevin Amado
49b0bb0206
forceValue: make pos mandatory
...
- Make passing the position to `forceValue` mandatory,
this way we remember people that the position is
important for better error messages
- Add pos to all `forceValue` calls
2022-01-21 16:32:43 -05:00
Fishhh
f82a426502
Add some tests for hiliteMatches in libutil
2022-01-21 20:10:54 +01:00
Fishhh
1e0b7cdc3f
Move hilite_all into libutil and rename it to hiliteMatches
...
The signature was also changed so the function now accepts a vector
instead of an iterator
2022-01-21 20:10:46 +01:00
0407436b0f
derivations.cc: Use larger buffer in printString
...
If we want to be careful about hitting the stack protector page, we should use `-fstack-check` instead.
Co-authored-by: Eelco Dolstra <edolstra@gmail.com >
2022-01-21 17:25:37 +01:00
Eelco Dolstra
128098040b
Fix exception handling around realisePath()
...
This no longer worked correctly because 'path' is uninitialised when
an exception occurs, leading to errors like
… while importing ''
at /nix/store/rrzz5b1pshvzh1437ac9nkl06br81lkv-source/flake.nix:352:13:
So move the adding of the error context into realisePath().
2022-01-21 13:53:18 +01:00
Eelco Dolstra and GitHub
e85cf34ea3
Merge pull request #5949 from obsidiansystems/old-copyClosure
...
Add back `copyClosure` for plain `StorePath`s
2022-01-21 11:33:32 +01:00
Eelco Dolstra