Ben Burdette
7ddef73d02
de-const evalState exceptions
2022-05-19 12:44:40 -06:00
Artturin
cebef6a250
nix-daemon.service: sync LimitNOFILE with the nixos service
...
5628480acd/nixos/modules/services/misc/nix-daemon.nix (L737)https://github.com/NixOS/nix/issues/6007
2022-05-19 21:16:07 +03: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
Tony Olagbaiye
5b8c1deb18
fetchTree: Allow fetching plain files
...
Add a new `file` fetcher type, which will fetch a plain file over
http(s), or from the local file.
Because plain `http(s)://` or `file://` urls can already correspond to
`tarball` inputs (if the path ends-up with a know archive extension),
the URL parsing logic is a bit convuluted in that:
- {http,https,file}:// urls will be interpreted as either a tarball or a
file input, depending on the extensions of the path part (so
`https://foo.com/bar ` will be a `file` input and
`https://foo.com/bar.tar.gz ` as a `tarball` input)
- `file+{something}://` urls will be interpreted as `file` urls (with
the `file+` part removed)
- `tarball+{something}://` urls will be interpreted as `tarball` urls (with
the `tarball+` part removed)
Fix #3785
Co-Authored-By: Tony Olagbaiye <me@fron.io>
2022-05-19 18:24:49 +02:00
Eelco Dolstra
885a09c3fa
Disable some tests
2022-05-19 13:22:13 +02:00
Eelco Dolstra
31d8f3369d
Fix fetchGit
2022-05-19 13:17:05 +02:00
Eelco Dolstra
066ed1c830
Restore previous fetchGit behaviour
...
For compatibility, it returns a store path again, rather than a
SourcePath.
2022-05-19 12:29:17 +02:00
Tom Bereknyei
f21dec5bef
repl: hide flake behavior behind flag and provide warning
2022-05-19 01:02:24 -04:00
Tom Bereknyei
e1f308a1ec
repl: provide backward compat with legacy usage
2022-05-18 22:28:15 -04:00
Tom Bereknyei
7534798eed
refactor: factor out getValue
2022-05-18 21:36:50 -04:00
tomberek
9f8c1183fa
Apply suggestions from code review
...
Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
2022-05-18 21:21:58 -04:00
Tom Bereknyei
1ca3f6035d
repl: update docs with installables
2022-05-18 21:21:38 -04:00
Tom Bereknyei
5640b52834
repl: use installables
2022-05-18 21:20:59 -04:00
Tom Bereknyei
81567a0962
repl: allow loading installables from CLI
...
repl: search installable with findAlongAttrPath
repl: refactor handling of args
repl: temp
2022-05-18 21:20:59 -04:00
Timothy DeHerrera
06d57ce759
nix repl: load flakes from cli args
...
If experimental feature "flakes" is enabled, args passed to `nix repl`
will now be considered flake refs and imported using the existing
`:load-flake` machinery.
In addition, `:load-flake` now supports loading flake fragments.
2022-05-18 21:20:59 -04:00
Eelco Dolstra
3cc9dc38f3
Re-enable a test
2022-05-19 00:13:12 +02:00
Eelco Dolstra
d7d93ebdc4
Fix CanonPath::parent()
...
This also fixes flake.lock loading.
2022-05-19 00:08:51 +02:00
Eelco Dolstra
c80b942c6e
Provide a default Input::fetch() that uses lazyFetch()
2022-05-18 23:24:05 +02:00
Eelco Dolstra
df713a5d25
Detect symlink cycles
2022-05-18 23:09:12 +02:00
Eelco Dolstra
593798b2a0
Show a sensible error when a file exists but is not under git control
...
Example:
error: access to path '/home/eelco/Dev/patchelf/foo.nix' is forbidden because it is not under Git control; maybe you should 'git add' it to the repository '/home/eelco/Dev/patchelf'?
Fixes #4507 .
2022-05-18 22:56:39 +02:00
Théophane Hufschmitt
452ffe5464
Hint at the source file on conflict in flake new
...
Add a pointer to the source file (from the template) when `nix flake new` (or `init`) encounters an already existing file
Fix #6542
2022-05-18 16:46:13 +02: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
Eelco Dolstra
1970d6db12
Fix showing an appropriate RestrictedPathError
2022-05-18 14:20:24 +02:00
Eelco Dolstra
51d13c43c1
Merge pull request #6543 from herberteuler/master
...
primop_match: fix example letter case in document
2022-05-18 10:56:11 +02:00
zhujun
b8e44dc62b
primop_match: fix example letter case in document
2022-05-18 14:05:26 +08:00
Eelco Dolstra
c1a202c348
Remove dead code
2022-05-17 21:53:54 +02:00
Eelco Dolstra
91e641af88
Fix $NIX_PATH access control initialisation
2022-05-17 21:53:54 +02:00
Eelco Dolstra
8be06c9aa1
Fix IFD
2022-05-17 14:04:55 +02:00
Eelco Dolstra
df2aa29690
Improve symlink handling
2022-05-17 13:56:26 +02:00
Eelco Dolstra
2a53574675
resolveExprPath(): Handle symlinks
2022-05-17 12:41:09 +02:00
Eelco Dolstra
fdba67d4fa
Fix access control
2022-05-17 12:18:13 +02:00
Eelco Dolstra
65e1e49cf7
nix-env: Use SourcePath
2022-05-17 00:04:04 +02:00
Eelco Dolstra
7617d15458
Fix git fetcher
2022-05-16 23:29:39 +02:00
Eelco Dolstra
a71f209330
Add CanonPath wrapper to represent canonicalized paths
2022-05-16 23:27:04 +02:00
Cole Helbling
685107c6c8
flake: use github: reference to nixpkgs
...
This allows flakes that don't override the Nixpkgs input and also have a
different flake registry.
2022-05-16 11:46:44 -07: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
fdc97fc3f9
Merge pull request #6522 from elikoga/master
...
Add priority for nix profile install
2022-05-16 17:13:43 +02: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
e53349dd6e
change priority conflict message
2022-05-16 16:16:06 +02:00
Eli Kogan-Wang
27d0f6747d
resolve redundant priority passing, wrap NixInt in eval-cache variant
2022-05-16 15:17:35 +02:00
Eelco Dolstra
937a106100
Merge pull request #6517 from NixOS/document-the-libexpr-tests
...
Expand the testing section of the hacking docs
2022-05-16 13:19:03 +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
Ben Burdette
6faa56ea1f
remove extra argument
2022-05-15 12:05:34 -06:00
Eli Kogan-Wang
be2b19041e
Integrate review changes
2022-05-13 22:02:28 +02:00
Tom Bereknyei
8150b93968
fix: alignment during flake show of legacyPackages
...
Fixes:
https://github.com/NixOS/nix/issues/6240
https://github.com/NixOS/nix/issues/6045
2022-05-13 11:12:11 -04:00
Eelco Dolstra
de35e2d3b4
Fix resolving indirect flakerefs
2022-05-13 14:41:42 +02:00
