summary refs log tree commit diff
diff options
context:
space:
mode:
authorfigsoda <figsoda@pm.me>2022-12-17 18:59:29 -0500
committerfigsoda <figsoda@pm.me>2022-12-17 18:59:29 -0500
commit695d4bc76b9abdc3208a9475d71fdf0f41e925c8 (patch)
tree9bbe272e46db35fceaaec271112d458cc84c98e4
parent403e25e3e31319146c3e6ab478485a9c33efa07f (diff)
downloadnixpkgs-695d4bc76b9abdc3208a9475d71fdf0f41e925c8.tar
nixpkgs-695d4bc76b9abdc3208a9475d71fdf0f41e925c8.tar.gz
nixpkgs-695d4bc76b9abdc3208a9475d71fdf0f41e925c8.tar.bz2
nixpkgs-695d4bc76b9abdc3208a9475d71fdf0f41e925c8.tar.lz
nixpkgs-695d4bc76b9abdc3208a9475d71fdf0f41e925c8.tar.xz
nixpkgs-695d4bc76b9abdc3208a9475d71fdf0f41e925c8.tar.zst
nixpkgs-695d4bc76b9abdc3208a9475d71fdf0f41e925c8.zip
lib: fix typos
-rw-r--r--lib/attrsets.nix2
-rw-r--r--lib/derivations.nix2
-rw-r--r--lib/modules.nix2
-rw-r--r--lib/strings.nix4
-rw-r--r--lib/systems/architectures.nix2
-rw-r--r--lib/systems/default.nix4
-rw-r--r--lib/systems/flake-systems.nix2
-rwxr-xr-xlib/tests/modules.sh2
8 files changed, 10 insertions, 10 deletions
diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 511d619a1dc..4b663db2ce4 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -757,7 +757,7 @@ rec {
        matchAttrs :: AttrSet -> AttrSet -> Bool
   */
   matchAttrs =
-    # Attribute set strucutre to match
+    # Attribute set structure to match
     pattern:
     # Attribute set to find patterns in
     attrs:
diff --git a/lib/derivations.nix b/lib/derivations.nix
index 9a88087f2e3..dce98b46ddb 100644
--- a/lib/derivations.nix
+++ b/lib/derivations.nix
@@ -17,7 +17,7 @@ in
     situations below.
 
     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.";
 
diff --git a/lib/modules.nix b/lib/modules.nix
index 8cc8d67d600..caabfee5710 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -479,7 +479,7 @@ rec {
       ) (lib.functionArgs f);
 
       # 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
       # works.
     in f (args // extraArgs)
diff --git a/lib/strings.nix b/lib/strings.nix
index 64bf5bbafd3..8a19bc56ed5 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -185,7 +185,7 @@ rec {
   */
   makeBinPath = makeSearchPathOutput "bin" "bin";
 
-  /* Normalize path, removing extranous /s
+  /* Normalize path, removing extraneous /s
 
      Type: normalizePath :: string -> string
 
@@ -330,7 +330,7 @@ rec {
   */
   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.
      Only works for printable ascii characters.
 
diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix
index ddc320d24e0..94127fa90b3 100644
--- a/lib/systems/architectures.nix
+++ b/lib/systems/architectures.nix
@@ -67,7 +67,7 @@ rec {
     #
     # 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.
     # - `znver1` uses `ABM`, `CLZERO`, `CX16`, `MWAITX`, and `SSE4A` which no
     #   current Intel microarch support.
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index ca5186ca476..4c1e9d9f253 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -20,7 +20,7 @@ rec {
   # necessary.
   #
   # `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.
   elaborate = args': let
     args = if lib.isString args' then { system = args'; }
@@ -62,7 +62,7 @@ rec {
       linker =
         /**/ if final.useLLVM or false      then "lld"
         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
         # choice.
         else                                     "bfd";
diff --git a/lib/systems/flake-systems.nix b/lib/systems/flake-systems.nix
index 74124c32e83..b1988c6a4fb 100644
--- a/lib/systems/flake-systems.nix
+++ b/lib/systems/flake-systems.nix
@@ -1,6 +1,6 @@
 # See [RFC 46] for mandated platform support and ../../pkgs/stdenv for
 # 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.
 #
 # [RFC 46]: https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 75b316c9721..cde4da64393 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -246,7 +246,7 @@ checkConfigError 'A definition for option .* is not of type .*' \
 ## Freeform modules
 # Assigning without a declared option should work
 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
 # but only if the type matches
 checkConfigError 'A definition for option .* is not of type .*' config.value ./freeform-attrsOf.nix ./define-value-list.nix