Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
Martin Weinelt
2022-03-31 03:49:37 +02:00
224 changed files with 16163 additions and 16589 deletions

View File

@@ -409,14 +409,14 @@ in
to = mkOption {
type = referenceAttrs;
example = { type = "github"; owner = "my-org"; repo = "my-nixpkgs"; };
description = "The flake reference <option>from></option> is rewritten to.";
description = "The flake reference <option>from</option> is rewritten to.";
};
flake = mkOption {
type = types.nullOr types.attrs;
default = null;
example = literalExpression "nixpkgs";
description = ''
The flake input <option>from></option> is rewritten to.
The flake input <option>from</option> is rewritten to.
'';
};
exact = mkOption {