mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 12:53:59 +03:00
lib: fix typos
This commit is contained in:
parent
403e25e3e3
commit
695d4bc76b
@ -757,7 +757,7 @@ rec {
|
|||||||
matchAttrs :: AttrSet -> AttrSet -> Bool
|
matchAttrs :: AttrSet -> AttrSet -> Bool
|
||||||
*/
|
*/
|
||||||
matchAttrs =
|
matchAttrs =
|
||||||
# Attribute set strucutre to match
|
# Attribute set structure to match
|
||||||
pattern:
|
pattern:
|
||||||
# Attribute set to find patterns in
|
# Attribute set to find patterns in
|
||||||
attrs:
|
attrs:
|
||||||
|
@ -17,7 +17,7 @@ in
|
|||||||
situations below.
|
situations below.
|
||||||
|
|
||||||
For illustration and/or testing, we define derivation such that its
|
For illustration and/or testing, we define derivation such that its
|
||||||
evaluation is very noticable.
|
evaluation is very noticeable.
|
||||||
|
|
||||||
let derivation = throw "This won't be evaluated.";
|
let derivation = throw "This won't be evaluated.";
|
||||||
|
|
||||||
|
@ -479,7 +479,7 @@ rec {
|
|||||||
) (lib.functionArgs f);
|
) (lib.functionArgs f);
|
||||||
|
|
||||||
# Note: we append in the opposite order such that we can add an error
|
# Note: we append in the opposite order such that we can add an error
|
||||||
# context on the explicited arguments of "args" too. This update
|
# context on the explicit arguments of "args" too. This update
|
||||||
# operator is used to make the "args@{ ... }: with args.lib;" notation
|
# operator is used to make the "args@{ ... }: with args.lib;" notation
|
||||||
# works.
|
# works.
|
||||||
in f (args // extraArgs)
|
in f (args // extraArgs)
|
||||||
|
@ -185,7 +185,7 @@ rec {
|
|||||||
*/
|
*/
|
||||||
makeBinPath = makeSearchPathOutput "bin" "bin";
|
makeBinPath = makeSearchPathOutput "bin" "bin";
|
||||||
|
|
||||||
/* Normalize path, removing extranous /s
|
/* Normalize path, removing extraneous /s
|
||||||
|
|
||||||
Type: normalizePath :: string -> string
|
Type: normalizePath :: string -> string
|
||||||
|
|
||||||
@ -330,7 +330,7 @@ rec {
|
|||||||
*/
|
*/
|
||||||
escape = list: replaceStrings list (map (c: "\\${c}") list);
|
escape = list: replaceStrings list (map (c: "\\${c}") list);
|
||||||
|
|
||||||
/* Escape occurence of the element of `list` in `string` by
|
/* Escape occurrence of the element of `list` in `string` by
|
||||||
converting to its ASCII value and prefixing it with \\x.
|
converting to its ASCII value and prefixing it with \\x.
|
||||||
Only works for printable ascii characters.
|
Only works for printable ascii characters.
|
||||||
|
|
||||||
|
@ -67,7 +67,7 @@ rec {
|
|||||||
#
|
#
|
||||||
# Note:
|
# Note:
|
||||||
#
|
#
|
||||||
# - The succesors of `skylake` (`cannonlake`, `icelake`, etc) use `avx512`
|
# - The successors of `skylake` (`cannonlake`, `icelake`, etc) use `avx512`
|
||||||
# which no current AMD Zen michroarch support.
|
# which no current AMD Zen michroarch support.
|
||||||
# - `znver1` uses `ABM`, `CLZERO`, `CX16`, `MWAITX`, and `SSE4A` which no
|
# - `znver1` uses `ABM`, `CLZERO`, `CX16`, `MWAITX`, and `SSE4A` which no
|
||||||
# current Intel microarch support.
|
# current Intel microarch support.
|
||||||
|
@ -20,7 +20,7 @@ rec {
|
|||||||
# necessary.
|
# necessary.
|
||||||
#
|
#
|
||||||
# `parsed` is inferred from args, both because there are two options with one
|
# `parsed` is inferred from args, both because there are two options with one
|
||||||
# clearly prefered, and to prevent cycles. A simpler fixed point where the RHS
|
# clearly preferred, and to prevent cycles. A simpler fixed point where the RHS
|
||||||
# always just used `final.*` would fail on both counts.
|
# always just used `final.*` would fail on both counts.
|
||||||
elaborate = args': let
|
elaborate = args': let
|
||||||
args = if lib.isString args' then { system = args'; }
|
args = if lib.isString args' then { system = args'; }
|
||||||
@ -62,7 +62,7 @@ rec {
|
|||||||
linker =
|
linker =
|
||||||
/**/ if final.useLLVM or false then "lld"
|
/**/ if final.useLLVM or false then "lld"
|
||||||
else if final.isDarwin then "cctools"
|
else if final.isDarwin then "cctools"
|
||||||
# "bfd" and "gold" both come from GNU binutils. The existance of Gold
|
# "bfd" and "gold" both come from GNU binutils. The existence of Gold
|
||||||
# is why we use the more obscure "bfd" and not "binutils" for this
|
# is why we use the more obscure "bfd" and not "binutils" for this
|
||||||
# choice.
|
# choice.
|
||||||
else "bfd";
|
else "bfd";
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# See [RFC 46] for mandated platform support and ../../pkgs/stdenv for
|
# See [RFC 46] for mandated platform support and ../../pkgs/stdenv for
|
||||||
# implemented platform support. This list is mainly descriptive, i.e. all
|
# implemented platform support. This list is mainly descriptive, i.e. all
|
||||||
# system doubles for platforms where nixpkgs can do native compiliation
|
# system doubles for platforms where nixpkgs can do native compilation
|
||||||
# reasonably well are included.
|
# reasonably well are included.
|
||||||
#
|
#
|
||||||
# [RFC 46]: https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md
|
# [RFC 46]: https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md
|
||||||
|
@ -246,7 +246,7 @@ checkConfigError 'A definition for option .* is not of type .*' \
|
|||||||
## Freeform modules
|
## Freeform modules
|
||||||
# Assigning without a declared option should work
|
# Assigning without a declared option should work
|
||||||
checkConfigOutput '^"24"$' config.value ./freeform-attrsOf.nix ./define-value-string.nix
|
checkConfigOutput '^"24"$' config.value ./freeform-attrsOf.nix ./define-value-string.nix
|
||||||
# No freeform assigments shouldn't make it error
|
# No freeform assignments shouldn't make it error
|
||||||
checkConfigOutput '^{ }$' config ./freeform-attrsOf.nix
|
checkConfigOutput '^{ }$' config ./freeform-attrsOf.nix
|
||||||
# but only if the type matches
|
# but only if the type matches
|
||||||
checkConfigError 'A definition for option .* is not of type .*' config.value ./freeform-attrsOf.nix ./define-value-list.nix
|
checkConfigError 'A definition for option .* is not of type .*' config.value ./freeform-attrsOf.nix ./define-value-list.nix
|
||||||
|
Loading…
Reference in New Issue
Block a user