forked from NixOS/nix
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into lazy-trees
Also fix the handling of relative CLI overrides (e.g. --override-input B/C "path:./flakeB/flakeD").
- Loading branch information
Showing
32 changed files
with
784 additions
and
266 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
# redirect rules for paths (server-side) to prevent link rot. | ||
# see ./redirects.js for redirects based on URL fragments (client-side) | ||
# | ||
# concrete user story this supports: | ||
# - user finds URL to the manual for Nix x.y | ||
# - Nix x.z (z > y) is the most recent release | ||
# - updating the version in the URL will show the right thing | ||
# | ||
# format documentation: | ||
# - https://docs.netlify.com/routing/redirects/#syntax-for-the-redirects-file | ||
# - https://docs.netlify.com/routing/redirects/redirect-options/ | ||
# | ||
# conventions: | ||
# - always force (<CODE>!) since this allows re-using file names | ||
# - group related paths to ease readability | ||
# - always append new redirects to the end of the file | ||
# - redirects that should have been there but are missing can be inserted where they belong | ||
|
||
/expressions/expression-language /language/ 301! | ||
/expressions/language-values /language/values 301! | ||
/expressions/language-constructs /language/constructs 301! | ||
/expressions/language-operators /language/operators 301! | ||
/expressions/* /language/:splat 301! | ||
|
||
/package-management/basic-package-mgmt /command-ref/nix-env 301! | ||
|
||
/package-management/channels* /command-ref/nix-channel 301! | ||
|
||
/package-management/s3-substituter* /command-ref/new-cli/nix3-help-stores#s3-binary-cache-store 301! | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
organization: NixOS | ||
repository: nix |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
synopsis: Mounted SSH Store | ||
issues: #7890 | ||
prs: #7912 | ||
description: { | ||
|
||
Introduced the store [`mounted-ssh-ng://`](@docroot@/command-ref/new-cli/nix3-help-stores.md). | ||
This store allows full access to a Nix store on a remote machine and additionally requires that the store be mounted in the local filesystem. | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
synopsis: Fix `nix-env --query --drv-path --json` | ||
prs: #9257 | ||
description: { | ||
|
||
Fixed a bug where `nix-env --query` ignored `--drv-path` when `--json` was set. | ||
|
||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.