scriptis/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
11881 commits 30 branches 6 tags 84 MiB
Commit graph

7474 commits

Author SHA1 Message Date
John Ericson 3c220442ff Merge remote-tracking branch 'upstream/master' into fix-url-format 2022-04-20 16:53:16 +00:00
Eelco Dolstra c9e58aa5ff Require formatters to be packages 
Because of 9b41239d8f, a formatter can
no longer be a package *or* an app. So let's require it to be a
package for now.
 2022-04-19 20:48:13 +02:00
Eelco Dolstra 48a467f2b9 Merge branch 'issue-6075' of https://github.com/kamadorueda/nix 2022-04-19 20:21:32 +02:00
Eelco Dolstra 51712bf012
Merge pull request #6128 from ncfavier/fix-completion 
Shell completion improvements
 2022-04-19 13:45:33 +02:00
Eelco Dolstra 2016b7142a Fix compilation, style fixes 2022-04-19 13:41:32 +02:00
Eelco Dolstra b529a41814 Merge branch 'make-flake-show-more-lenient-on-apps' of https://github.com/flox/nix 2022-04-19 13:41:24 +02:00
Eelco Dolstra 1b43d64648
Merge pull request #6415 from aakropotkin/doc.connect-timeout.default 
doc: document nix.conf connect-timeout default
 2022-04-19 12:27:30 +02:00
Eelco Dolstra 018db1c420
Merge pull request #6404 from edolstra/unify-flake-attr-eval 
Make InstallableFlake::toValue() and toDerivation() behave consistently
 2022-04-19 11:53:27 +02:00
John Ericson 75b62e5260 Avoid fmt when constructor already does it 
There is a correctnes issue here, but #3724 will fix that. This is just
a cleanup for brevity's sake.
 2022-04-19 01:44:11 +00:00
Robert Helgesson 8b659eacce
Add .tgz as tarball extension in documentation 
Support for the `tgz` shorthand was added in
52f5fa948a.
 2022-04-18 17:14:15 +02:00
Alex Ameen e5c934cd48
doc: rephrase connect-timeout help message 
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
 2022-04-17 18:17:37 -05:00
Alex Ameen 25c85f5a0e
doc: document nix.conf connect-timeout default 2022-04-17 17:14:38 -05:00
Eelco Dolstra b135de2b5f
Merge pull request #6323 from erikarvstedt/eval-read-only 
`nix eval`: Add option `--read-only`
 2022-04-15 10:31:05 +02:00
Tom Bereknyei 9b41239d8f fix: ensure apps are apps and packages are packages 2022-04-14 23:57:52 -04:00
Eelco Dolstra d6effddd3b
Merge pull request #6387 from Uthar/fix 
assert hash types for Git and Mercurial
 2022-04-14 14:55:27 +02:00
Eelco Dolstra d89840b103 Make InstallableFlake::toValue() and toDerivation() behave consistently 
In particular, this means that 'nix eval` (which uses toValue()) no
longer auto-calls functions or functors (because
AttrCursor::findAlongAttrPath() doesn't).

Fixes #6152.

Also use ref<> in a few places, and don't return attrpaths from
getCursor() because cursors already have a getAttrPath() method.
 2022-04-14 14:07:04 +02:00
Kasper Gałkowski 2769e43f61 assert hash types for Git and Mercurial 2022-04-12 21:13:14 +02:00
Eelco Dolstra f7276bc948
Merge pull request #6392 from danpls/fix-actualUrl-mercurial 
libfetchers: Fix assertion (Mercurial)
 2022-04-11 11:16:04 +02:00
Eelco Dolstra 092f6d2e7a
Merge pull request #6380 from thufschmitt/fix-double-slahsh-in-uri 
Allow empty path segments in urls
 2022-04-11 11:15:14 +02:00
Eelco Dolstra 2311868aaa
Merge pull request #6391 from danpls/replace-regex 
libfetchers: Replace regex to clarify intent
 2022-04-11 11:14:10 +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
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
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 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
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
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
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 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 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
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
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
Théophane Hufschmitt 5abe3f4aa6 Allow welcomeText when checking a flake template 
Fix https://github.com/NixOS/nix/issues/6321
 2022-04-05 11:03:43 +02:00
Cole Helbling 56009b2639 libutil: don't save cwd fd, use path instead 
Saving the cwd fd didn't actually work well -- prior to this commit, the
following would happen:

    : ~/w/vc/nix ; doas outputs/out/bin/nix --experimental-features 'nix-command flakes' run nixpkgs#coreutils -- --coreutils-prog=pwd
    pwd: couldn't find directory entry in ‘../../../..’ with matching i-node
    : ~/w/vc/nix ; doas outputs/out/bin/nix --experimental-features 'nix-command flakes' develop -c pwd
    pwd: couldn't find directory entry in ‘../../../..’ with matching i-node
 2022-04-04 10:28:08 -07:00
Cole Helbling 10b9c1b2b2 libutil: save cwd fd in restoreMountNamespace 
This doesn't work very well (maybe I'm misunderstanding the desired
implementation):

    : ~/w/vc/nix ; doas outputs/out/bin/nix --experimental-features 'nix-command flakes' develop -c pwd
    pwd: couldn't find directory entry in ‘../../../..’ with matching i-node
 2022-04-04 10:28:00 -07:00
Cole Helbling f89b0f7846 libutil: try restoring the cwd from fdSavedCwd 2022-04-04 08:33:59 -07:00
Cole Helbling e135d223f6 libutil: save fd to cwd instead of cwd itself 2022-04-04 08:32:45 -07:00
Cole Helbling e5b70d47aa libutil: cleanup savedCwd logic 
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
 2022-04-04 08:20:11 -07:00
Eelco Dolstra a4a1de69dc Add missing #include 2022-04-04 16:49:39 +02:00
Tom Bereknyei c1e2ce4515 fix(run): set applyNixConfig lockFlag 2022-04-01 23:41:34 -04:00
Cole Helbling 2a45cf54e4 libutil: Properly guard self-allocating getcwd on GNU 
It's a GNU extension, as pointed out by pennae.
 2022-04-01 12:20:34 -07:00
Cole Helbling 7f5caaa7c0 libutil: Don't use std::filesystem 
Just in case making libutil depend on std::filesystem is unacceptable,
here is the non-filesystem approach.
 2022-04-01 10:24:31 -07:00