Skip to content

Commit a9f4bb9

Browse files
authored
fix: fix typos (#123)
1 parent 487860b commit a9f4bb9

15 files changed

+21
-21
lines changed

docs/best-practices/remote-deployment.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ In your system's `flake.nix`, add a new outputs named `colmena`. A simple exampl
7272
meta = {
7373
nixpkgs = import nixpkgs { system = "x86_64-linux"; };
7474
75-
# This parameter functions similarly to `sepcialArgs` in `nixosConfigurations.xxx`,
75+
# This parameter functions similarly to `specialArgs` in `nixosConfigurations.xxx`,
7676
# used for passing custom arguments to all submodules.
7777
specialArgs = {
7878
inherit nixpkgs;

docs/development/cross-platform-compilation.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ So how to use this method in Flakes? The example `flake.nix` is as follows:
211211
nixpkgs.overlays = [ (self: super: { gcc = self.gcc12; }) ];
212212
}
213213

214-
# other moduels ......
214+
# other modules ......
215215
];
216216
};
217217
};
@@ -261,7 +261,7 @@ To avoid this problem, a better way is to create a new `pkgs` instance, and only
261261
environment.systemPackages = [ pkgs-gcc12.hello ];
262262
})
263263

264-
# other moduels ......
264+
# other modules ......
265265
];
266266
};
267267
};

docs/development/intro.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Here is a `flake.nix` that defines a development environment with Node.js 18 ins
138138
}
139139
```
140140

141-
Create an empty folder, save the above configuration as `flake.nix`, and then execute `nix develop` (or more precisely, you can use `nix develop .#default`), the current version of nodejs will be outputed, and now you can use `node` `pnpm` `yarn` seamlessly.
141+
Create an empty folder, save the above configuration as `flake.nix`, and then execute `nix develop` (or more precisely, you can use `nix develop .#default`), the current version of nodejs will be outputted, and now you can use `node` `pnpm` `yarn` seamlessly.
142142

143143

144144
## Using zsh/fish/... instead of bash

docs/faq/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ this will cause the following error:
7171
```bash
7272
error: builder for '/nix/store/n3scj3s7v9jsb6y3v0fhndw35a9hdbs6-home-manager-path.drv' failed with exit code 25;
7373
last 1 log lines:
74-
> error: collision between `/nix/store/kvq0gvz6jwggarrcn9a8ramsfhyh1h9d-lldb-14.0.6/lib/python3.11/site-packages/six.py' a
75-
nd `/nix/store/370s8inz4fc9k9lqk4qzj5vyr60q166w-python3-3.11.6-env/lib/python3.11/site-packages/six.py'
74+
> error: collision between `/nix/store/kvq0gvz6jwggarrcn9a8ramsfhyh1h9d-lldb-14.0.6/lib/python3.11/site-packages/six.py'
75+
and `/nix/store/370s8inz4fc9k9lqk4qzj5vyr60q166w-python3-3.11.6-env/lib/python3.11/site-packages/six.py'
7676
For full logs, run 'nix log /nix/store/n3scj3s7v9jsb6y3v0fhndw35a9hdbs6-home-manager-path.drv'.
7777
```
7878

