1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-24 02:00:41 +03:00
Commit graph

34540 commits

Author SHA1 Message Date
Vladimír Čunát
41d7e84dd8
Merge branch 'master' into staging-next
Trivial conflict:
 	nixos/doc/manual/release-notes/rl-2311.section.md
2023-06-17 07:46:50 +02:00
Matthew_Cash
ae234ed1ab
nixos/kmscon: disable reload-systemd-vconsole-setup service 2023-06-16 19:12:07 -07:00
Robert Hensing
8f31bff794 nixos/nixpkgs: Don't check when _module.args.pkgs is set 2023-06-16 22:08:16 +02:00
Robert Hensing
a742767baf nixos/nixpkgs: Make default Nixpkgs lazy when overridden 2023-06-16 21:46:26 +02:00
Maximilian Bosch
2f9c0ffde8
Merge pull request #237736 from Ma27/bump-nextcloud
nextcloud27: init
2023-06-16 19:51:28 +02:00
Raito Bezarius
627a8838fa nixosTests.kexec: do not use module argument config
It is deprecated now.
2023-06-16 19:43:40 +02:00
Raito Bezarius
7088e386ff nixosTests.kexec: reconnect properly after 2nd kexec
By some miracle, before, it was possible to reconnect to the `node1` without
doing any relevant dance.

But now we are direct booting (¿), it seems like we need to do the right things.

This introduces a `check_output` flag for `execute` because we do not want to steal the
messages from the backdoor service as we might execute the kexec too fast compared
to when we will reconnect.

Therefore, we will let the message in the pipe if needed.
2023-06-16 19:43:40 +02:00
Raito Bezarius
85c8cc7ce9 nixosTests.kexec: do not use bootloader
There's no reason to use a bootloader when testing kexec, this is a feature
that reboots *directly* in the kernel, if anything, we should just direct boot the
kernel and reboots in the kernel.

A bootloader test really makes sense to test "default" systemctl kexec behavior which is already broken
because systemctl kexec will read the ESP to determine what to kexec by default.
2023-06-16 19:43:40 +02:00
nikstur
0bdba6c99b nixos/qemu-vm: use persistent block device names
This change removes the bespoke logic around identifying block devices.
Instead of trying to find the right device by iterating over
`qemu.drives` and guessing the right partition number (e.g.
/dev/vda{1,2}), devices are now identified by persistent names provided
by udev in /dev/disk/by-*.

Before this change, the root device was formatted on demand in the
initrd. However, this makes it impossible to use filesystem identifiers
to identify devices. Now, the formatting step is performed before the VM
is started. Because some tests, however, rely on this behaviour, a
utility function to replace this behaviour in added in
/nixos/tests/common/auto-format-root-device.nix.

Devices that contain neither a partition table nor a filesystem are
identified by their hardware serial number which is injecetd via QEMU
(and is thus persistent and predictable). PCI paths are not a reliably
way to identify devices because their availability and numbering depends
on the QEMU machine type.

This change makes the module more robust against changes in QEMU and the
kernel (non-persistent device naming) and by decoupling abstractions
(i.e. rootDevice, bootPartition, and bootLoaderDevice) enables further
improvement down the line.
2023-06-16 19:36:03 +02:00
pennae
6fcb6eee77 nixos/doc: set meta generator for html manuals properly
we no longer have to look like docbook-xslt generates our manuals
exclusively, so let's put something useful in there instead.
2023-06-16 19:26:23 +02:00
pennae
426903d2fb nixos/manual: remove docbook intermediates
they're no longer used for anything.
2023-06-16 19:26:23 +02:00
Nick Cao
c72f24ec26
Merge pull request #237933 from pbek/feature/qownnotes-tests
qownnotes: add tests
2023-06-16 06:47:48 -06:00
deinferno
26ff15b981
nixos/tailscale: fix ipv6 nat (v6nat) support 2023-06-16 12:18:55 +00:00
Maximilian Bosch
3df3a89892
nixos/nextcloud: fix declarative cache configuration
It's supposed to be `memcache.distributed`, not an associative PHP array
named `memcache` with a key `distributed`.

This was probably never caught because the initial `grep -q` check in
the test was invalid: `redis-cli` prints nothing if no keys can be found
when not writing to a tty apparently.
2023-06-16 14:11:38 +02:00
Maximilian Bosch
5a2769d981
nextcloud27: init
Fixes #237560
2023-06-16 14:11:38 +02:00
github-actions[bot]
f76683b6c6
Merge staging-next into staging 2023-06-16 12:01:42 +00:00
github-actions[bot]
ebaef3ce4c
Merge master into staging-next 2023-06-16 12:01:08 +00:00
David McFarland
8ea644997f nixos/gpg-agent: move pinentry-program to /etc/gnupg/gpg-agent.conf 2023-06-16 08:24:52 -03:00
David McFarland
960a5142aa nixos/gnupg: add systemd configuration
This depended on the systemd user configuration provided upstream in
doc/examples.  However, this was all removed in:

eae28f1bd4
2023-06-16 08:21:47 -03:00
Charles Hall
370f3e4883 nixos/lemmy: remove option removed upstream 2023-06-16 05:59:32 -04:00
Ryan Lahfa
a056d3567c
Merge pull request #236279 from minijackson/netbox-3.5.3 2023-06-16 11:49:13 +02:00
Ryan Lahfa
afc6f0d93b
Merge pull request #228479 from zimbatm/netdata-auto-claim 2023-06-16 11:30:30 +02:00
Raito Bezarius
d4cab20b3a zfs: add option to restore kernel_neon for linux 6.2 support on aarch64
Introduced in aaeca98456
with the usual disdain for ZFS.

