Commit graph

1194 commits

Author SHA1 Message Date
Jörg Thalheim
dc1d33c285 nixVersions.nix_2_24: 2.24.13 -> 2.24.14
Diff: https://github.com/NixOS/nix/compare/2.24.13...2.24.14
(cherry picked from commit ae8f07e1dd)
2025-04-07 13:23:41 +00:00
Silvan Mosberger
14182c1970 treewide: Format all Nix files
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:

  nix-build ci -A fmt.check

This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).

This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).

Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).

If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.

(branch-equivalent to commit 374e6bcc40)
2025-04-01 20:11:51 +02:00
Jörg Thalheim
1410e361f5 nix: update nix-fallback-paths to 2.24.13
(cherry picked from commit 49a708c3f7)
2025-03-28 01:20:46 +00:00
Robert Hensing
b2476be36b nixos/nix-fallback-paths: 2.24.11 -> 2.24.12
(cherry picked from commit 94efb4613c)
2025-01-27 20:48:01 +00:00
zowoq
da42e430a9 nixos/nix-fallback-paths: 2.24.10 -> 2.24.11
https://releases.nixos.org/nix/nix-2.24.11/fallback-paths.nix
(cherry picked from commit 6c706f9549)
2024-12-15 10:54:03 +00:00
Silvan Mosberger
d9d87c5196 treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev 0128fbb0a5
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:29:24 +01:00
installer
9a13d9974b nixos/installation-cd-base: add git & rsync
(cherry picked from commit e9a119ead4)
2024-12-02 03:20:45 +00:00
Jonathan Ringer
745eddbf3a nixos/iso-image: fix isoImage.grubTheme = null;
Fixes `error: cannot coerce null to a string`

(cherry picked from commit b5168a9900)
2024-11-29 20:44:17 +00:00
Maximilian Bosch
35e60b321e nixos/tools: add enable options to manual
E.g. when overriding `nix` with `pkgs.lix`, `nixos-option` will fail.
Given that I haven't used it in a very long time, I wanted to disable
it, but finding an option to turn off `nixos-option` is kinda hard given
that the options are generated here using `mkToolModule`.

I assumed that this isn't possible until I learned that
`system.tools.X.enable` exists. To me, this is a clear sign that these
shouldn't be internal.