docs/nixos-with-flakes/downgrade-or-upgrade-packages.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Here's an example of how you can add multiple nixpkgs inputs, each using a diffe
4141
# the outer scope recursively
4242
inherit system;
4343
# To use Chrome, we need to allow the
44-
# installation of non-free softwares.
44+
# installation of non-free software.
4545
config.allowUnfree = true;
4646
};
4747
pkgs-fd40cef8d = import nixpkgs-fd40cef8d {

docs/nixos-with-flakes/start-using-home-manager.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ According to the official [Home Manager Manual](https://nix-community.github.io/
5050
# utils
5151
ripgrep # recursively searches directories for a regex pattern
5252
jq # A lightweight and flexible command-line JSON processor
53-
yq-go # yaml processer https://github.com/mikefarah/yq
53+
yq-go # yaml processor https://github.com/mikefarah/yq
5454
eza # A modern replacement for ‘ls’
5555
fzf # A command-line fuzzy finder
5656

docs/nixpkgs/overlays.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ In the previous section, we learned about overriding derivations by `pkgs.xxx.ov
44
However, this approach will generate a new derivation and doesn't modify the original derivation in `pkgs` instance.
55
If the derivation you want to override is also used by other Nix packages, they will still use the unmodified derivation.
66

7-
To globally modify derivations in the detault nixpkgs instance, Nix provides a feature called "overlays".
7+
To globally modify derivations in the default nixpkgs instance, Nix provides a feature called "overlays".
88

99
In traditional Nix environments, overlays can be configured globally using the `~/.config/nixpkgs/overlays.nix` or `~/.config/nixpkgs/overlays/*.nix` files.
1010
However, with Flakes feature, to ensure system reproducibility, overlays cannot rely on configurations outside of the Git repository.

docs/zh/best-practices/remote-deployment.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ ssh-add ~/.ssh/your-private-key
7272
meta = {
7373
nixpkgs = import nixpkgs { system = "x86_64-linux"; };
7474
75-
# 这个参数的功能与 `nixosConfigurations.xxx` 中的 `sepcialArgs` 一致,
75+
# 这个参数的功能与 `nixosConfigurations.xxx` 中的 `specialArgs` 一致,
7676
# 都是用于传递自定义参数到所有子模块。
7777
specialArgs = {
7878
inherit nixpkgs;

docs/zh/development/cross-platform-compilation.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ nix-repl> pkgs.pkgsCross.riscv64.stdenv.cc
211211
nixpkgs.overlays = [ (self: super: { gcc = self.gcc12; }) ];
212212
}
213213
214-
# other moduels ......
214+
# other modules ......
215215
];
216216
};
217217
};
@@ -261,7 +261,7 @@ nix-repl> pkgs.pkgsCross.riscv64.stdenv.cc
261261
environment.systemPackages = [ pkgs-gcc12.hello ];
262262
})
263263
264-
# other moduels ......
264+
# other modules ......
265265
];
266266
};
267267
};

docs/zh/faq/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ Nix 与以 Docker 为代表的容器技术的应用场景也存在一定重合
7777
```bash
7878
error: builder for '/nix/store/n3scj3s7v9jsb6y3v0fhndw35a9hdbs6-home-manager-path.drv' failed with exit code 25;
7979
last 1 log lines:
80-
> error: collision between `/nix/store/kvq0gvz6jwggarrcn9a8ramsfhyh1h9d-lldb-14.0.6/lib/python3.11/site-packages/six.py' a
81-
nd `/nix/store/370s8inz4fc9k9lqk4qzj5vyr60q166w-python3-3.11.6-env/lib/python3.11/site-packages/six.py'
80+
> error: collision between `/nix/store/kvq0gvz6jwggarrcn9a8ramsfhyh1h9d-lldb-14.0.6/lib/python3.11/site-packages/six.py'
81+
and `/nix/store/370s8inz4fc9k9lqk4qzj5vyr60q166w-python3-3.11.6-env/lib/python3.11/site-packages/six.py'
8282
For full logs, run 'nix log /nix/store/n3scj3s7v9jsb6y3v0fhndw35a9hdbs6-home-manager-path.drv'.
8383
```
8484

docs/zh/nixos-with-flakes/introduction-to-flakes.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Flakes 带来的好处是显而易见的,整个 NixOS 社区都很喜欢它,
4545
- [Why are flakes still experimental? - NixOS Discourse](https://discourse.nixos.org/t/why-are-flakes-still-experimental/29317): 最近的一次关于 Flakes 稳定性的讨论,可以看到大家的疑惑,以及社区对 Flakes 的态度。
4646
- [Flakes are such an obviously good thing - Graham Christensen](https://grahamc.com/blog/flakes-are-an-obviously-good-thing/): NixOS 社区成员的文章,记录了他对 Flakes 的看法,以及对社区当初添加 Flakes 特性时的不当举措的懊悔。
4747
- [ teaching Nix 3 CLI and Flakes #281 - nix.dev](https://github.com/NixOS/nix.dev/issues/281): 社区关于是否应该在 NixOS 官方文档中介绍 Flakes 的讨论,当前结论是官方文档不应该推广使用 unstable 功能。
48-
- [Draft: 1 year roadmap - NixOS Foundation](https://nixos-foundation.notion.site/1-year-roadmap-0dc5c2ec265a477ea65c549cd5e568a9): NixOS Fundation 的一份 Roadmap,其中提到了 Flakes 的计划:`Stabilize flakes and release Nix 3.0. Flakes are widely used (there are more GitHub repos being created with a flake.nix than a default.nix) but they’re still marked as experimental, which is not a good situation. The same applies to the new nix CLI.`
48+
- [Draft: 1 year roadmap - NixOS Foundation](https://nixos-foundation.notion.site/1-year-roadmap-0dc5c2ec265a477ea65c549cd5e568a9): NixOS Foundation 的一份 Roadmap,其中提到了 Flakes 的计划:`Stabilize flakes and release Nix 3.0. Flakes are widely used (there are more GitHub repos being created with a flake.nix than a default.nix) but they’re still marked as experimental, which is not a good situation. The same applies to the new nix CLI.`
4949

5050
读完上述内容后,个人猜测,**Flakes 有可能(仅是可能)会在未来两年内成为稳定特性**
5151

docs/zh/nixos-with-flakes/nixos-with-flakes-enabled.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ sudo nixos-rebuild switch --flake github:owner/repo#your-hostname
187187

188188
上面的描述可能有点绕,我们还是结合本节中使用的 `flake.nix` 示例来看看这个过程。
189189
我们的 `flake.nix` 声明了 `inputs.nixpkgs` 这个依赖项,因此
190-
[nixpkgs/flake.nix] 会在我们执行 `sudo nixos-rebuild swtich` 这个命令时被求值。
190+
[nixpkgs/flake.nix] 会在我们执行 `sudo nixos-rebuild switch` 这个命令时被求值。
191191
从 Nixpkgs 仓库的源码中能看到它的 flake outputs 定义中有返回 `lib` 这个属性,我们的例子中就使用了 `lib` 属性中的 `nixosSystem` 这个函数来配置我们的 NixOS 系统:
192192

193193
```nix{8-13}
@@ -305,7 +305,7 @@ NixOS 社区比较推荐优先使用 `_module.args` 这个 options,仅在无
305305
306306
# 将所有 inputs 参数设为所有子模块的特殊参数,
307307
# 这样就能直接在子模块中使用 inputs 中的所有依赖项了
308-
specialArgs = { inheirt inputs;};
308+
specialArgs = { inherit inputs;};
309309
modules = [
310310
./configuration.nix
311311
];
@@ -376,7 +376,7 @@ NixOS 社区比较推荐优先使用 `_module.args` 这个 options,仅在无
376376
outputs = inputs@{ self, nixpkgs, ... }: {
377377
nixosConfigurations.my-nixos = nixpkgs.lib.nixosSystem {
378378
system = "x86_64-linux";
379-
specialArgs = { inheirt inputs;};
379+
specialArgs = { inherit inputs;};
380380
modules = [
381381
./configuration.nix
382382

docs/zh/nixos-with-flakes/other-useful-tips.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ sudo nix-collect-garbage --delete-old
103103
};
104104
105105
# Optimise storage
106-
# you can alse optimise the store manually via:
106+
# you can also optimise the store manually via:
107107
# nix-store --optimise
108108
# https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-auto-optimise-store
109109
nix.settings.auto-optimise-store = true;

docs/zh/nixos-with-flakes/start-using-home-manager.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
# utils
5151
ripgrep # recursively searches directories for a regex pattern
5252
jq # A lightweight and flexible command-line JSON processor
53-
yq-go # yaml processer https://github.com/mikefarah/yq
53+
yq-go # yaml processor https://github.com/mikefarah/yq
5454
eza # A modern replacement for ‘ls’
5555
fzf # A command-line fuzzy finder
5656

docs/zh/nixpkgs/callpackage.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# pkgs.callPackage
22

3-
`pkgs.callPackage` 被用于参数化构建 Nix 包,为了理解它的用处,我们首先考虑下不使用 `pkgs.callPakcage` 的情况下,我们要如何定义一个 Nix 包(也就是 Derivation)。
3+
`pkgs.callPackage` 被用于参数化构建 Nix 包,为了理解它的用处,我们首先考虑下不使用 `pkgs.callPackage` 的情况下,我们要如何定义一个 Nix 包(也就是 Derivation)。
44

55
## 1. 不使用 `pkgs.callPackage` 的情况
66

0 commit comments

Comments
 (0)