Eelco Dolstra
2d5cfca98b
Fix accessing 'toString path'
2022-09-02 19:30:17 +02:00
Eelco Dolstra
795b21f0da
Merge remote-tracking branch 'origin/master' into lazy-trees
2022-08-17 12:20:35 +02:00
Eelco Dolstra
81e42e0d3f
Fix onError
2022-08-17 11:36:58 +02:00
Eelco Dolstra
a218dd80d6
Support locking path inputs
2022-08-16 16:05:43 +02:00
Eelco Dolstra
2e0d63caf6
Add InputAccessor::fetchToStore()
2022-08-11 20:03:22 +02:00
Félix Baylac-Jacqué
b47b6a418d
tests/check.sh: add nix3-build check test
2022-08-03 12:17:13 +02:00
Eelco Dolstra
55c63c9b89
Remove InputScheme::fetchToStore()
...
InputSchemes now only have a getAccessor(). They could be implemented
internally by fetching the input to the store, but in that case they
will just return a FSInputAccessor.
2022-08-01 15:44:40 +02:00
Eelco Dolstra
360a1284db
Fix onError
2022-07-27 16:41:26 +02:00
Eelco Dolstra
022390af5a
Merge remote-tracking branch 'origin/master' into lazy-trees
2022-07-22 15:27:40 +02:00
Théophane Hufschmitt
fbd0a6c6e2
Merge pull request #6784 from tweag/completion-test
...
Add some tests for the CLI completion
2022-07-18 20:32:14 +02:00
Eelco Dolstra
2532fee157
On test failures, print a bash stack trace
...
This makes it easier to identify what command failed. It looks like:
follow-paths.sh: test failed at:
main in follow-paths.sh:54
2022-07-14 15:07:19 +02:00
Eelco Dolstra
7d5e209f23
Merge remote-tracking branch 'origin/master' into lazy-trees
2022-07-14 15:05:44 +02:00
Eelco Dolstra
b15c4fdbde
Split off 'nix flake check' tests
2022-07-13 21:01:16 +02:00
Eelco Dolstra
752158a8ef
Move flake-searching.sh and make it less dependent on git
2022-07-13 20:55:17 +02:00
Eelco Dolstra
6ba45f81a8
Move flake-local-settings.sh
2022-07-13 20:51:28 +02:00
Eelco Dolstra
7abcafcfea
Move the 'nix bundle' tests
...
Note: these were previously not actually called.
2022-07-13 20:49:07 +02:00
Eelco Dolstra
d16f1070f4
Split off following paths tests
2022-07-13 20:46:22 +02:00
Eelco Dolstra
a094259d35
Split off 'nix flake init' tests
2022-07-13 20:37:40 +02:00
Eelco Dolstra
f011c269c9
Split off the circular flake import tests
2022-07-13 20:37:32 +02:00
Eelco Dolstra
c591efafd3
Split off the Mercurial flake tests
2022-07-13 15:06:57 +02:00
Eelco Dolstra
420957e149
Move flakes tests to a subdirectory
2022-07-13 15:06:54 +02:00
Eelco Dolstra
e1153069bd
Merge pull request #6797 from edolstra/overrides-check
...
Simplify the check for overrides on non-existent inputs
2022-07-13 14:45:07 +02:00
Eelco Dolstra
19190c2346
tests/flakes.sh: Make sure flake7 is clean
...
Cherry-picked from the lazy-trees branch, where we no longer write a
lock file if any of the inputs is dirty.
2022-07-13 13:46:33 +02:00
Eelco Dolstra
12df8885cc
Simplify the check for overrides on non-existent inputs
2022-07-13 13:40:40 +02:00
Eelco Dolstra
53b7407041
Simplify the check for overrides on non-existent inputs
2022-07-13 13:39:06 +02:00
Eelco Dolstra
c5b84e1a16
Fix test
2022-07-13 13:17:10 +02:00
Eelco Dolstra
934f317250
Merge remote-tracking branch 'origin/master' into lazy-trees
2022-07-13 12:50:03 +02:00
Théophane Hufschmitt
b052e7e71d
Add some more completion tests
...
- Test another command than `build`
- Test with two input flakes
2022-07-13 10:31:17 +02:00
Théophane Hufschmitt
d34a333e2e
Fix the “out of order” completion test
...
`--override-input` id snarky because it takes two arguments, so it
doesn't play well when completed in the middle of the CLI (since the
argument just after gets interpreted as its second argument). So use
`--update-input` instead
2022-07-13 10:25:28 +02:00
Maximilian Bosch
411111a3bc
Turn error for non-existant follows into a warning
2022-07-12 11:22:35 +02:00
Maximilian Bosch
c1c37f3200
flakes: throw an error if follows-declaration for an input is invalid
...
I recently got fairly confused why the following expression didn't have
any effect
{
description = "Foobar";
inputs.sops-nix = {
url = github:mic92/sops-nix;
inputs.nixpkgs_22_05.follows = "nixpkgs";
};
}
until I found out that the input was called `nixpkgs-22_05` (please note
the dash vs. underscore).
IMHO it's not a good idea to not throw an error in that case and
probably leave end-users rather confused, so I implemented a small check
for that which basically checks whether `follows`-declaration from
overrides actually have corresponding inputs in the transitive flake.
In fact this was done by accident already in our own test-suite where
the removal of a `follows` was apparently forgotten[1].
Since the key of the `std::map` that holds the `overrides` is a vector
and we have to find the last element of each vector (i.e. the override)
this has to be done with a for loop in O(n) complexity with `n` being
the total amount of overrides (which shouldn't be that large though).
Please note that this doesn't work with nested expressions, i.e.
inputs.fenix.inputs.nixpkgs.follows = "...";
which is a known problem[2].
For the expression demonstrated above, an error like this will be
thrown:
error: sops-nix has a `follows'-declaration for a non-existant input nixpkgs_22_05!
[1] 2664a216e5https://github.com/NixOS/nix/issues/5790
2022-07-12 10:18:38 +02:00
Théophane Hufschmitt
21c443d4fd
Test the tilde expansion for the flake completion
...
Also add a disabled test for when the `--override-input` flag comes
*before* the flake ref
2022-07-12 09:48:25 +02:00
Théophane Hufschmitt
07e14d3ef0
Harden the comparisons in the completion test
...
- Don't use `printf` for the expected result, but just use bash's `$' '`
litteral strings
- Quote the `nix` call result
- Invert the order in the comparisons (just because it feels more
natural)
2022-07-12 09:24:31 +02:00
Théophane Hufschmitt
260fb837de
Fix the name of the completions test
2022-07-12 09:24:31 +02:00
Théophane Hufschmitt
32effccb51
Add some tests for the CLI completion
2022-07-12 09:24:31 +02:00
Eelco Dolstra
72dffd6c6c
Connect AbstractPos with Pos
2022-07-05 20:45:29 +02:00
Gytis Ivaskevicius
ba1fe85b65
Add builtins.traceVerbose
...
Co-Authored-By: Silvan Mosberger <contact@infinisil.com>
Add builtins.traceVerbose tests
2022-07-05 19:44:26 +03:00
Théophane Hufschmitt
d63cd77549
Merge pull request #6664 from Ma27/innixshell-backwards-compat
...
nix-shell: restore backwards-compat with old nixpkgs
2022-07-05 15:57:20 +02:00
Théophane Hufschmitt
b7eb4ac169
Merge pull request #6699 from tennox/better-flake-new-error-message
...
flakes: apply templates partially on conflicts
2022-06-29 18:21:07 +02:00
Théophane Hufschmitt
4c8210095e
Merge pull request #6233 from flox/nix-repl-flakes
...
Nix repl flakes
2022-06-29 17:59:22 +02:00
Théophane Hufschmitt
83f96e61a4
Add some test for nix flake init with conflicts
2022-06-29 17:08:03 +02:00
Eelco Dolstra
0d14ffbcba
Merge remote-tracking branch 'origin/master' into lazy-trees
2022-06-28 16:29:42 +02:00
Eelco Dolstra
49c4a37efc
Merge pull request #6717 from edolstra/move-flake-registry
...
Fetch flake-registry.json from channels.nixos.org
2022-06-25 21:17:57 +02:00
Tom Bereknyei
f801d70ba7
tests: enable ca-derivations for simple.nix in repl tests
2022-06-24 11:17:29 -04:00
Théophane Hufschmitt
f06b6fa4fa
Merge pull request #6698 from tweag/forbid-tilde-paths-in-pure-mode
...
Forbid the tilde expansion in pure eval mode
2022-06-24 10:02:40 +02:00
Eelco Dolstra
4b6cc3da62
Fetch flake-registry.json from channels.nixos.org
...
Using fastly is slightly faster, provides some resilience due to a
high stale TTL, and allows some usage metrics.
2022-06-23 23:56:26 +02:00
Eelco Dolstra
f959ce3e03
Merge remote-tracking branch 'origin/master' into lazy-trees
2022-06-23 17:24:44 +02:00
Eelco Dolstra
8bbbb6e737
Enable/fix tests in nix-static
...
pkgsStatic is apparently considered a cross environment, so checkPhase
and installCheckPhase are disabled even when we ask for them.
2022-06-22 23:33:15 +02:00
Maximilian Bosch
e94aa1f647
tests/nix-shell: more meaningful testcase
2022-06-22 22:35:48 +02:00
Théophane Hufschmitt
983efdbde4
Forbid the tilde expansion in pure eval mode
...
Fix #6684
2022-06-21 14:08:18 +02:00
