Commit graph

1292 commits

Author SHA1 Message Date
Jörg Thalheim 8db5666df2 nixVersions: update nix-fallback-paths (2.24.14 -> 2.28.1) 2025-04-09 06:39:56 +02:00
Jörg Thalheim ae8f07e1dd nixVersions.nix_2_24: 2.24.13 -> 2.24.14
Diff: https://github.com/NixOS/nix/compare/2.24.13...2.24.14
2025-04-07 12:36:38 +02:00
Silvan Mosberger 374e6bcc40 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.
2025-04-01 20:10:43 +02:00
Jörg Thalheim 49a708c3f7 nix: update nix-fallback-paths to 2.24.13 2025-03-27 13:24:50 +01:00
Will Fancher b82dbaf3ab nixos-generate-config: Fix unspecified root 2025-03-18 04:56:51 -04:00
Will Fancher a2636dae46 iso-image: Combine GNOME and Plasma flavors
This allows users to choose between the two during bootup rather than
at download time.
2025-03-16 01:38:37 -04:00
Will Fancher 674a41e913 nixos-generate-config: Set linuxPackages_latest when ISO boots latest kernel 2025-03-16 01:38:37 -04:00
Will Fancher 6f1b070056 nixos-generate-config: Add config file 2025-03-16 01:38:37 -04:00
Will Fancher 0aad0248ce nixos/iso-image: Include latest kernel specialisation.
Now that ISOs include the latest kernel as a specialisation, separate
ISOs for the new kernel are no longer necessary.
2025-03-16 01:38:37 -04:00
Will Fancher f2204986a7 nixos/iso-image: Support specialisations. 2025-03-16 01:38:37 -04:00
Will Fancher 8eb8908837 nixos/iso-image: Move alternate boot options to submenus
This will make more sense when specialisations are introduced in the
ISO boot menu

nixos/modules/installer/cd-dvd/iso-image.nix
2025-03-16 01:38:37 -04:00
Will Fancher 3a2e8e97c3 nixos/iso-image: Disable plymouth along with display-manager.service
GNOME in particular just breaks if plymouth isn't disabled, because
GDM takes on the role of quitting plymouth in a GNOME
configuration. But if we're disabling the DM, we should disable
plymouth too anyway.
2025-03-16 01:03:25 -04:00
Will Fancher bef079a4b9 nixos/iso-image: Remove video= boot entries
These seem largely redundant with the progress that desktop
environments have made since they were introduced.
2025-03-16 01:03:21 -04:00
Will Fancher da9a092c34 nixos/iso-image.nix: nixfmt 2025-03-16 00:23:46 -04:00
Anton Mosich 69641d3531
installer/tools: fix grammatical error in docs 2025-03-09 15:07:53 +01:00
K900 31aa4c5fef nixos/iso-image: fix build 2025-02-21 11:19:14 +03:00
nixpkgs-ci[bot] 9bd398d5e9
Merge master into staging-next 2025-02-18 12:05:57 +00:00
Pablo Ovelleiro Corral 1606ea91b4 nixos-generate-config: add --flake option
Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>
2025-02-18 15:37:53 +07:00
Wolfgang Walther b19d0f6d3d
treewide: replace substituteAll with replaceVars 2025-02-10 22:51:56 +01:00
Martin Schwaighofer f83f6a25ce installer: fix broken search suggestion in default config 2025-02-02 13:18:37 +01:00
Wolfgang Walther dc0e094b33
nixos/installer: replace substituteAll with replaceVarsWith for tools 2025-01-28 22:30:27 +01:00
Robert Hensing 94efb4613c nixos/nix-fallback-paths: 2.24.11 -> 2.24.12 2025-01-22 13:59:41 +01:00
github-actions[bot] 28758028a5
Merge master into staging-next 2025-01-08 18:04:29 +00:00
phaer 0b162c3dbc iso-image: fix output filename
While switching from isoImage.baseName to the unified image.baseName,
I accidentaly dropped label and system information from the iso filename.

This fixes it by including isoImage.edition in the default baseName for
all our isos. Resulting in filenames such as
`nixos-minimal-25.05beta708350.1d95cb5-x86_64-linux.iso` again instead
of just nixos-minimal.iso.
2025-01-08 14:35:07 +01:00
github-actions[bot] a58f8abed0
Merge staging-next into staging 2025-01-06 00:15:41 +00:00
Thiago Kenji Okada 6e6188af7b
image/images: Adapt remaining images to system.build.image & normalized filenames, (#359345) 2025-01-05 20:28:23 +00:00
github-actions[bot] 92be6e3838
Merge staging-next into staging 2024-12-30 18:04:51 +00:00
nicoo 238b407862
nixos: hardware.pulseaudio → services.pulseaudio (#369391) 2024-12-30 13:46:50 +00:00
phaer 63d0a4ea61 modules/netboot: add system.build.image for new kexecTarball 2024-12-16 15:35:22 +01:00
phaer a582fba754 installer/iso-image: use system.build.image
and rename:
- isoImage.isoBaseName -> image.baseName
- isoImage.isoName -> image.fileName
2024-12-16 15:35:21 +01:00
phaer 22255ddec4 installer/sd-image: use system.build.image...
and rename:
- sdImage.imageBaseName -> image.BaseName
- sdImage.imageName -> image.fileName
2024-12-16 15:35:16 +01:00
github-actions[bot] 63eeb8a47c
Merge staging-next into staging 2024-12-15 12:06:02 +00:00
Jörg Thalheim 25d88c50b6
nixVersions.nix_2_24: 2.24.10 -> 2.24.11 (#364176) 2024-12-15 11:53:35 +01:00
Wolfgang Walther b3fb9afdb0
replaceVarsWith: init (#360771) 2024-12-14 20:26:35 +01:00
Wolfgang Walther 4ce241c882
replaceVarsWith: init
Takes the extended features of nix substituteAll to a replaceVars
variant to get rid of those cases that use substituteAll to build a full
package with meta information etc.
2024-12-14 20:16:10 +01:00
jopejoe1 dfd7b67092
nixos: add option hardware.enableAllHardware (#364479) 2024-12-14 00:03:52 +00:00
Arne Keller 206675f0e3
nixos/sd-card: explicitly set core_freq for Raspberry Pi 3 (#306724) 2024-12-13 10:35:33 +01:00
Thiago Kenji Okada 0d2883adc2
nixos-rebuild-ng: add module changes and port tests from nixos-rebuild (#363922) 2024-12-12 12:40:40 +00:00
DavHau 08783a39b0 nixos: add option hardware.enableAllHardware
This allows users to simply enable support for all hardware by enabling the option `hardware.enableAllHardware`, instead of having to import `modules/profiles/all-hardware.nix`.

This is better, as the enableAllHardware option will be discoverable via search.nixos.org, while the `all-hardware.nix` is hidden inside nixpkgs and hard to discover.

Backward compatibility is provided by replacing the old `profiles/all-hardware.nix` with a file that sets the `enableAllHardware` option to true.
2024-12-12 16:45:25 +07:00
zowoq 6c706f9549 nixos/nix-fallback-paths: 2.24.10 -> 2.24.11
https://releases.nixos.org/nix/nix-2.24.11/fallback-paths.nix
2024-12-11 18:15:24 +10:00
Silvan Mosberger 4f0dadbf38 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 b32a094368
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:26:33 +01:00
Thiago Kenji Okada 43e6aa5bd2 nixos-rebuild-ng: enable reexec if system.rebuild.enableNg is enabled 2024-12-10 18:38:08 +00:00
Thiago Kenji Okada ae6664cc51 nixos/tools: add system.rebuild.enableNg 2024-12-10 18:38:08 +00:00
Jörg Thalheim 6541fe7311
nixos/installer: Allow setting a password on cmdline for pxe boot (#358722) 2024-12-05 00:33:39 +01:00
Michele Guerini Rocco c7a4e4c503
sd-image: fix raspberry pi 0 boot (#355469) 2024-12-01 17:42:24 +01:00
misuzu 2a1bf498aa
nixos/installation-cd-base: add git & rsync (#325511) 2024-12-01 16:35:33 +02:00
Flo f5080d12b3 Rebuild password update functionality, add tests 2024-11-28 13:47:45 +01:00
Jonathan Ringer b5168a9900 nixos/iso-image: fix isoImage.grubTheme = null;
Fixes `error: cannot coerce null to a string`
2024-11-26 21:18:21 +02:00
Will Fancher 80ec892b74
Revert "nixos/iso-image: fix isoImage.grubTheme = null; logic" 2024-11-26 07:56:33 -05:00
Artturin fa4b9638fa
nixos/iso-image: fix isoImage.grubTheme = null; logic (#156754) 2024-11-26 00:39:02 +02:00
Flo 9a524549d6
Add passwordHash option 2024-11-24 22:39:56 +01:00
Flo 65dc95e52f
feat: Allow setting a password on cmdline for pxe boot 2024-11-24 15:12:14 +01:00
Maximilian Bosch 859c76c505
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.
2024-11-18 16:22:41 +01:00
Michal Kazior b5a3634ea1 sd-image: fix raspberry pi 0 boot
Raspberry Pi 0 was stuck at rainbow image on hdmi
output and was not booting.

Both dtbs are needed _and_ the enable_uart=1. Any
of them missing leaves RPI0 stuck at the rainbow
image.
2024-11-12 17:38:58 +01: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
Felix Bühler 686fa55f27
nixos/iso-image: remove with lib; (#339102) 2024-09-11 18:57:35 +02:00
Robert Cambridge 08afe03265 fix bug where nix store DB would not be loadable if root was not mounted on / 2024-09-11 09:59:22 +02:00
Robert Cambridge 52bb3ddb86 fix bug where sdImage.expandOnBoot=false would prevent nix-store from loading DB 2024-09-11 09:59:10 +02:00
Josh Hoffer d308cfcb38 nixos/netboot: mount squashfs with threads=multi 2024-09-10 22:02:20 -07:00
Josh Hoffer ff8b2d5162 nixos/iso-image: mount squashfs with threads=multi 2024-09-10 22:01:39 -07:00