Eelco Dolstra
f6a434c8a4
Fix debug message
2022-07-12 11:53:34 +02:00
1f771065f1
Move follows-check into its own function
2022-07-12 11:25:33 +02:00
411111a3bc
Turn error for non-existant follows into a warning
2022-07-12 11:22:35 +02:00
Eelco Dolstra
6260040b9d
Merge pull request #6781 from ryantm/stale
...
update stale bot per RFC 0124
2022-07-12 10:32:56 +02:00
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] 2664a216e5
[2] https://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
Théophane Hufschmitt
f071eb3702
Merge pull request #6693 from ncfavier/complete-flake-inputs
...
Improve shell completion of flake inputs
2022-07-12 09:12:00 +02:00
Eelco Dolstra
7e23039b7f
Merge pull request #6786 from edolstra/fix-aarch64-static
...
Fix buildStatic.aarch64-linux
2022-07-11 21:42:53 +02:00
Eelco Dolstra
28e913c605
Branch 2.10 release notes
2022-07-11 21:10:23 +02:00
Eelco Dolstra
c364e0b098
Fix buildStatic.aarch64-linux
...
Commit 925b975224
accidentally enabled
use of the gold linker on aarch64-linux, which apparently doesn't work.
https://hydra.nixos.org/build/183500621
2022-07-11 20:57:29 +02:00
Eelco Dolstra
b6e90de0aa
Merge pull request #6608 from bburdette/ignore-try
...
--ignore-try flag for debugger mode
2022-07-11 20:17:11 +02:00
Ben Burdette
cdcc349072
Merge branch 'master' into ignore-try
2022-07-11 11:29:22 -06:00
Ben Burdette
a3629ab0cc
move ignore-try to EvalSettings
2022-07-11 10:47:09 -06:00
Ben Burdette
6ac8200ff5
use util.hh class instead of local
2022-07-11 10:21:40 -06:00
Ben Burdette
69ea265fd2
'tryEval' not 'try clause'
2022-07-11 10:21:12 -06:00
Naïm Favier
711b2e1f48
Fix flake input completion for InstallablesCommand
s
...
Defers completion of flake inputs until the whole command line is parsed
so that we know what flakes we need to complete the inputs of.
Previously, `nix build flake --update-input <Tab>` always behaved like
`nix build . --update-input <Tab>`.
2022-07-11 15:13:51 +02:00
Eelco Dolstra
545383208e
Merge pull request #6777 from laalsaas/master
...
Fix logical and typographical errors in nix-env man page
2022-07-11 13:52:40 +02:00
Eelco Dolstra
517ce38dad
Update release notes
2022-07-11 11:17:19 +02:00
Ryan Mulligan
5022a71305
update stale bot per RFC 0124
2022-07-10 16:50:49 -07:00
laalsaas
eac211a171
Fix logical and typographical errors in nix-env man page
2022-07-10 12:30:17 +02:00
Eelco Dolstra
f6316b49a0
Merge pull request #6768 from NixOS/add-rl-for-traceverbose
...
Add a release notes entry for #4914
2022-07-06 10:46:47 +02:00
Théophane Hufschmitt
6fa95c35c7
Add a release notes entry for #4914
...
cc @gytis-ivaskevicius
2022-07-06 06:46:54 +02:00
Théophane Hufschmitt
b0e18df994
Merge pull request #4914 from gytis-ivaskevicius/master
...
Add builtins.debug
2022-07-06 06:41:18 +02:00
Gytis Ivaskevicius
b2703c73a4
builtins.traceVerbose: Post rebase fixes
2022-07-05 19:56:39 +03: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
f653185107
Merge pull request #6762 from thufschmitt/restrict-ci-permissions
...
Restrict the permissions of the CI
2022-07-05 17:11:16 +02:00
Théophane Hufschmitt
541e10496a
Fix the hydra_status CI job
2022-07-05 16:28:39 +02:00
Théophane Hufschmitt
70083218b3
Restrict the permissions of the CI
2022-07-05 16:01:20 +02:00
Théophane Hufschmitt
057b02fd25
Merge pull request #6746 from turrisxyz/Pinned-Dependencies-GitHub
...
chore: Set permissions for GitHub actions
2022-07-05 16:00:39 +02: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
Rok Garbas
8a3d34e974
Merge pull request #6749 from centromere/docker-extra-pkgs-layers
...
Allow specification of extra packages, maxLayers in Docker image
2022-07-05 12:42:49 +02:00
Alex Wied
07416a6005
Allow specification of extra packages, maxLayers in Docker image
2022-07-01 17:53:14 -04:00
naveen
d31c520f40
chore: Set permissions for GitHub actions
...
Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.
- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions
https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs
[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/ )
Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
2022-07-01 00:29:30 +00: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
3b18058969
Merge pull request #6674 from virusdave/dnicponski/scratch/dont_capture_stdout_in_nix_repl_master
...
Don't capture `stdout` when launching subshells in `nix repl`
2022-06-29 17:54:41 +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
4248174e71
Merge pull request #6702 from ncfavier/develop-prepend-vars
...
nix develop: save XDG_DATA_DIRS for loadable completion
2022-06-29 14:49:31 +02:00
Théophane Hufschmitt
f8fea9075c
Merge remote-tracking branch 'origin/master' into better-flake-new-error-message
2022-06-29 13:44:14 +02:00
Eelco Dolstra
7633764342
Merge pull request #6739 from edolstra/ignore-chroot-error
...
Don't fail if we can't create ~/.local/share/nix/root
2022-06-29 13:06:35 +02:00
Eelco Dolstra
6cab528461
Don't fail if we can't create ~/.local/share/nix/root
...
https://hydra.nixos.org/build/182135943
2022-06-29 12:16:51 +02:00
Eelco Dolstra
865af66112
Merge pull request #6738 from edolstra/quote
...
src/libexpr/tests/primops.cc: Quote Nix expressions
2022-06-29 12:16:15 +02:00
Eelco Dolstra
455177cbe0
src/libexpr/tests/primops.cc: Quote Nix expressions
...
Otherwise they don't survive reformatting, see the failure in
https://github.com/NixOS/nix/pull/6721 .
2022-06-29 11:37:25 +02:00
Eelco Dolstra
3c1814423b
Merge pull request #6737 from centromere/fix-typo
...
doc: Fix typo
2022-06-29 11:02:46 +02:00
Théophane Hufschmitt
56cf96a1b9
Merge pull request #6706 from lheckemann/cache-info-cache-invalidation
...
nar-info-disk-cache: refresh nix-cache-info weekly
2022-06-29 07:56:27 +02:00
Alex Wied
cd361b31fa
doc: Fix typo
2022-06-28 22:43:37 -04:00
Eelco Dolstra
6cb41288ac
Merge pull request #6727 from symphorien/shallow-doc
...
fetchGit: document `shallow` argument
2022-06-27 14:11:37 +02:00