Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trivial changes from the lazy-trees branch #7421

Merged
merged 9 commits into from
Dec 12, 2022

Conversation

edolstra
Copy link
Member

@edolstra edolstra commented Dec 7, 2022

No description provided.

@edolstra edolstra force-pushed the lazy-trees-trivial-changes branch 2 times, most recently from 28f1120 to 6c2652a Compare December 7, 2022 13:04
Copy link
Contributor

@fricklerhandwerk fricklerhandwerk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving the NIX_PATH documentation to the -I section is great, because once we append the common options section to all the old command reference, people will finally be able to find that documentation on their own.

NIX_PATH has been confusing the hell out of people for many years, and I suspect more than half of that was due to the relevant documentation being so hard to discover.

src/libexpr/eval.cc Outdated Show resolved Hide resolved
src/libcmd/common-eval-args.cc Outdated Show resolved Hide resolved
src/libcmd/common-eval-args.cc Outdated Show resolved Hide resolved
doc/manual/src/command-ref/env-common.md Outdated Show resolved Hide resolved
src/libcmd/common-eval-args.cc Show resolved Hide resolved
src/libcmd/common-eval-args.cc Outdated Show resolved Hide resolved
src/libcmd/common-eval-args.cc Outdated Show resolved Hide resolved
src/libcmd/common-eval-args.cc Outdated Show resolved Hide resolved
src/libcmd/common-eval-args.cc Outdated Show resolved Hide resolved
src/libcmd/common-eval-args.cc Outdated Show resolved Hide resolved
Copy link
Member

@thufschmitt thufschmitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for that, it's already more digestible to me than #6530 :)

Left a bunch of small comments here and there for the various changes, but looks good overall

src/libexpr/flake/flake.cc Outdated Show resolved Hide resolved
src/libexpr/flake/flake.cc Outdated Show resolved Hide resolved
src/libexpr/flake/lockfile.cc Show resolved Hide resolved
src/libexpr/flake/lockfile.cc Show resolved Hide resolved
src/libutil/logging.hh Show resolved Hide resolved
src/libutil/util.hh Outdated Show resolved Hide resolved
src/libutil/util.hh Outdated Show resolved Hide resolved
tests/flakes/flakes.sh Show resolved Hide resolved
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/tweag-nix-dev-update-41/23848/1

edolstra and others added 8 commits December 12, 2022 12:36
Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
@edolstra edolstra dismissed stale reviews from thufschmitt and fricklerhandwerk December 12, 2022 12:10

Most suggestions applied.

@edolstra edolstra merged commit 7396844 into NixOS:master Dec 12, 2022
PJungkamp added a commit to PJungkamp/nix that referenced this pull request Feb 8, 2023
The description for commandline falgs is used as an annotation for
commandline completions. These descriptions may *not* include any
newline characters. This line was changed by NixOS#7421 and breaks `nix`
commandline completions for any commandline flags.
PJungkamp added a commit to PJungkamp/nix that referenced this pull request Feb 8, 2023
The description for commandline flags is used as an annotation for
commandline completions. These descriptions may *not* include any
newline characters. This line was changed by NixOS#7421 and breaks `nix`
commandline completions for any commandline flags.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants