nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-30 14:10:59 +01:00
Code Activity
13697 commits 187 branches 219 tags 172 MiB
Commit graph

297 commits

Author SHA1 Message Date
Eelco Dolstra
3621d0769d Merge remote-tracking branch 'origin/master' into lazy-trees 2023-01-26 14:29:15 +01:00
Guillaume Maudoux
ca7c5e08c1 Add tests for error traces, and fixes 2023-01-19 14:10:56 +01:00
Guillaume Maudoux
e4726a0c79 Revert "Revert "Merge pull request #6204 from layus/coerce-string"" 
This reverts commit 9b33ef3879.
 2023-01-19 13:23:04 +01:00
Robert Hensing
9b33ef3879 Revert "Merge pull request #6204 from layus/coerce-string" 
This reverts commit a75b7ba30f, reversing
changes made to 9af16c5f74.
 2023-01-18 01:34:07 +01:00
Eelco Dolstra
fa5af1e583 Fix support for relative non-flake inputs (path:./bla) 2023-01-12 16:16:30 +01:00
Eelco Dolstra
20a0a74f49 Merge remote-tracking branch 'origin/master' into lazy-trees 2023-01-12 14:32:56 +01:00
John Ericson
ce2f91d356 Split OutputsSpec and ExtendedOutputsSpec, use the former more 
`DerivedPath::Built` and `DerivationGoal` were previously using a
regular set with the convention that the empty set means all outputs.
But it is easy to forget about this rule when processing those sets.
Using `OutputSpec` forces us to get it right.
 2023-01-11 18:57:18 -05:00
John Ericson
a7c0cff07f Rename OutputPath -> ExtendedOutputPath 
Do this prior to making a new more limitted `OutputPath` we will use in
more places.
 2023-01-11 18:55:29 -05:00
John Ericson
a8f45b5e5a Improve OutputsSpec slightly 
A few little changes preparing for the rest.
 2023-01-11 18:54:50 -05:00
Eelco Dolstra
29dff7e24e Merge remote-tracking branch 'origin/master' into lazy-trees 2023-01-11 13:26:20 +01:00
John Ericson
da64f026dd Make clear that StorePathWithOutputs is a deprecated type 
- Add a comment

