Eelco Dolstra
734019ce56
Merge pull request #6397 from sebastianblunt/builderlogging
...
Log builder args and environment variables
2022-04-11 11:13:35 +02:00
Sebastian Blunt
63d9a81819
Log builder args and environment variables
...
Previously it only logged the builder's path, this changes it to log the
arguments at the same log level, and the environment variables at the
vomit level.
This helped me debug https://github.com/svanderburg/node2nix/issues/75
2022-04-10 21:10:37 -07:00
Ben Burdette
8b197c492e
remove comma
2022-04-09 21:54:41 -06:00
Daniel Pauls
38125a47ab
Test fetchMercurial with path containing a .
segment
2022-04-09 23:39:00 +02:00
Daniel Pauls
d6b7529579
libfetchers: Fix assertion (Mercurial)
...
See commit 1e1cd6e7a
for more information.
2022-04-09 19:10:23 +02:00
Daniel Pauls
770f7371f3
libfetchers: Replace regex to clarify intent
2022-04-09 17:00:14 +02:00
Ben Burdette
a61841ac41
don't use std::map merge
2022-04-09 07:45:23 -06:00
Ben Burdette
f5757a0804
revise command help
2022-04-08 16:34:20 -06:00
Ben Burdette
3aaf02839f
trace stack, not call stack
2022-04-08 16:22:27 -06:00
Ben Burdette
31bcd55626
clean up makefiles
2022-04-08 15:53:24 -06:00
Ben Burdette
27d45f9eb3
minor cleanup
2022-04-08 15:46:12 -06:00
Ben Burdette
a86c2a8481
remove 'debugError', dead code
2022-04-08 13:30:18 -06:00
Ben Burdette
b8b8ec7101
move throw to preverve Error type; turn off debugger for tryEval
2022-04-08 12:34:27 -06:00
Théophane Hufschmitt
646af7325d
Merge pull request #6376 from Uthar/master
...
don't assume that rev is a SHA1 hash
2022-04-08 17:56:27 +02:00
Théophane Hufschmitt
f3d3587ab3
Allow empty path segments in urls
...
Valid per https://datatracker.ietf.org/doc/html/rfc3986#section-3.3 (and
also somewhat frequently happening for local paths)
2022-04-08 16:09:49 +02:00
Eelco Dolstra
a52e369c07
Merge pull request #6382 from edolstra/remove-error-name
...
Remove unused "name" field from Error
2022-04-08 12:18:47 +02:00
Eelco Dolstra
c68963eaea
Remove duplicate "error:"
2022-04-08 11:48:30 +02:00
Eelco Dolstra
8bd9ebf52c
Error: Remove unused sname() method
2022-04-08 11:31:51 +02:00
Eelco Dolstra
168ef9f3ab
Remove unused Error.name field
2022-04-08 11:31:51 +02:00
Martin Schwaighofer
4f29cf1a1d
installer: ask for confirmation on multi-user install without systemd
...
On Linux a user can go through all the way through the multi-user install
and find out at the end that they now have to manually configure their
init system to launch the nix daemon.
I suspect that for a significant number of users this is not
what they wanted. They might prefer a single-user install.
Now they have to manually uninstall nix before they can
go through the single-user install.
This introduces a confirmation dialog before the install
in that specific situation to make sure that they want to proceed.
See also: https://github.com/NixOS/nix/issues/4999#issuecomment-1064188080
This closes #4999 but rejecting it and closing that issue anyways
would also be valid.
2022-04-08 11:23:54 +02:00
Ben Burdette
1a93ac8133
Merge remote-tracking branch 'upstream/master' into upstream-merge
2022-04-07 13:42:01 -06:00
Ben Burdette
d2ec9b4e15
in debugger mode, print the current error when another repl returns.
2022-04-07 12:09:47 -06:00
Ben Burdette
50b52d5110
remove debug code
2022-04-07 12:03:18 -06:00
Kasper Gałkowski
2c2fd4946f
don't assume that rev is a SHA1 hash
...
This was a problem when writing a fetcher that uses e.g. sha256 hashes
for revisions. This doesn't actually do anything new, but allows for
creating such fetchers in the future (perhaps when support for Git's
SHA256 object format gains more popularity).
2022-04-07 19:49:47 +02:00
Ben Burdette
d29af88d58
newline before env
2022-04-07 11:17:57 -06:00
Ben Burdette
f37562187f
free valmap on exit
2022-04-07 11:17:31 -06:00
Eelco Dolstra
8b1e328d5d
Merge pull request #6348 from cole-h/fix-restoring-mount-namespace
...
libutil: Fix restoring mount namespace
2022-04-07 18:15:33 +02:00
Théophane Hufschmitt
b53e0a6aa0
Merge pull request #6374 from danpls/fix-actualUrl
...
libfetchers: Fix assertion
2022-04-07 17:57:24 +02:00
Théophane Hufschmitt
305d3a0ec3
Test fetchgit with path containing a .
segment
2022-04-07 17:31:12 +02:00
Théophane Hufschmitt
e80dd0b600
Merge pull request #6375 from rehno-lindeque/nixosmodules-dot-default
...
Rename `nixosModule` to `nixosModules.default` consistent with other outputs
2022-04-07 13:01:19 +02:00
Ben Burdette
5cfd038bd8
show expr pos if DebugTrace one is noPos
2022-04-06 19:08:29 -06:00
Rehno Lindeque
5ff4c42608
Update release notes
2022-04-06 12:24:35 -04:00
Rehno Lindeque
b9c969a866
nix flake check: Warn about deprecated nixosModule output
2022-04-06 12:20:39 -04:00
Daniel Pauls
1e1cd6e7a9
libfetchers: Fix assertion
...
The filter expects all paths to have a prefix of the raw `actualUrl`, but
`Store::addToStore(...)` provides absolute canonicalized paths.
To fix this create an absolute and canonicalized path from the `actualUrl` and
use it instead.
Fixes #6195 .
2022-04-06 17:33:23 +02:00
Eelco Dolstra
f01e33f283
Merge pull request #6372 from edolstra/curl-fail
...
Installer: Use curl --fail so we don't silently ignore download errors
2022-04-06 15:02:20 +02:00
Eelco Dolstra
a7b12c6bd9
curl: Use --fail to catch errors
2022-04-06 13:34:25 +02:00
Eelco Dolstra
36c1e3bc5f
Merge pull request #6371 from edolstra/substitution-error-msg
...
Fix empty 'nix copy' error message
2022-04-06 13:17:01 +02:00
Eelco Dolstra
318936366d
Fix empty 'nix copy' error message
...
This was caused by SubstitutionGoal not setting the errorMsg field in
its BuildResult. We now get a more descriptive message than in 2.7.0, e.g.
error: path '/nix/store/13mh...' is required, but there is no substituter that can build it
instead of the misleading (since there was no build)
error: build of '/nix/store/13mh...' failed
Fixes #6295 .
2022-04-06 12:43:53 +02:00
Eelco Dolstra
fbeb8fd1b4
Merge pull request #6370 from edolstra/fetch-closure-query-params
...
fetchClosure: Don't allow URL query parameters
2022-04-06 12:22:39 +02:00
Eelco Dolstra
589f6f267b
fetchClosure: Don't allow URL query parameters
...
Allowing this is a potential security hole, since it allows the user
to specify parameters like 'local-nar-cache'.
2022-04-06 11:52:51 +02:00
Eelco Dolstra
c0ad86f681
Merge pull request #6366 from danpls/base64-reserve
...
libutil: Reserve memory when en/decoding base64
2022-04-05 23:20:33 +02:00
Eelco Dolstra
f89fa29914
Merge pull request #6367 from danpls/fix-npos
...
tokenizeString: Fix semantic mistake
2022-04-05 23:19:35 +02:00
Daniel Pauls
513652d594
tokenizeString: Fix semantic mistake
...
`string_view::find_first_not_of(...)` and
`string_view::find_first_of(...)` return `string_view::npos` on error
not `string::npos`.
2022-04-05 22:33:03 +02:00
Daniel Pauls
1fa0393479
libutil: Reserve memory when en/decoding base64
...
The size of the output when encoding to and decoding from base64 is
(roughly) known so we can allocate it in advance to prevent
reallocation.
2022-04-05 21:30:50 +02:00
Eelco Dolstra
27b952a8a1
Merge pull request #6362 from thufschmitt/verbose-doctor
...
doctor: Always show the output
2022-04-05 17:33:10 +02:00
Eelco Dolstra
71c07ac0e7
Merge pull request #6363 from thufschmitt/definition-list-in-nix.conf-manual
...
Add anchors to the nix.conf options in the manual
2022-04-05 17:32:48 +02:00
Eelco Dolstra
5fe4fe823c
Merge pull request #6365 from edolstra/update-nixpkgs
...
Update to latest Nixpkgs 21.05
2022-04-05 17:23:23 +02:00
Eelco Dolstra
8d6c937d6a
flake.lock: Update
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/82891b5e2c2359d7e58d08849e4c89511ab94234' (2021-09-28)
→ 'github:NixOS/nixpkgs/530a53dcbc9437363471167a5e4762c5fcfa34a1' (2022-02-19)
2022-04-05 16:41:40 +02:00
Eelco Dolstra
f98d76ff1a
rl-2.7.md: Fix title
2022-04-05 14:13:26 +02:00
Théophane Hufschmitt
9a640afc1e
doctor: Always show the output
...
Fix https://github.com/NixOS/nix/issues/6342
2022-04-05 14:04:01 +02:00