1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 03:30:45 +00:00
Commit graph

1165 commits

Author SHA1 Message Date
Franz Pletz aa79f54998
nixos/iso-image: avoid collision between GRUB2 versions (#343992) 2024-09-26 15:53:43 +02: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
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
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
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
Robert Hensing 2e702d07bb nix: nix_2_18 -> nix_2_24 2024-09-10 23:20:48 +02:00
Felix Buehler e3ee1a97d4 nixos/iso-image: remove with lib; 2024-09-10 21:36:16 +02:00
K900 fa39e3d642 nixos-install: fail if we can't set up bootloader 2024-09-08 11:05:59 +03:00
K900 78d6adf386 nixos/installer: don't enable Pulseaudio 2024-09-04 13:56:50 +03:00
Jan Tojnar d2da9a19c4 gnome-settings-daemon{,43}: Move from gnome scope to top-level 2024-09-01 14:16:31 +02:00
Will Fancher 49192ef7a3 nixos/iso-image: Compress squashfs with zstd 19 2024-08-31 12:21:36 -04:00
Sandro Jäckel d50e23f0a4
glxinfo: replace with mesa-demos 2024-08-28 14:38:12 +02:00
Alyssa Ross 148261d04b
sd-image: optimise sfdisk call for image building
When building an image, rather than operating on a real partition,
there's no need to have sfdisk tell the kernel to reread the partition
table.  This also avoids a call to sync(2), which could be very
expensive depending on what other IO is going on on the system at the time.
2024-08-24 14:36:07 +02:00
Tim Schumacher 794d005bdd sd-image-aarch64: add dtbs for the bcm2710 raspberries
This appears to cover the BCM2836, BCM2837 and BCM2837B0 families of
devices.
2024-08-11 18:39:15 +02:00
Jörg Thalheim d79b03a59c fix netboot image 2024-08-02 10:24:34 +02:00
tomberek e28b6650c3
Merge pull request #320462 from amozeo/pkgs/nixos-rebuild/by-attr
nixos-rebuild, nixos-install: add support for --file and --attr flags
2024-07-13 20:46:31 -04:00
Wroclaw eeb1dffd02 nixos/nixos-install: add support for --file and --attr flags 2024-07-11 21:34:01 +02:00
Jean-François Roche c08c79536c nixVersions.nix_2_18: 2.18.4 -> 2.18.5
Fix sandbox on macos.

More details here: https://github.com/NixOS/nix/compare/2.18.4...2.18.5
2024-07-09 21:56:09 +02:00
Valentin Gagarin 144ac0d7fc nixVersions: bump patch releases 2024-06-27 13:43:44 +02:00
Alois Wohlschlager a754cd2eff
nixVersions.nix_2_18: 2.18.2 -> 2.18.3
It's a small round of various fixes for the default version of Nix.
Diff: https://github.com/NixOS/nix/compare/2.18.2...2.18.3
2024-06-22 10:56:11 +02:00
Jörg Thalheim c71ebe0dc8 netboot: drop syslinux and grub
The comment says this is required by other modules but to be honest, I
cannot see where. Bootloaders will be included automatically by nixos
generation if their `installBootLoader` attribute references it.

This helps us to make kexec images even smaller espeically when
combined with the perlless profile.
2024-06-04 10:35:20 +02:00
Sandro Jäckel 1c2132f714
nixos/installation-cd-plasma5: fix even more aliases 2024-06-03 16:26:54 +02:00
Sandro a88fb925bb
nixos/installation-cd-plasma5: don't use alias for konsole 2024-06-03 16:22:12 +02:00
Giel van Schijndel 83b38c6d30 nixos/netboot: only install syslinux on platforms where it's available
Instead of maintaining an inevitably incomplete list of unsupported
architectures.

I discovered this while building for armv7-linux (32-bit ARM).
2024-05-29 10:28:03 +02:00
Sandro Jäckel cb8b6a5d00
treewide: reanme renamed libinput options 2024-04-17 23:34:07 +02:00
stuebinm 6afb255d97 nixos: remove all uses of lib.mdDoc
these changes were generated with nixq 0.0.2, by running

  nixq ">> lib.mdDoc[remove] Argument[keep]" --batchmode nixos/**.nix
  nixq ">> mdDoc[remove] Argument[keep]" --batchmode nixos/**.nix
  nixq ">> Inherit >> mdDoc[remove]" --batchmode nixos/**.nix

two mentions of the mdDoc function remain in nixos/, both of which
are inside of comments.

Since lib.mdDoc is already defined as just id, this commit is a no-op as
far as Nix (and the built manual) is concerned.
2024-04-13 10:07:35 -07:00
Bjørn Forsman e17e60b273 nixos-generate-config: preserve vfat filesystem mount permissions
The default is to mount these world-readable, but that's a security risk
for the EFI System Partition.

Ref https://github.com/NixOS/nixpkgs/issues/279362.
2024-04-10 19:34:07 +02:00
Sandro Jäckel 476b8c276e
treewide: rename renamed sddm/displayManager settings 2024-04-08 21:56:38 +02:00
Norbert Melzer 4278bc6297
Merge pull request #271668 from eclairevoyant/default-config
nixos/installer-tools: mention PulseAudio+PipeWire instead of ALSA+PulseAudio in generated config
2024-04-04 00:40:25 +02:00