(cherry picked from commit 859c76c505)
2024-11-18 16:04:17 +00:00
K900
4a2c7def57
nixos/tools: Make the tools derivations overridable (#353173) 2024-11-09 10:20:19 +03:00
Emily
ff5fea0a29 nixos/{demo,installer/virtualbox-demo}: drop
This is no longer referenced anywhere and so will inevitably bitrot,
and doesn’t do anything that isn’t simple to achieve with the
module documentation.
2024-11-07 23:41:51 +00:00
Jörg Thalheim
caa10b055f nix: update fallback paths automatically 2024-11-04 11:51:24 +01:00
r-vdp
2eb92f4063
fixup! nixos/tools: set the enable options with mkDefault 2024-11-02 19:03:29 +01:00
r-vdp
ba3e5b02f6
nixos/tools: set the enable options with mkDefault
This makes it easier to enable some of them again.
2024-11-02 18:19:57 +01:00
r-vdp
8b2577c7d5
nixos/tools: Make the tools derivations overridable
Make sure that when re-assigning an overridden derivation to system.build.*,
the overridden derivation is also the one that ends up in
environment.systemPackages.
2024-11-02 18:17:24 +01:00
ibbem
30f40ac177
nixos-generate-config: Use the Firefox module
The Firefox module installs and enables the selected locale whereas the
Firefox package just uses the default locale. Hence, Firefox's language
was still English even when choosing a language other than English.
2024-10-31 19:30:08 +01:00
zowoq
a87bc99783 nixos/nix-fallback-paths: 2.24.8 -> 2.24.9
https://releases.nixos.org/nix/nix-2.24.9/fallback-paths.nix
2024-10-14 13:00:57 +10:00
github-actions[bot]
e26f69eb82
Merge master into staging-next 2024-10-11 06:04:46 +00:00
Emily
50c2aef3e7
nixos/netboot: Compress squashfs with zstd 19 (#341422) 2024-10-11 05:11:50 +01:00
github-actions[bot]
192fd67cc3
Merge master into staging-next 2024-10-03 18:04:30 +00:00
Peder Bergebakken Sundt
3100acba08 treewide: \xc2\xa0 ->
I have no idea what this escape sequence even is, but it breaks the nix parser with cryptic errors if not used in a comment.
A friend let me know MacOS is prone to input weird spaces, not sure if that is the source.

Candidates were located and created with:

    chr="$(echo -e '\xc2\xa0')"; rg -F "$chr" -l | xe sd -F "$chr" " "

There are some examples left, most being example output from `tree` in various markdown documents, some patches which we can't really touch, and `pkgs/tools/nix/nixos-render-docs/src/tests/test_commonmark.py` which I'm not sure if should be addressed
2024-10-02 15:33:06 +02:00
Jörg Thalheim
e5a08c8859 nix-fallback-paths: 2.24.7 -> 2.24.8 2024-09-26 21:04:57 +02:00
seth
0aed7f0d24 nixVersions.nix_2_18: 2.18.7 -> 2.18.8
Diff: https://github.com/NixOS/nix/compare/2.18.7...2.18.8
Fixes https://github.com/NixOS/nix/security/advisories/GHSA-6fjr-mq49-mm2c
2024-09-26 20:53:55 +02:00
github-actions[bot]
c8c18095f9
Merge master into staging-next 2024-09-26 18:04:33 +00:00
Franz Pletz
aa79f54998
nixos/iso-image: avoid collision between GRUB2 versions (#343992) 2024-09-26 15:53:43 +02:00
github-actions[bot]
bcd5388d39
Merge master into staging-next 2024-09-24 12:05:12 +00:00
K900
e9a78e0285 nixos/installer/tools: only enable tools if nix is enabled
This restores the old behavior of being able to remove
everything nix-related with just `nix.enable = false`.

Fixes #344083.
2024-09-24 08:19:36 +03:00
Luflosi
d979b45371
nixos/iso-image: avoid collision between GRUB2 versions
4b836fb680 added `pkgs.grub2_efi` to `environment.systemPackages` so that it would be in the Nix store and available for install. But `pkgs.grub2` is already in the list. This causes the various paths of the two GRUB2 versions to collide. To fix this, put `pkgs.grub2_efi` into `system.extraDependencies` instead. This should achieve the same effect of adding the second GRUB2 version to the Nix store without the paths colliding in the environment.

To reproduce the problem, execute `nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/iso-image.nix -A config.system.build.isoImage` and look for messages like
```
warning: collision between `/nix/store/9jk1p9n5dl431lcm4w9p6x6x8a00dm0q-grub-2.12/bin/grub-install' and `/nix/store/809l0i6aydg4zhn3kqf723brjyp2qm8h-grub-2.12/bin/grub-install'
```
2024-09-23 17:59:26 +02:00
github-actions[bot]
ac34133fb9
Merge master into staging-next 2024-09-23 12:05:36 +00:00
Jonas Chevalier
b4dc369186
Fix expandOnBoot=false and rigid path to nix-path-registration (#341071) 2024-09-23 09:59:27 +02:00
Jörg Thalheim
8999c869a8 nix: update nix-fallback-paths 2024-09-22 14:44:27 +02:00
Jörg Thalheim
af7bcfae78 nix: update fallback-paths 2024-09-22 09:11:14 +02:00
Jörg Thalheim
9a94e073bf Reapply "nix: nix_2_18 -> nix_2_24"
This reverts commit b3b9bdd901.
2024-09-22 09:10:01 +02:00
K900
5dcbab6b74 nixos/tools: continue cleanup
- remove with lib
- shuffle some things around for readability
- add separate options for each tool
2024-09-21 16:10:32 +03:00
K900
51b47621ac nixos-install: move to pkgs/by-name 2024-09-20 08:44:37 +03:00
K900
825f6ffa9e nixos-enter: move to pkgs/by-name 2024-09-20 08:44:37 +03:00
K900
8353a681b5 nixos-build-vms: move to pkgs/by-name 2024-09-20 08:44:36 +03:00
K900
1bf0ffb22e nixos-rebuild: inline get-version-suffix script
It has no other consumers anyway. Also saves some work.
2024-09-19 20:05:58 +03:00
K900
b3b9bdd901 Revert "nix: nix_2_18 -> nix_2_24"
This reverts commit 2e702d07bb.

Segfaults during evaluation in yet-to-be-determined circumstances.
Investigation is ongoing, reverting for now to be safe.

Upstream issue: https://github.com/NixOS/nix/issues/11547
2024-09-19 17:17:16 +03:00
K900
fb38235766 Revert "nixos/nix-fallback-paths: 2.24.2 -> 2.24.6"
This reverts commit ac849e5658.

Nix 2.24 segfaults semi-randomly during evaluation on specific configs (?).
This commit prepares for another revert, putting the default back to 2.18.

Upstream issue: https://github.com/NixOS/nix/issues/11547
2024-09-19 17:17:10 +03:00
Josh Hoffer
6295433b2b installer: only use squashfs threads=multi on supported kernels
The `threads` SquashFS mount option was introduced in Linux 6.2 [1].
Since we still support older kernels and external users of nixpkgs
may reuse the ISO installer modules, this option should be guarded
by a kernel version check.

[1] https://www.kernelconfig.io/config_squashfs_choice_decomp_by_mount?arch=x86&kernelversion=6.10.10
2024-09-18 17:27:20 -07:00
Fabián Heredia Montiel
e25a409cef
nix: 2.18 -> 2.24 (#335342) 2024-09-17 15:34:47 -06:00
Connor Baker
58a8cfa7da
Faster SquashFS decompression of Nix Store (#341149) 2024-09-16 08:07:40 -07:00
Felix Buehler
de2bbebb7f nixos/installer.scan: remove with lib; 2024-09-15 10:43:45 +02:00
Felix Buehler
e6da97a160 nixos/installation-cd-graphical-base: remove with lib; 2024-09-15 10:43:45 +02:00
Felix Buehler
a15394d51a nixos/iso-image: remove with lib; 2024-09-15 10:43:45 +02:00
Sandro
da1b2b5adb
nixos/profiles/minimal: drop noXLibs
noXLibs is an advanced option for advanced users which know how to recognize and debug build failures which might be caused by the added overlays.

The minimal profile should be minimal but also save to use for many people and not cause build failures in packages it really shouldn't.
2024-09-14 00:59:14 +02:00
Robert Hensing
ac849e5658 nixos/nix-fallback-paths: 2.24.2 -> 2.24.6 2024-09-13 13:37:46 +02:00
Raito Bezarius
4a94f45bb4 nixos/installer/cd-dvd: use EFI/BOOT and EFI/BOOT/BOOT$ARCH.EFI rather than lowercase
Reported in https://discourse.nixos.org/t/nix-iso-unable-to-boot-in-uefi-mode-but-other-distros-can/16473/24

There seems to be weird situations with casing and FAT8.3 filenames, UEFI firmwares and what not.
To increase our compatibility, let's ensure we have the critical stuff (the bootable) in uppercase.

Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
2024-09-13 04:23:53 -04:00
Daniel Nagy
f34b9f5e60
nixos/netboot: Compress squashfs with zstd 19 2024-09-12 19:15:00 +02:00