aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-07-12flakes: throw an error if `follows`-declaration for an input is invalidMaximilian Bosch
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] 2664a216e57169ec57d7f51be1b8383c1be83fd5 [2] https://github.com/NixOS/nix/issues/5790
2022-07-12Merge pull request #6693 from ncfavier/complete-flake-inputsThéophane Hufschmitt
Improve shell completion of flake inputs
2022-07-11Merge pull request #6786 from edolstra/fix-aarch64-staticEelco Dolstra
Fix buildStatic.aarch64-linux
2022-07-11Branch 2.10 release notesEelco Dolstra
2022-07-11Fix buildStatic.aarch64-linuxEelco Dolstra
Commit 925b97522497e9c0f7a385c904410e560796208f accidentally enabled use of the gold linker on aarch64-linux, which apparently doesn't work. https://hydra.nixos.org/build/183500621
2022-07-11Merge pull request #6608 from bburdette/ignore-tryEelco Dolstra
--ignore-try flag for debugger mode
2022-07-11Merge branch 'master' into ignore-tryBen Burdette
2022-07-11move ignore-try to EvalSettingsBen Burdette
2022-07-11use util.hh class instead of localBen Burdette
2022-07-11'tryEval' not 'try clause'Ben Burdette
2022-07-11Fix flake input completion for `InstallablesCommand`sNaïm Favier
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-11Merge pull request #6777 from laalsaas/masterEelco Dolstra
Fix logical and typographical errors in nix-env man page
2022-07-11Update release notesEelco Dolstra
2022-07-10Fix logical and typographical errors in nix-env man pagelaalsaas
2022-07-06Merge pull request #6768 from NixOS/add-rl-for-traceverboseEelco Dolstra
Add a release notes entry for #4914
2022-07-06Add a release notes entry for #4914Théophane Hufschmitt
cc @gytis-ivaskevicius
2022-07-06Merge pull request #4914 from gytis-ivaskevicius/masterThéophane Hufschmitt
Add builtins.debug
2022-07-05builtins.traceVerbose: Post rebase fixesGytis Ivaskevicius
2022-07-05Add builtins.traceVerboseGytis Ivaskevicius
Co-Authored-By: Silvan Mosberger <contact@infinisil.com> Add builtins.traceVerbose tests
2022-07-05Merge pull request #6762 from thufschmitt/restrict-ci-permissionsThéophane Hufschmitt
Restrict the permissions of the CI
2022-07-05Fix the hydra_status CI jobThéophane Hufschmitt
2022-07-05Restrict the permissions of the CIThéophane Hufschmitt
2022-07-05Merge pull request #6746 from turrisxyz/Pinned-Dependencies-GitHubThéophane Hufschmitt
chore: Set permissions for GitHub actions
2022-07-05Merge pull request #6664 from Ma27/innixshell-backwards-compatThéophane Hufschmitt
nix-shell: restore backwards-compat with old nixpkgs
2022-07-05Merge pull request #6749 from centromere/docker-extra-pkgs-layersRok Garbas
Allow specification of extra packages, maxLayers in Docker image
2022-07-01Allow specification of extra packages, maxLayers in Docker imageAlex Wied
2022-07-01chore: Set permissions for GitHub actionsnaveen
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-06-29Merge pull request #6699 from tennox/better-flake-new-error-messageThéophane Hufschmitt
flakes: apply templates partially on conflicts
2022-06-29Merge pull request #6233 from flox/nix-repl-flakesThéophane Hufschmitt
Nix repl flakes
2022-06-29Merge pull request #6674 from ↵Théophane Hufschmitt
virusdave/dnicponski/scratch/dont_capture_stdout_in_nix_repl_master Don't capture `stdout` when launching subshells in `nix repl`
2022-06-29Add some test for `nix flake init` with conflictsThéophane Hufschmitt
2022-06-29Merge pull request #6702 from ncfavier/develop-prepend-varsEelco Dolstra
nix develop: save XDG_DATA_DIRS for loadable completion
2022-06-29Merge remote-tracking branch 'origin/master' into better-flake-new-error-messageThéophane Hufschmitt
2022-06-29Merge pull request #6739 from edolstra/ignore-chroot-errorEelco Dolstra
Don't fail if we can't create ~/.local/share/nix/root
2022-06-29Don't fail if we can't create ~/.local/share/nix/rootEelco Dolstra
https://hydra.nixos.org/build/182135943
2022-06-29Merge pull request #6738 from edolstra/quoteEelco Dolstra
src/libexpr/tests/primops.cc: Quote Nix expressions
2022-06-29src/libexpr/tests/primops.cc: Quote Nix expressionsEelco Dolstra
Otherwise they don't survive reformatting, see the failure in https://github.com/NixOS/nix/pull/6721.
2022-06-29Merge pull request #6737 from centromere/fix-typoEelco Dolstra
doc: Fix typo
2022-06-29Merge pull request #6706 from lheckemann/cache-info-cache-invalidationThéophane Hufschmitt
nar-info-disk-cache: refresh nix-cache-info weekly
2022-06-28doc: Fix typoAlex Wied
2022-06-27Merge pull request #6727 from symphorien/shallow-docEelco Dolstra
fetchGit: document `shallow` argument
2022-06-26#6699 flake init: fix trying to add unchanged fileManu [tennox]
After skipping because of being of identical content it tried to git add it.
2022-06-26#6699 flake init: Apply suggestions of @thufschmittManu [tennox]
2022-06-26Update src/nix/flake.cc Manuel
https://github.com/NixOS/nix/pull/6699#discussion_r904097147 Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
2022-06-26Update src/nix/flake.cc Manuel
https://github.com/NixOS/nix/pull/6699#discussion_r904096906 Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
2022-06-26fetchGit: document `shallow` argumentGuillaume Girol
2022-06-25Merge pull request #6717 from edolstra/move-flake-registryEelco Dolstra
Fetch flake-registry.json from channels.nixos.org
2022-06-25Merge pull request #6714 from edolstra/auto-chroot-storeEelco Dolstra
Automatically use a chroot store if /nix doesn't exist
2022-06-24Only do the auto chroot store on LinuxEelco Dolstra
2022-06-24Add reminder to remove nix-static testing hackEelco Dolstra
https://github.com/NixOS/nix/pull/6708#issuecomment-1165912951