Gabriella Gonzalez
b8698cd8d6
macOS support for NixOS tests ( #282401 )
...
Closes #193336
Closes #261694
Related to #108984
The goal here was to get the following flake to build and run on
`aarch64-darwin`:
```nix
{ inputs.nixpkgs.url = <this branch>;
outputs = { nixpkgs, ... }: {
checks.aarch64-darwin.default =
nixpkgs.legacyPackages.aarch64-darwin.nixosTest {
name = "test";
nodes.machine = { };
testScript = "";
};
};
}
```
… and after this change it does. There's no longer a need for the
user to set `nodes.*.nixpkgs.pkgs` or
`nodes.*.virtualisation.host.pkgs` as the correct values are inferred
from the host system.
2024-03-02 06:33:14 +01:00
Nick Cao
48e5de444b
nixos/fcitx5: enable plasma6Support by default if plasma6 is enabled
2024-03-01 22:43:56 -05:00
r-vdp
a8ab8b59a7
systemd-boot: introduce options to set a sort-key for systemd-boot entries
...
Without sort-keys specified on entries, the entries are sorted only by
file name (in decreasing order, so starting at the end of the alphabet!),
without taking any other fields into account (see
[the boot loader specification reference][1]).
Moreover, entries without a sort-key are always ordered after all
entries with a sort-key, so by not adding a sort-key to the NixOS ones,
we cannot add a sort-key to any other entry while keeping it below the
NixOS entries.
So currently we have options to set the file names for additional entries like
memtest and netbootxyz.
However, as mentioned above, the sorting by file name is not very intuitive and
actually sorts in the opposite order of what is currently mentioned in the option
descriptions.
With this commit, we set a configurable sort-key on all NixOS entries,
and add options for setting the sort-keys for the memtest and netbootxyz
entries.
The sorting by sort-key is more intuitive (it starts at the start of the
alphabet) and also takes into account the machine-id and version for entries
with identical sort-keys.
We use a bootspec extension to store the sort keys, which allows us to
redefine the sort key for individual specialisations without needing any
special casing.
[1]: https://uapi-group.org/specifications/specs/boot_loader_specification/#sorting
2024-03-02 02:11:32 +01:00
nikstur
ee2a53dc86
nixos/tests/systemd-boot: make secureBoot test work on different architectures
2024-03-01 23:45:07 +01:00
nikstur
ce1d1f3e6c
nixos/qemu-vm: remove implicit dependency on SSM
...
The qemu module shouldn't implicitly (and for all architectures) enable
SSM when enabling Secure Boot.
Additionally, this breaks aarch64 Secure Boot tests because this module
doesn't use the right machine type for anything but X86.
2024-03-01 23:40:36 +01:00
phaer
fa34964ef1
etebase: make proper package...
...
and remove the ad-hoc python environment.
Also remove daphne and use uvicorn just as upstream does
2024-03-01 22:55:27 +01:00
nikstur
1df98b23f6
Merge pull request #292061 from nikstur/systemd-random-seed
...
nixos/systemd: include systemd-boot-random-seed.service
2024-03-01 21:46:39 +01:00
Nick Cao
fcba479b33
Merge pull request #292607 from NickCao/fcitx5-nixos
...
nixos/fcitx5: add plasma6 support option
2024-03-01 13:36:04 -05:00
Robert Hensing
55dcd06bdb
Merge pull request #292487 from jmbaur/nixos-cross-check
...
nixos/nixpkgs: fix determination for cross-compiled nixos system
2024-03-01 18:19:58 +01:00
Jared Baur
3794246066
nixos/nixpkgs: fix determination for cross-compiled nixos system
...
Since the output of `lib.systems.elaborate` contains functions, an
equality check with `==` does not suffice, `lib.systems.equals` should
be used instead.
2024-03-01 09:05:08 -08:00
Nick Cao
6e2d4054ae
nixos/fcitx5: add plasma6 support option
2024-03-01 11:34:09 -05:00
Ryan Lahfa
fae73881ba
Merge pull request #292561 from arianvp/fix-make-disk-image-systemd-boot-homeless-shelter-clobber
...
nixos/lib/make-disk-image.nix: fix systemd-boot-builder clobbering /homeless-shelter
2024-03-01 16:59:16 +01:00
Adam C. Stephens
b52452f8c7
Merge pull request #291951 from amarshall/zfs-pkgs-renaming
...
zfs: rename zfsStable -> zfs_2_2; zfsUnstable -> zfs_unstable; remove enableUnstable option in favor of package
2024-03-01 10:09:12 -05:00
phaer
720a1eb5e7
modules/etebase-server: add package, pythonPackage
...
options, to keep the packaeges configurable
2024-03-01 14:32:46 +01:00
Sandro
5ad27da222
Merge pull request #291907 from SuperSandro2000/tailscaled-flags
2024-03-01 13:54:54 +01:00
Sandro
b84bc4ea3a
Merge pull request #264087 from leonm1/matter-server-module
2024-03-01 13:51:19 +01:00
Sandro
51e92056db
Merge pull request #283660 from ocfox/transfer
2024-03-01 13:36:03 +01:00
Arian van Putten
b75a29cb6c
nixos/lib/make-disk-image.nix: fix systemd-boot-builder clobbering /homeless-shelter
...
systemd-boot-builder.py calls nix-env --list-generations which creates
$HOME/.nix-defexpr/channels/nixos if it doesn't exist. This would cause a folder
/homeless-shelter to show up in the final image which in turn breaks nix builds
in the target image if sandboxing is turned off (as /homeless-shelter is never
allowed to exist).
2024-03-01 12:52:48 +01:00
K900
e758ca61fe
nixos/lib/test-driver: make the warning message more noticeable
2024-03-01 13:20:09 +03:00
Marcel
896a4d62d8
listmonk: ensure correct application of data migration
2024-03-01 10:45:12 +01:00
Sarah Brofeldt
13a94ad1fb
Merge pull request #292291 from cafkafk/dockerRegistry-openFirewall
...
nixos/dockerRegistry: add `openFirewall` option
2024-03-01 09:57:07 +01:00
Christina Sørensen
d31cbb78ca
nixos/dockerRegistry: add openFirewall option
...
Signed-off-by: Christina Sørensen <christina@cafkafk.com>
2024-03-01 09:56:03 +01:00
K900
690d54ef45
Merge pull request #292326 from hcsch/pipewire-wireplumber-doc-fix
...
nixos/pipewire: doc fixes as a follow-up to #282377 and #291946
2024-03-01 09:28:17 +03:00
K900
b4622a277e
Merge pull request #292483 from mjm/plasma6-kcmutils
...
nixos/plasma6: install kcmutils
2024-03-01 09:25:51 +03:00
Matt Moriarity
e59d120fc1
nixos/plasma6: install kcmutils
2024-02-29 20:12:42 -07:00
Sandro
bbabfca453
Merge pull request #263765 from numinit/armagetronad-module
...
nixos/armagetronad: Add module with NixOS tests
2024-03-01 00:46:34 +01:00
Sandro
b8ec4c1475
Merge pull request #290449 from Kiskae/patch-2
...
nixos/podman: pass proxy variables to podman API
2024-03-01 00:37:27 +01:00
Sandro
daa33a4bf7
Merge pull request #287299 from SuperSandro2000/unbound-checkconf
...
nixos/unbound: check validity of config file
2024-03-01 00:33:36 +01:00
V
ff990ea66a
nixos/nixseparatedebuginfod: fix compatibility with Nix 2.3
...
Appending to options with the `extra-` prefix was added in Nix 2.4,
which makes config validation fail on this version without the guard.
Change-Id: Ie253978dbaf00b228fecc08698a3dcc01cd2d82b
2024-02-29 23:10:31 +01:00
superherointj
09390b5cfe
nixos/doc: release note for k3s_1_29
2024-02-29 18:38:58 -03:00
Rob Pilling
979ae4c6e5
nixos/ebusd: fix logging overrides
...
This fixes #292131 - currently we specify --log=all:<level>, which
overrides all other log areas. Specifying this first allows the
further log areas to be specified without being replaced.
2024-02-29 21:02:26 +00:00
Kerstin
51363e5c0d
Merge pull request #280628 from h7x4/nixos-module-update-kanidm-add-backup-dir-to-bindpaths
...
nixos/kanidm: declare `online_backup` options
2024-02-29 15:19:34 +01:00
Michele Guerini Rocco
11b122ec70
Merge pull request #292185 from dotlambda/searxng-mainProgram
...
searxng: set meta.mainProgram
2024-02-29 14:19:51 +01:00
Hans Christian Schmitz
3f86bd950c
nixos/pipewire: add docs for passthru.requiredLv2Packages
2024-02-29 13:28:04 +01:00
Hans Christian Schmitz
b97450b007
nixos/wireplumber: fix incorrect option name in docs
2024-02-29 13:28:04 +01:00
Arnout Engelen
728d2d1fd9
Merge pull request #287805 from raboof/sway-update-to-1.9
...
sway: 1.8.1 -> 1.9.0
2024-02-29 12:06:52 +01:00
Arnout Engelen
36e51d7cbf
sway: 1.8.1 -> 1.9.0
...
Co-authored-by: Phileas Lebada <norpol@users.noreply.github.com>
Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>
2024-02-29 11:37:30 +01:00
Leona Maroni
3302864e6e
Merge pull request #292030 from Flakebi/paperless
...
paperless: fix uploading files via local folder
2024-02-29 08:10:28 +01:00
Robert Schütz
603c5af519
nixos/tests/searx: use configured package for static content
...
Also use the simple theme because upstream dropped the oscar one:
https://github.com/searxng/searxng/discussions/1167
2024-02-28 17:51:29 -08:00
Robert Schütz
3330e3c9c3
nixos/searx: use lib.getExe
2024-02-28 17:51:24 -08:00
Franz Pletz
317a383090
Merge pull request #292189 from nagisa/fixes-systemd-upheldBy-propagation
2024-02-29 02:08:56 +01:00
Silvan Mosberger
8e6598a68c
Merge pull request #286399 from benaryorg/global_ini_alt2
...
pkgs.formats: pkgs.formats version of lib.generators.toINIWithGlobalSection
2024-02-29 01:20:37 +01:00
Simonas Kazlauskas
34c5cc74a1
systemd: fix propagation of upheldBy option to units
2024-02-29 02:01:24 +02:00
Silvan Mosberger
cd5dc76d83
substitute: Deprecate replacements, introduce replacementsList
...
Also:
- Add tests
- Treewide update
- Improve docs
2024-02-29 00:35:27 +01:00
abysssol
8720397720
nixos/ollama: replace incorrect use of overrideAttrs
...
The bug prevents nixos from compiling
if the ollama service is built with cuda enabled.
2024-02-28 17:15:30 -05:00
Adam C. Stephens
8ed07da2ed
Merge pull request #290433 from adamcstephens/consul/tests
...
nixos/tests/consul: enable unfree
2024-02-28 13:35:48 -05:00
Adam C. Stephens
6b834b5e9a
Merge pull request #290570 from adamcstephens/lxc/sysctl
...
nixos/lxc/generator: remove sysctl error handling
2024-02-28 13:34:48 -05:00
K900
ba13f3e524
nixos/doc: typo
2024-02-28 20:26:55 +03:00
Adam Stephens
5f1b65f75f
nixos/tests/incus: ensure sysctl rules apply successfully to lxc containers
2024-02-28 11:59:39 -05:00
Julian Stecklina
3661b3ee53
nixosTests.virtualbox: add happy path KVM test
...
The KVM support is still new and experimental. There is no point in
doing extensive testing. Just check whether it works in general.
2024-02-28 17:43:43 +01:00
Julian Stecklina
77c7ac6c35
nixosTests.virtualbox: allow additional parameters for tests
2024-02-28 17:36:22 +01:00
Julian Stecklina
a9822fa200
nixos/virtualbox-host: expose option to run with KVM
2024-02-28 17:36:22 +01:00
K900
6a711189fc
nixos/doc: release note for Plasma 6
2024-02-28 18:56:31 +03:00
K900
7d93928492
nixos/release: add Plasma 6 ISO variant
2024-02-28 18:49:33 +03:00
K900
2614e40893
sddm: add Wayland to the wrapper if enabled
2024-02-28 18:49:33 +03:00
K900
7b74d9a4ac
sddm: 0.20.0-unstable -> 0.21.0
2024-02-28 18:49:33 +03:00
K900
ad1b1e8aca
nixos/gnupg: check for plasma 6
2024-02-28 18:49:33 +03:00
K900
16f963794a
nixos/tests: add plasma6
2024-02-28 18:49:33 +03:00
K900
3f650b567f
nixos/plasma6: init
2024-02-28 18:49:33 +03:00
K900
8be79e54c5
nixos/pam/kwallet: rename option, allow setting package
2024-02-28 18:49:33 +03:00
K900
2248bdfbbc
nixos/sddm: add extraPackages option
2024-02-28 18:49:12 +03:00
André Vitor de Lima Matos
675ad00f22
pipewire: fix wireplumber config paths
...
Quickfix for systemWide pipewire after #282377
2024-02-28 10:46:52 -03:00
Alyssa Ross
dc6eafa64f
linux_6_5: remove
2024-02-28 12:48:08 +01:00
nikstur
380f36f350
nixos/systemd: include systemd-boot-random-seed.service
...
This is necessary to properly refresh the boot loader random seed.
See https://www.freedesktop.org/software/systemd/man/latest/systemd-boot-random-seed.service.html#
2024-02-28 12:14:06 +01:00
nikstur
bd4c49f29b
nixos/systemd: remove a superfluous override
...
This is already the upstream default.
2024-02-28 11:45:39 +01:00
Pol Dellaiera
200390b3ed
Merge pull request #291748 from abysssol/update-ollama-0.1.27
...
ollama: 0.1.26 -> 0.1.27
2024-02-28 10:15:42 +01:00
Flakebi
9db96ee839
paperless: fix uploading files via local folder
...
The consumer service needs to be in the same namespace as the
task-queue, otherwise they cannot see each others temporary files.
Same as for web uploading.
See also the discussion here:
https://github.com/paperless-ngx/paperless-ngx/discussions/5606
2024-02-28 09:14:48 +01:00
K900
d53c203739
Merge pull request #291544 from K900/ovmf-oof
...
nixos/tests: drop LegacyStartCommand
2024-02-28 09:32:26 +03:00
K900
bdacdc46e4
nixos/lib/test-driver: provide legacy path for create_machine({"startCommand": "..."})
2024-02-28 09:32:11 +03:00
K900
a64a75a7ca
Merge pull request #291946 from hcsch/pipewire-wireplumber-config-packages-migration
...
nixos/pipewire: add assertions for migration to `extraConfig`/`configPackages`
2024-02-28 09:17:34 +03:00
Morgan Jones
a5c305d170
nixos/armagetronad: address code review feedback
2024-02-27 18:59:37 -08:00
Robert Hensing
57c1108204
Merge pull request #282886 from WxNzEMof/docker-tools-uid
...
Allow streaming layered containers with non-root Nix store
2024-02-28 03:43:07 +01:00
Will Fancher
f5622df470
Merge pull request #290946 from ju1m/systemd-option-list
...
nixos/systemd: merge unit options as lists when at least one value is a list
2024-02-27 20:49:39 -05:00
Will Fancher
b9fe04d671
Merge pull request #291825 from WilliButz/repart/max-label-length
...
nixos/systemd-repart: add assertion for partition label length
2024-02-27 20:37:02 -05:00
Will Fancher
a587a6a357
Merge pull request #285401 from sdht0/systemd-boot-xbootldr
...
nixos/systemd-boot: Add support for an XBOOTLDR partition
2024-02-27 20:35:03 -05:00
Will Fancher
031978580c
Merge pull request #291882 from philiptaron/systemd-networkd/boolValuesPlus
...
nixos/networkd: accept `true` and `false` in addition to "yes" and "no" for DHCP= and LinkLocalAddressing=
2024-02-27 20:33:08 -05:00
pennae
b71ca1c90a
Merge pull request #291922 from NixOS/mosquitto-2
...
nixos/mosquitto: remove stutter in acl file name
2024-02-28 02:06:01 +01:00
Ryan Lahfa
e53c07f4cc
Merge pull request #291822 from alyssais/zfs-2.1.15
...
zfs_2_1: 2.1.14 -> 2.1.15
2024-02-28 01:43:56 +01:00
Andrew Marshall
1f32eb724d
nixos/zfs: Remove enableUnstable in favor of setting package
...
This just adds complexity and confusion. Once-upon-a-time, there was no
`package` and only `enableUnstable`, but now it is just confusing to
have both, as it would be possible to do e.g. `package = pkgs.zfs` and
`enableUnstable = true`, but then `enableUnstable` does nothing.
2024-02-27 19:30:19 -05:00
Hans Christian Schmitz
5f6dca8403
nixos/pipewire: add assertions for migration to extraConfig/configPackages
...
The PR #282377 made files/directories specified in
`environment.etc."pipewire<...>"` and `environment.etc."wireplumber<...>"`
conflict with existing configuration of the PipeWire NixOS module due to how
the `configPackages` options were implemented. This sadly wasn't easily
avoidable. As this can cause breakage for users moving from 23.11 to 24.05
though, assertions can help guide them to use `services.pipewire.extraConfig`
or `services.pipewire.configPackages` / `services.wireplumber.configPackages`
instead, fixing the breakage.
2024-02-28 01:22:28 +01:00
abysssol
5c143f0366
nixos/ollama: override kernelPackages with nvidia driver
...
Instead of setting linuxPackages to a singleton set with nvidia_x11,
override the system's kernelPackages with the nvidia driver.
This is more semantically correct, though doesn't change any behavior.
2024-02-27 18:51:54 -05:00
Andrew Marshall
2e36c49949
nixos/pam: Do not incorrectly use zfs.enableUnstable in assertion
...
`zfs.enableUnstable` only has an effect if `zfs.enabled = true`, so only
require `zfs.enabled` to be true here.
2024-02-27 18:46:00 -05:00
Andrew Marshall
929fcf9335
zfs_unstable: Rename from zfsUnstable
...
This matches the naming of other zfs_* pkgs.
2024-02-27 18:45:55 -05:00
Andrew Marshall
ce5b1e007e
nixos/zfs: Fix typo in option doc
2024-02-27 18:45:55 -05:00
Andrew Marshall
1c84667539
nixos/tests/zfs: Get test name from pkg under test
...
The previous names are already this.
2024-02-27 18:45:47 -05:00
Andrew Marshall
dcff4f8318
zfs_2_2: Rename from zfsStable
...
The `zfs` alias already has equivalent semantics. Instead, make this
like zfs_2_1 so folks who want to pin a specific release series can do
so easily and clearly to have more control over when more substantial
updates occur.
Rename all tests to match the pkg attr they are testing.
2024-02-27 18:45:43 -05:00
Yt
f35896eab2
Merge pull request #291335 from soywod/himalaya-v1.0.0-beta.3
...
himalaya: 1.0.0-beta.2 -> 1.0.0-beta.3
2024-02-27 23:15:17 +00:00
e1mo
43fee5401d
nixos/bird-lg: Update option description to indicate new features
...
In release v1.3.3[0] support for CIDRs was added, thus updated the
option description to indicate the new support for that.
[0]: https://github.com/xddxdd/bird-lg-go/releases/tag/v1.3.3
2024-02-27 23:54:21 +01:00
Linus Heckemann
98684f4504
Merge pull request #270611 from astro/systemd-netboot
...
Systemd netboot
2024-02-27 23:44:57 +01:00
Sandro
f9477e3a75
Merge pull request #209506 from Izorkin/update-dhcpcd-exit-hook
...
nixos/dhcpcd: optimize exitHook
2024-02-27 23:01:22 +01:00
Astro
6fbf631a7b
nixos netboot: prepend systemd initrd sysroot for store overlay
2024-02-27 22:41:45 +01:00
Sandro
9c1ea5e3a2
Merge pull request #267012 from alois31/plymouth-unbloat
...
nixos/plymouth: drop the X11 renderer in the initrd
2024-02-27 22:28:27 +01:00
Sandro
4c88c797b8
nixos/mosquitto: remove stutter in acl file name
2024-02-27 22:15:43 +01:00
K900
d93db9066a
nixos/lib/testing: remove yet another source of unnecessary test rebuilds
2024-02-27 23:35:05 +03:00
K900
423098c284
nixos/lib/test-driver: drop LegacyStartCommand, clean up create_machine API
...
We can finally do this now that it's no longer used.
2024-02-27 23:15:59 +03:00
K900
786f391922
nixos/tests/installer: inline + fix UEFI start command generation
2024-02-27 23:15:59 +03:00
K900
61cb46e6bf
nixos/tests/boot: inline + fix UEFI start command generation
2024-02-27 23:15:59 +03:00
K900
bf5c44d0d7
nixos/tests/boot/ubootExtlinux: mark broken
2024-02-27 23:15:58 +03:00
K900
d9a37adc04
lib/test-driver: don't swallow qemu stderr
2024-02-27 23:15:58 +03:00
Atemu
97f445e8f1
Merge pull request #245005 from Scrumplex/nixos-monado
...
nixos/monado: init
2024-02-27 20:11:04 +00:00
