Skip to content

Commit 7b6b500

Browse files
authored
feat: upgrade to 25.11 (#266)
1 parent 84d1499 commit 7b6b500

27 files changed

Lines changed: 139 additions & 138 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ below:
9292
```nix{11-34}
9393
{
9494
inputs = {
95-
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
95+
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
9696
9797
# ...
9898
};

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ need to add a Module in `flake.nix`, as shown below:
7979
description = "NixOS running on LicheePi 4A";
8080
8181
inputs = {
82-
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
82+
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
8383
};
8484
8585
outputs = inputs@{ self, nixpkgs, ... }: {
8686
nixosConfigurations.lp4a = nixpkgs.lib.nixosSystem {
8787
modules = [
8888
{
8989
# the platform that performs the build-step
90-
nixpkgs.localSystem.system = "x86_64-linux";
90+
nixpkgs.localSystem.system = "x86_64-linux";
9191
9292
# the platform that will execute the resulting binaries
9393
# add this to enable cross-compilation.
@@ -134,7 +134,7 @@ cross-compilation, as shown below:
134134
description = "NixOS running on LicheePi 4A";
135135
136136
inputs = {
137-
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
137+
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
138138
};
139139
140140
outputs = inputs@{ self, nixpkgs, ... }: {
@@ -150,10 +150,10 @@ cross-compilation, as shown below:
150150
}
151151
```
152152

153-
You do not need to add any additional modules, just specify `nixpkgs.hostPlatform` as `riscv64-linux`.
154-
Nix will automatically detect whether the current system is `riscv64-linux` during the
155-
build. If not, it will automatically build through the emulated system(QEMU). For users,
156-
these underlying operations are completely transparent.
153+
You do not need to add any additional modules, just specify `nixpkgs.hostPlatform` as
154+
`riscv64-linux`. Nix will automatically detect whether the current system is
155+
`riscv64-linux` during the build. If not, it will automatically build through the emulated
156+
system(QEMU). For users, these underlying operations are completely transparent.
157157

158158
## Linux binfmt_misc
159159

@@ -240,7 +240,7 @@ So how to use this method in Flakes? The example `flake.nix` is as follows:
240240
description = "NixOS running on LicheePi 4A";
241241
242242
inputs = {
243-
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05-small";
243+
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11-small";
244244
};
245245
246246
outputs = { self, nixpkgs, ... }:
@@ -249,7 +249,7 @@ So how to use this method in Flakes? The example `flake.nix` is as follows:
249249
modules = [
250250
{
251251
# the platform that performs the build-step
252-
nixpkgs.localSystem.system = "x86_64-linux";
252+
nixpkgs.localSystem.system = "x86_64-linux";
253253
254254
# the platform that will execute the resulting binaries
255255
# add this to enable cross-compilation.
@@ -279,7 +279,7 @@ follows:
279279
description = "NixOS running on LicheePi 4A";
280280
281281
inputs = {
282-
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05-small";
282+
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11-small";
283283
};
284284
285285
outputs = { self, nixpkgs, ... }: let
@@ -300,7 +300,7 @@ follows:
300300
};
301301
modules = [
302302
{
303-
nixpkgs.localSystem.system = "x86_64-linux";
303+
nixpkgs.localSystem.system = "x86_64-linux";
304304
nixpkgs.crossSystem.system = "riscv64-linux";
305305
}
306306

docs/en/development/intro.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Here is a `flake.nix` that defines a development environment with Node.js 24 ins
115115
description = "A Nix-flake-based Node.js development environment";
116116
117117
inputs = {
118-
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
118+
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
119119
};
120120
121121
outputs = { self , nixpkgs ,... }: let
@@ -156,7 +156,7 @@ Here is an example:
156156
description = "A Nix-flake-based Node.js development environment";
157157
158158
inputs = {
159-
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
159+
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
160160
};
161161
162162
outputs = { self , nixpkgs ,... }: let
@@ -204,7 +204,7 @@ Example:
204204
description = "A Nix-flake-based Node.js development environment";
205205
206206
inputs = {
207-
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
207+
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
208208
};
209209
210210
outputs = { self , nixpkgs ,... }: let
@@ -275,7 +275,7 @@ the `dev-shell` command, which is the special feature of `pkgs.runCommand` compa
275275
Related source code:
276276

277277
- [pkgs/build-support/trivial-builders/default.nix - runCommand](https://github.com/NixOS/nixpkgs/blob/nixos-25.05/pkgs/build-support/trivial-builders/default.nix#L21-L49)
278-
- [pkgs/build-support/setup-hooks/make-wrapper.sh](https://github.com/NixOS/nixpkgs/blob/nixos-25.05/pkgs/build-support/setup-hooks/make-wrapper.sh)
278+
- [pkgs/build-support/setup-hooks/make-wrapper.sh](https://github.com/NixOS/nixpkgs/blob/nixos-25.11/pkgs/build-support/setup-hooks/make-wrapper.sh)
279279

280280
## Enter the build environment of any Nix package
281281

docs/en/development/kernel-development.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ An example of kernel development with `flake.nix`.
99
description = "NixOS running on LicheePi 4A";
1010
1111
inputs = {
12-
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05-small";
12+
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11-small";
1313
1414
# custom kernel's source
1515
thead-kernel = {

docs/en/development/packaging-101.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ packaging.
1717
with hash prefetching, dependency inference, license detection, and more
1818
- Source Code:
1919
- [pkgs/build-support/trivial-builders/default.nix - runCommand](https://github.com/NixOS/nixpkgs/blob/nixos-25.05/pkgs/build-support/trivial-builders/default.nix#L21-L49)
20-
- [pkgs/build-support/setup-hooks/make-wrapper.sh](https://github.com/NixOS/nixpkgs/blob/nixos-25.05/pkgs/build-support/setup-hooks/make-wrapper.sh)
20+
- [pkgs/build-support/setup-hooks/make-wrapper.sh](https://github.com/NixOS/nixpkgs/blob/nixos-25.11/pkgs/build-support/setup-hooks/make-wrapper.sh)
2121
- FHS related
22-
- [pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix](https://github.com/NixOS/nixpkgs/blob/nixos-25.05/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix):
22+
- [pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix](https://github.com/NixOS/nixpkgs/blob/nixos-25.11/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix):
2323
`pkgs.buildFHSEnvBubblewrap`
24-
- [pkgs/build-support/build-fhsenv-chroot/default.nix](https://github.com/NixOS/nixpkgs/blob/nixos-25.05/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix):
24+
- [pkgs/build-support/build-fhsenv-chroot/default.nix](https://github.com/NixOS/nixpkgs/blob/nixos-25.11/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix):
2525
`pkgs.buildFHSEnvChroot`

docs/en/nix-store/add-binary-cache-servers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ The second method is to configure `substituters` and `trusted-public-keys` using
139139
};
140140
141141
inputs = {
142-
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
142+
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
143143
144144
# omitting several configurations...
145145
};
@@ -226,7 +226,7 @@ In other words, you can use it like this:
226226
};
227227
228228
inputs = {
229-
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
229+
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
230230
231231
# omitting several configurations...
232232
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ commit or branch:
1717
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
1818
1919
# Latest stable branch of nixpkgs, used for version rollback
20-
# The current latest version is 25.05
21-
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
20+
# The current latest version is 25.11
21+
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
2222
2323
# You can also use a specific git commit hash to lock the version
2424
nixpkgs-fd40cef8d.url = "github:nixos/nixpkgs/fd40cef8d797670e203a27a91e4b8e6decf0b90c";

docs/en/nixos-with-flakes/modularize-the-configuration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ project:
284284
```nix{8-36}
285285
# flake.nix
286286
{
287-
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
287+
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
288288
outputs = {nixpkgs, ...}: {
289289
nixosConfigurations = {
290290
"my-nixos" = nixpkgs.lib.nixosSystem {
@@ -331,7 +331,7 @@ strings, single-line strings, and lists. Let's test the results:
331331
```bash
332332
# Example 1: multiline string merging
333333
echo $(nix eval .#nixosConfigurations.my-nixos.config.programs.bash.shellInit)
334-
trace: warning: system.stateVersion is not set, defaulting to 25.05. Read why this matters on https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersio
334+
trace: warning: system.stateVersion is not set, defaulting to 25.11. Read why this matters on https://nixos.org/manual/nixos/stable/options.html#opt-system.stateVersio
335335
n.
336336
"echo 'insert before default'
337337
@@ -368,4 +368,4 @@ order of definition.
368368
## References
369369
370370
- [Nix modules: Improving Nix's discoverability and usability](https://cfp.nixcon.org/nixcon2020/talk/K89WJY/)
371-
- [Module System - Nixpkgs](https://github.com/NixOS/nixpkgs/blob/nixos-25.05/doc/module-system/module-system.chapter.md)
371+
- [Module System - Nixpkgs](https://github.com/NixOS/nixpkgs/blob/nixos-25.11/doc/module-system/module-system.chapter.md)

docs/en/nixos-with-flakes/nixos-flake-and-module-system.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ automatically injected, and declaration-free parameters** provided by the module
5959
(e.g. `x86_64-linux`), and the value of `pkgs` can be customized through the
6060
`nixpkgs.pkgs` option.
6161
5. `modulesPath`: A parameter available only in NixOS, which is a path pointing to
62-
[nixpkgs/nixos/modules](https://github.com/NixOS/nixpkgs/tree/nixos-25.05/nixos/modules).
62+
[nixpkgs/nixos/modules](https://github.com/NixOS/nixpkgs/tree/nixos-25.11/nixos/modules).
6363
- It is defined in
6464
[nixpkgs/nixos/lib/eval-config-minimal.nix#L43](https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/lib/eval-config-minimal.nix#L43).
6565
- It is typically used to import additional NixOS modules and can be found in most
@@ -86,7 +86,7 @@ to understand. If readers are interested, I will include the links here:
8686
1. `_module.args`:
8787
- NixOS Manual:
8888
[Appendix A. Configuration Options](https://nixos.org/manual/nixos/stable/options#opt-_module.args)
89-
- Source Code: [nixpkgs/nixos-25.05/lib/modules.nix - _module.args]
89+
- Source Code: [nixpkgs/nixos-25.11/lib/modules.nix - _module.args]
9090

9191
In short, `specialArgs` and `_module.args` both require an attribute set as their value,
9292
and they serve the same purpose, passing all parameters in the attribute set to all
@@ -110,7 +110,7 @@ Suppose you want to pass a certain dependency to a submodule for use. You can us
110110
```nix{11}
111111
{
112112
inputs = {
113-
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
113+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
114114
another-input.url = "github:username/repo-name/branch-name";
115115
};
116116
@@ -132,7 +132,7 @@ Or you can achieve the same effect using the `_module.args` option:
132132
```nix{13}
133133
{
134134
inputs = {
135-
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
135+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
136136
another-input.url = "github:username/repo-name/branch-name";
137137
};
138138
outputs = inputs@{ self, nixpkgs, another-input, ... }: {
@@ -186,7 +186,7 @@ First, add the helix input data source to `flake.nix`:
186186
```nix{6,11,17}
187187
{
188188
inputs = {
189-
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
189+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
190190
191191
# helix editor, use the master branch
192192
helix.url = "github:helix-editor/helix/master";
@@ -278,11 +278,11 @@ the following official/semi-official documents:
278278

279279
[nix flake - Nix Manual]:
280280
https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-flake#flake-inputs
281-
[nixpkgs/flake.nix]: https://github.com/NixOS/nixpkgs/tree/nixos-25.05/flake.nix
281+
[nixpkgs/flake.nix]: https://github.com/NixOS/nixpkgs/tree/nixos-25.11/flake.nix
282282
[nixpkgs/nixos/lib/eval-config.nix]:
283-
https://github.com/NixOS/nixpkgs/tree/nixos-25.05/nixos/lib/eval-config.nix
283+
https://github.com/NixOS/nixpkgs/tree/nixos-25.11/nixos/lib/eval-config.nix
284284
[Module System - Nixpkgs]:
285-
https://github.com/NixOS/nixpkgs/blob/nixos-25.05/doc/module-system/module-system.chapter.md
285+
https://github.com/NixOS/nixpkgs/blob/nixos-25.11/doc/module-system/module-system.chapter.md
286286
[nixpkgs/nixos-25.05/lib/modules.nix - _module.args]:
287287
https://github.com/NixOS/nixpkgs/blob/nixos-25.05/lib/modules.nix#L122-L184
288288
[nixpkgs/nixos-25.05/nixos/doc/manual/development/option-types.section.md#L268-L275]:

docs/en/nixos-with-flakes/nixos-flake-configuration-explained.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ dependencies of this flake. These dependencies will be passed as arguments to th
1212
```nix{2-5,7}
1313
{
1414
inputs = {
15-
# NixOS official package source, using the nixos-25.05 branch here
16-
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
15+
# NixOS official package source, using the nixos-25.11 branch here
16+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
1717
};
1818
1919
outputs = { self, nixpkgs, ... }@inputs: {
@@ -45,8 +45,8 @@ results of the flake:
4545
description = "A simple NixOS flake";
4646
4747
inputs = {
48-
# NixOS official package source, here using the nixos-25.05 branch
49-
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
48+
# NixOS official package source, here using the nixos-25.11 branch
49+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
5050
};
5151
5252
outputs = { self, nixpkgs, ... }@inputs: {
@@ -140,8 +140,8 @@ definition includes the `lib` attribute, and in our example, we use the `lib` at
140140
```nix{8-13}
141141
{
142142
inputs = {
143-
# NixOS official package source, here using the nixos-25.05 branch
144-
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
143+
# NixOS official package source, here using the nixos-25.11 branch
144+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
145145
};
146146
147147
outputs = { self, nixpkgs, ... }@inputs: {
@@ -158,8 +158,10 @@ definition includes the `lib` attribute, and in our example, we use the `lib` at
158158
The attribute set following `nixpkgs.lib.nixosSystem` is the function’s single argument,
159159
holding all configuration parameters; here we provide only two:
160160

161-
- `system`: A legacy alias for `nixpkgs.hostPlatform` that specifies the platform the machine runs on.
162-
Because the generated `hardware-configuration.nix` (imported by `configuration.nix`) already defines this value, you can usually omit it here.
161+
- `system`: A legacy alias for `nixpkgs.hostPlatform` that specifies the platform the
162+
machine runs on.
163+
Because the generated `hardware-configuration.nix` (imported by `configuration.nix`)
164+
already defines this value, you can usually omit it here.
163165
- `modules`: This is a list of modules, where the actual NixOS system configuration is
164166
defined. The `/etc/nixos/configuration.nix` configuration file itself is a Nixpkgs
165167
Module, so it can be directly added to the `modules` list for use.
@@ -173,11 +175,11 @@ source code, and study its implementation.
173175

174176
[nix flake - Nix Manual]:
175177
https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-flake#flake-inputs
176-
[nixpkgs/flake.nix]: https://github.com/NixOS/nixpkgs/tree/nixos-25.05/flake.nix
178+
[nixpkgs/flake.nix]: https://github.com/NixOS/nixpkgs/tree/nixos-25.11/flake.nix
177179
[nixpkgs/nixos/lib/eval-config.nix]:
178-
https://github.com/NixOS/nixpkgs/tree/nixos-25.05/nixos/lib/eval-config.nix
180+
https://github.com/NixOS/nixpkgs/tree/nixos-25.11/nixos/lib/eval-config.nix
179181
[Module System - Nixpkgs]:
180-
https://github.com/NixOS/nixpkgs/blob/nixos-25.05/doc/module-system/module-system.chapter.md
182+
https://github.com/NixOS/nixpkgs/blob/nixos-25.11/doc/module-system/module-system.chapter.md
181183
[nixpkgs/nixos-25.05/lib/modules.nix - _module.args]:
182184
https://github.com/NixOS/nixpkgs/blob/nixos-25.05/lib/modules.nix#L122-L184
183185
[nixpkgs/nixos-25.05/nixos/doc/manual/development/option-types.section.md#L268-L275]:

0 commit comments

Comments
 (0)