aboutsummaryrefslogtreecommitdiff
path: root/src/nix
AgeCommit message (Collapse)Author
2022-07-14Fix bug, test more, document moreJohn Ericson
2022-07-14Merge remote-tracking branch 'upstream/master' into indexed-store-path-outputsJohn Ericson
2022-07-12Merge pull request #6693 from ncfavier/complete-flake-inputsThéophane Hufschmitt
Improve shell completion of flake inputs
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-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 #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-28doc: Fix typoAlex Wied
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-23Fix build-remote in nix-staticEelco Dolstra
'build-remote' is now executed via /proc/self/exe so it always works.
2022-06-23nix develop: save XDG_DATA_DIRS for loadable completionNaïm Favier
2022-06-21 #6542 Apply flake templates partially on conflictsManu [tennox]
Will still exit with non-zero exit code and clearly prompt which files to merge: ``` nixx flake init -t github:numtide/devshell wrote: /home/manu/dev/stuff/gopassbridge/.envrc refusing to overwrite existing file '/home/manu/dev/stuff/gopassbridge/.gitignore' -> merge manually with '/nix/store/ksmwhyghjwb4d9dw6hcpbvng1msdvjim-source/template/.gitignore' wrote: /home/manu/dev/stuff/gopassbridge/devshell.toml wrote: /home/manu/dev/stuff/gopassbridge/flake.nix error: Encountered 1 conflicts - please merge manually ```
2022-06-20Fix arity of `--exclude` flag in `nix search`Fishhh
Due to incorrectly using the Handler(vector<string>*) constructor the `--exclude` flag would swallow all proceeding arguments instead of just one.
2022-06-20Complete flake inputs for all given flakesNaïm Favier
Allow `nix build flake1 flake2 --update-input <Tab>` to complete the inputs of both flakes. Also do tilde expansion so that `nix build ~/flake --update-input <Tab>` works.
2022-06-15Merge branch 'master' into nix-repl-flakesTom Bereknyei
2022-06-15Apply suggestions from code reviewtomberek
Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
2022-06-13Merge pull request #6027 from Ma27/pure-replEelco Dolstra
repl: `--option pure-eval true` actually enables pure eval mode
2022-06-08Fix missing ` in key manualLorenzo Manacorda
2022-06-07Merge pull request #6618 from afishhh/search-excludeEelco Dolstra
Add `-e`/`--exclude` flag to `nix search`
2022-06-07Remove redundant `std::move`s in calls to `hiliteMatches`Fishhh
2022-06-07Add `--exclude` flag to `nix search`Fishhh
If a package's attribute path, description or name contains matches for any of the regexes specified via `-e` or `--exclude` that package is excluded from the final output.
2022-06-02Merge branch 'master' into nix-repl-flakesTom Bereknyei
2022-06-02Merge remote-tracking branch 'upstream/master' into indexed-store-path-outputsJohn Ericson
2022-06-02Explain exactly what nix-upgrade nix doesChris Wögi
2022-05-31repl: `--option pure-eval true` actually enables pure eval modeMaximilian Bosch
To quote Eelco in #5867: > Unfortunately we can't do > > evalSettings.pureEval.setDefault(false); > > because then we have to do the same in main.cc (where > pureEval is set to true), and that would allow pure-eval > to be disabled globally from nix.conf. Instead, a command should specify that it should be impure by default. Then, `evalSettings.pureEval` will be set to `false;` unless it's overridden by e.g. a CLI flag. In that case it's IMHO OK to be (theoretically) able to override `pure-eval` via `nix.conf` because it doesn't have an effect on commands where `forceImpureByDefault` returns `false` (i.e. everything where pure eval actually matters). Closes #5867
2022-05-25Merge branch 'master' into debug-exploratory-PRBen Burdette
2022-05-25Merge remote-tracking branch 'origin/file-fetcher'Eelco Dolstra
2022-05-25Fix warningEelco Dolstra
2022-05-23Merge pull request #6560 from ncfavier/patch-1Théophane Hufschmitt
typo: defaultApps → defaultApp
2022-05-23Merge pull request #6532 from flox/show_warningThéophane Hufschmitt
fix: alignment during flake show of legacyPackages
2022-05-21typo: defaultApps → defaultAppNaïm Camille Favier
2022-05-20repl: add repl-flake experimental feature for gatingTom Bereknyei
2022-05-20repl: allow --file to always utilize autoargsTom Bereknyei
2022-05-20Apply suggestions from code review tomberek
Style fixes from @edolstra Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2022-05-19fetchTree: Allow fetching plain filesTony Olagbaiye
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-19repl: hide flake behavior behind flag and provide warningTom Bereknyei
2022-05-18repl: provide backward compat with legacy usageTom Bereknyei
2022-05-18refactor: factor out getValueTom Bereknyei
2022-05-18Apply suggestions from code reviewtomberek
Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
2022-05-18repl: update docs with installablesTom Bereknyei
2022-05-18repl: use installablesTom Bereknyei
2022-05-18repl: allow loading installables from CLITom Bereknyei
repl: search installable with findAlongAttrPath repl: refactor handling of args repl: temp
2022-05-18nix repl: load flakes from cli argsTimothy DeHerrera
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-18Hint at the source file on conflict in `flake new`Théophane Hufschmitt
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-16resolve redundant priority passing, wrap NixInt in eval-cache variantEli Kogan-Wang
2022-05-16Merge branch 'NixOS:master' into masterelikoga