We have been there in the past with
<https://www.phoronix.com/news/NixOS-Linux-5.0-ZFS-FPU-Drop> /
https://github.com/NixOS/nixpkgs/pull/61076.

This fixes ZFS on aarch64 until the next breakage.

See https://github.com/openzfs/zfs/issues/14555 for original upstream
issue.
2023-06-16 11:07:33 +02:00
Patrizio Bekerle
fd800d851f
qownnotes: add tests 2023-06-16 08:20:32 +02:00
github-actions[bot]
c30d35ea7c
Merge staging-next into staging 2023-06-16 06:01:42 +00:00
github-actions[bot]
af7beed7be
Merge master into staging-next 2023-06-16 06:01:09 +00:00
Will Fancher
e57b65abbb
Merge pull request #238021 from dcarosone/empty-zpool-name-assertion
nixos/zfs: assert that pool names are not empty
2023-06-15 23:21:07 -04:00
Daniel Carosone
86ecee627a typo 2023-06-16 12:25:34 +10:00
Daniel Carosone
2dcb1b3ed7 nixos/zfs: assert that pool names are not empty
a zfs fileSystems entry with an absolute (e.g. device) path rather than
a zfs dataser is parsed as an empty pool name, causing a doomed-to-fail
import job to be created as a boot dependency. Catch this as an assertion
2023-06-16 10:40:09 +10:00
github-actions[bot]
efc10371d5
Merge master into haskell-updates 2023-06-16 00:13:24 +00:00
github-actions[bot]
ddfda1497e
Merge staging-next into staging 2023-06-16 00:02:58 +00:00
github-actions[bot]
839c033ffb
Merge master into staging-next 2023-06-16 00:02:18 +00:00
John Soo
75f419f222
nixos/buildkite-agents: simplify service definition
* remove `with`

* replace specific hooks with attrsOf lines

  To be flexible, should they change.

* make hooks with writeShellApplication

  - Previously hooks would not build if they used a heredoc with `EOF`
  - To shellcheck hooks

* format with nixpkgs-fmt

* remove removed option module
2023-06-15 16:31:29 -07:00
Raito Bezarius
db230657fc nixos/pixelfed: cleanup package cache at the very start 2023-06-16 00:50:10 +02:00
Maciej Krüger
95c729c030
Merge pull request #223952 from m-bdf/fix-cfs-zen-tweaks
Fix cfs-zen-tweaks
2023-06-15 21:56:00 +02:00
Jörg Thalheim
4f992e8da0
Merge pull request #237840 from lilyinstarlight/fix/systemd-initrd-vconsole-test
nixos/tests/systemd-initrd-vconsole: fix test and improve reliability
2023-06-15 19:41:08 +01:00
Lily Foster
7fb3975256
nixos/plymouth: add actual logo defaultText and move existing to example
Fixes #221391
2023-06-15 10:42:40 -04:00
Lily Foster
ef0c0d5c2f
nixos/plymouth: use new runtime paths for plugins and themes 2023-06-15 10:42:37 -04:00
github-actions[bot]
4ea871dec6
Merge staging-next into staging 2023-06-15 12:01:51 +00:00
github-actions[bot]
036d56d643
Merge master into staging-next 2023-06-15 12:01:17 +00:00
Charles Hall
af585658b8 nixos/lemmy: reduce moving parts 2023-06-15 06:56:56 -04:00
Charles Hall
fa9306c041 nixos/lemmy: allow overriding packages 2023-06-15 06:56:56 -04:00
Charles Hall
b1853ecfcd nixos/lemmy: only use env var when instructed
Lemmy checks the environment variable before the configuration file;
i.e. if the file is used to configure the database but the environment
variable is set to anything, the connection will fail because it'll
ignore the file. This was the previous behavior.

Now, the environment variable will be unset unless the user explicitly
chooses to set it, which makes the file-based configuration function
correctly. It's also possible to manually set the environment variable,
which has the major advantage of working around [this issue][0], which
prevents certain setups from working.

[0]: https://github.com/LemmyNet/lemmy/issues/2945
2023-06-15 06:56:56 -04:00
Charles Hall
dd0b5a7e08 nixos/lemmy: warn for option removed upstream
Also hide it since it shouldn't be used.
2023-06-15 06:56:56 -04:00
Lily Foster
9fb9774d93
nixos/tests/systemd-initrd-vconsole: fix test and improve reliability 2023-06-15 06:48:05 -04:00
Lily Foster
f1f0d4fbdd
nixos/test-driver: fix timeout option for wait_for_console_text 2023-06-15 06:47:49 -04:00
Carl Richard Theodor Schneider
59207cc930 nixos/adguardhome: Add allowDHCP option
This option conditionally adds the `CAP_NET_RAW` capability to the service,
which is mandatory for enabling the integrated DHCP server.
It also adds another test case to validate that the DHCP server successfully
provides IP addresses to clients.

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2023-06-15 12:27:35 +02:00
Jörg Thalheim
23ef0fdbf7
Merge pull request #237793 from Mic92/nix-ld
nix-ld: 1.1.0 -> 1.2.1
2023-06-15 08:51:56 +01:00
Jörg Thalheim
5ac7371bd1 nixos/nix-ld: use mkPackageOptionMD 2023-06-15 09:47:26 +02:00
Jörg Thalheim
b60f21e135 nixos/nix-ld: also include ld.so in nixos profile 2023-06-15 09:47:25 +02:00