- Put `OutputsSpec` in a different header (First part of #6815)

- Make a few stray uses of it in new code use `DerivedPath` instead.
 2023-01-10 11:27:19 -05:00
Eelco Dolstra
6b69652385 Merge remote-tracking branch 'origin/master' into coerce-string 2023-01-02 20:53:39 +01:00
Eelco Dolstra
15d2e0e63b Merge remote-tracking branch 'origin/master' into tmp 2022-12-20 13:50:16 +01:00
Eelco Dolstra
8332ac6a1d
Merge pull request #7451 from edolstra/abstract-pos 
Introduce AbstractPos
 2022-12-20 12:55:13 +01:00
Solène Rapenne
d0660c6c0b
printMsg replacement by printInfo 
Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
 2022-12-16 09:34:22 +01:00
Solène Rapenne
98e01da0b1 warnings: switch to info level when using a saved substituter 2022-12-14 14:11:21 +01:00
Eelco Dolstra
8becbb063a Merge remote-tracking branch 'origin/master' into lazy-trees 2022-12-14 14:02:36 +01:00
Eelco Dolstra
b3fdab28a2 Introduce AbstractPos 
This makes the position object used in exceptions abstract, with a
method getSource() to get the source code of the file in which the
error originated. This is needed for lazy trees because source files
don't necessarily exist in the filesystem, and we don't want to make
libutil depend on the InputAccessor type in libfetcher.
 2022-12-13 00:50:43 +01:00
John Ericson
7b122d43a4 Fix stack context notes to not rely on order 
Make everything be in the form "while ..." (most things were already),
and in particular *don't* use other propositions that must go after or
before specific "while ..." clauses to make sense.
 2022-12-12 18:41:00 +00:00
Eelco Dolstra
12c554acd4 Merge remote-tracking branch 'origin/master' into lazy-trees 2022-12-12 17:53:06 +01:00
Eelco Dolstra
877ea1dab8
Use get_ptr() 
Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
 2022-12-12 12:46:13 +01:00
Eelco Dolstra
d950e3a0db Improve error message when flake.nix exists but is not under Git control 2022-12-09 17:53:44 +01:00
Eelco Dolstra
703d863a48 Trivial changes from the lazy-trees branch 2022-12-07 14:06:34 +01:00
Eelco Dolstra
39a783ffff Require flakes for the -I flake:... feature 2022-12-01 16:59:18 +01:00
Eelco Dolstra
e2353b9b45 Merge remote-tracking branch 'origin/master' into lazy-trees 2022-10-26 16:30:23 +02:00
Eelco Dolstra
da2c61637b
Use _type 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2022-10-25 16:48:31 +02:00
Shea Levy
334fa81d08
Mark flakes with .type = "flake". 
Fixes #7186
 2022-10-23 06:54:11 -04:00
Guillaume Maudoux
3f9f6ae127 Merge remote-tracking branch 'origin/master' into coerce-string 2022-10-16 20:39:19 +02:00
Eelco Dolstra
511590976c Fix handling of relative paths 
In particular, 'path:..' got turned into 'path:.' because isRelative()
returned a CanonPath, which cannot represent '..'.

Reported by @erikarvstedt.
 2022-10-10 18:56:19 +02:00
Eelco Dolstra
cbade16f9e Handle unlocked overriden inputs 
This fixes the error

  in pure evaluation mode, 'fetchTree' requires a locked input

when using '--override-input X Y' where Y is an unlocked input (e.g. a
dirty Git tree).

Also, make LockFile use ref instead of std::shared_ptr.
 2022-09-29 16:14:56 +02:00
Eelco Dolstra
a291e37b20 Improve error messages from call-flake.nix 2022-09-28 15:09:24 +02:00
Eelco Dolstra
28b62dd3e0 Merge remote-tracking branch 'origin/master' into lazy-trees 2022-09-28 14:13:44 +02:00
Eelco Dolstra
6806f20157
Merge pull request #7089 from NixOS/mention-accept-flake-config-in-warning 
Mention `--accept-flake-config` in the related warning
 2022-09-26 11:13:02 +02:00
Théophane Hufschmitt
1a5d094be7
Mention --accept-flake-config in the related warning 
Make sure that people who run Nix in non-interactive mode (and so don't have the possibility to interactively accept the individual flake configuration settings) are aware of this flag.

Fix #7086
 2022-09-24 12:11:26 +02:00
Guillaume Maudoux
eb460a9529 WIP: broken merge but need a git checkpoint 2022-09-07 00:34:03 +02:00
Eelco Dolstra
ece12a97d9 lockfile -> lock file for consistency 2022-09-06 19:20:31 +02:00
Eelco Dolstra
a8b3d777fb Revert "Merge pull request #6621 from Kha/nested-follows" 
This reverts commit c530cda345, reversing
changes made to 4adcdff5c1.
 2022-09-01 15:26:19 +02:00
Sebastian Ullrich
6f65c11780 Fix overlapping flake follows 2022-08-28 11:50:25 +02:00
Sebastian Ullrich
2b9d381301 Fix nested flake input overrides 2022-08-28 11:47:25 +02:00
Eelco Dolstra
a5fd4ea94e parseFlakeRefWithFragment() improvements 
In particular, plain paths no longer ignore query parameters
(e.g. '/foo/bar?lock=1').
 2022-08-17 15:34:40 +02:00
Eelco Dolstra
18c6daf1a8 Simplify error message 2022-08-17 15:22:58 +02:00
Eelco Dolstra
5ef9008bf3 Merge remote-tracking branch 'origin/master' into lazy-trees 2022-08-04 13:45:22 +02:00
Erik Arvstedt
53833dfb40 libexpr/flake: remove FIXME 
Line 593 checks that all overrides (i.e. all elements of
`lockFlags.inputOverrides`) are members of `overridesUsed`.
 2022-08-04 09:45:29 +02:00
Erik Arvstedt
c9f446ede1 flakeref: fix comment 2022-08-04 09:45:28 +02:00
Eelco Dolstra
f780539406 Add abstract interface for writing files to an Input 2022-07-27 14:26:15 +02:00
Eelco Dolstra
bb4d35dcca Make 'nix edit' etc. work again 2022-07-26 17:06:45 +02:00
Eelco Dolstra
1790698a74 Rename fetch() -> fetchToStore(), lazyFetch() -> getAccessor() 2022-07-25 16:30:50 +02:00
Eelco Dolstra
c0555c8e1f Remove Input::computeStorePath() 2022-07-25 15:35:53 +02:00
Eelco Dolstra
e7faf65784 Remove FlakeRef::fetchTree() 2022-07-25 15:12:28 +02:00
Eelco Dolstra
f97489e7ab Remove parent hackery from the path fetcher 
Relative paths of subflakes are now handled in lockFlake().
 2022-07-22 15:24:41 +02:00