Commit Graph

35905 Commits

Author SHA1 Message Date
Ryan Lahfa
cb403e56a6
Merge pull request #249386 from JTarasovic/jdt/systemd-networkd/dhcpv6config 2023-09-27 18:38:16 +02:00
Sander van der Burg
32c36780d1 dysnomia: 0.10.1 -> 0.10.2 2023-09-27 18:35:30 +02:00
Vladimír Čunát
8a86b98f0b
Merge #255658: staging-next 2023-09-17 2023-09-27 18:00:00 +02:00
Maximilian Bosch
b9bff72147
Merge pull request #249792 from teto/postgresql-quality-of-life-changes
services.postgres: move the generated statement at the top of the file
2023-09-27 16:22:58 +02:00
Janik
65e9f3c071
Merge pull request #257621 from herrwiese/for-master/usbguard-path-to-string 2023-09-27 14:21:57 +02:00
Andreas Wiese
1e8b8e6d38 nixos/usbguard: don't use path literal for pure evaluation
PR#256295 reintroduced ruleFile option, but set the default as a path
literal, which was a "string path" previously.  This breaks evaluation
for being impure:

  error: access to absolute path '/var/lib/usbguard/rules.conf' is forbidden in pure eval mode (use '--impure' to override)
2023-09-27 11:22:09 +02:00
github-actions[bot]
9a4dae4abd
Merge master into staging-next 2023-09-27 06:01:00 +00:00
Artturi
31c647207a
Merge pull request #231384 from mrcjkb/tuxedo-rs 2023-09-27 08:08:50 +03:00
Eike Frost
be2b474c00 nixos/tlp fix NetworkManager RDW dispatcher script location 2023-09-26 21:35:54 -04:00
Silvan Mosberger
dd72ff27f7 lib.attrsets.foldlAttrs: Make stricter
See the parent commit for the same change to lib.lists.foldl'
2023-09-27 02:43:59 +02:00
Silvan Mosberger
3b6169f87b lib.lists.foldl': Make strict in the initial accumulator
To maintain backwards compatibility, this can't be changed in the Nix language.
We can however ensure that the version Nixpkgs has the more intuitive behavior.
2023-09-27 02:43:59 +02:00
Maximilian Bosch
d77b59b41d
nixos/rust-motd: use a second attribute (order) for the of sections in TOML
Rather than using `priority` with `sortProperties`, a new option called
`order` defines the ordering of the sections. I.e.

    order = [ "global" "uptime" "banner" ]

means that `uptime` comes before `banner`. Please note that `global` is
for global settings and not a section. I figured that it'd be too much
magic to hide this in the implementation and ask the user to specify the
order of _each_ section in `settings` instead.

OTOH this makes the intent way clearer than priorities. Also, this
remains opt-in, the option defaults to `attrNames cfg.settings`, i.e.
all sections ordered alphabetically.
2023-09-26 23:28:40 +02:00
Marc Jakobi
01cc0a605a nixos/tuxedo-rs: init at 0.2.2 2023-09-26 23:28:05 +02:00
Minijackson
541d1eef67
netbox_3_3: remove
should be, by now, unused by everyone

Co-authored-by: Raito Bezarius <masterancpp@gmail.com>
2023-09-26 22:51:48 +02:00
Minijackson
828f0446f5
nixos/netbox: use netbox_3_6 for stateVersion>=23.11 2023-09-26 22:42:49 +02:00
Minijackson
3cc7cbce03
netbox_3_6: init, mark 3_5 as EOL
use it for the upgrade test
increase tests memory, otherwise NetBox gets OOM killed

Co-authored-by: Raito Bezarius <masterancpp@gmail.com>
2023-09-26 22:42:49 +02:00
github-actions[bot]
4bfb61a48c
Merge master into staging-next 2023-09-26 18:01:12 +00:00
K900
f33cdbcc25 nixos/gnome: remove nixpkgs.config usage
I have no idea how to keep this working, but it feels wrong anyway.
2023-09-26 18:02:01 +03:00
K900
d3c27efa36 nixos/firefox: remove nixpkgs.config usage 2023-09-26 18:02:01 +03:00
K900
018f62a151 nixos/doc: remove reference to long removed option 2023-09-26 18:02:01 +03:00
K900
c018561f54 nixos/amdgpu-pro: remove nixpkgs.config usage
A new X.org ABI is exceptionally unlikely at this point, and we can
add an assertion if it ever happens.
2023-09-26 18:02:00 +03:00
K900
7a7c1859cd nixos/lightdm-tiny-greeter: remove nixpkgs.config usage 2023-09-26 18:02:00 +03:00
K900
38461ff27a nixos/locate: remove nixpkgs.config usage 2023-09-26 18:02:00 +03:00
K900
ce87196a00 nixos/nixpkgs: assert that nixpkgs.config is not set when pkgs is passed in externally
This is a common footgun people hit often. Remove it.
2023-09-26 18:02:00 +03:00
Yureka
d490800f0f nixos/peering-manager: use settingsFormat 2023-09-26 14:42:45 +02:00
Alexander Bantyev
299e0b9560
Merge pull request #255033 from AleXoundOS/castopod
castopod: init at 1.6.4
2023-09-26 16:42:26 +04:00
github-actions[bot]
3bfcfd7eef
Merge master into staging-next 2023-09-26 06:01:00 +00:00
Lin Jian
bba54c4900
Merge pull request #255813 from linj-fork/feat-kanata-all-device
nixos/kanata: add default value, doc and warning for devices
2023-09-26 13:50:59 +08:00
Fabián Heredia Montiel
312aa96fe6
Merge pull request #256565 from bjornfor/nixos-wireguard-add-metric-option
nixos/wireguard: add metric option
2023-09-25 21:15:02 -06:00
github-actions[bot]
cc5ae613ff
Merge master into staging-next 2023-09-26 00:02:17 +00:00
Will Fancher
350b6b84e6
Merge pull request #257325 from NixOS/honk/fix-initdb-script-startup
nixos/modules/honk: fix initdb service startup
2023-09-25 20:01:04 -04:00
Weijia Wang
c71554840b
Merge pull request #257104 from vifino/unifi-7.5.176
unifi7: 7.4.156 -> 7.5.176
2023-09-25 23:43:16 +02:00
Weijia Wang
9e821b5ae0
Merge pull request #241542 from dasj19/wordpress-avoid-language-folder
wordpress: fixed installing of languages
2023-09-25 23:32:31 +02:00
0x4A6F
a0db07dad5
Merge pull request #256295 from Janik-Haag/usbguard
nixos/usbguard: restore ruleFile option
2023-09-25 22:05:36 +02:00
Pol Dellaiera
57514f5beb
nixos/modules/honk: fix initdb service startup 2023-09-25 22:02:52 +02:00
github-actions[bot]
fc1f757bf6
Merge master into staging-next 2023-09-25 18:01:06 +00:00
Pol Dellaiera
a7b3106959
Merge pull request #256628 from alyssais/nix-prefetch-git-config
nix-prefetch-git: ignore global and user git config
2023-09-25 18:40:40 +02:00
Valentin Gagarin
370097ce86
remove the misleading warning on using nix-env for split outputs (#255947)
The text was originally added [0] following an apparently incomplete
research on how everything plays together. In fact, Nix propagates
`outputs` to the corresponding nested derivations, and there is some
messy behavior in Nixpkgs that only seems to propagate
`meta.outputsToInstall` in `buildEnv`[1].

This change moves the hints on how to use NixOS specifics to NixOS
module documentation (which is hopefully easier to find through
search.nixos.org), describes the default behavior in Nixpkgs (updating
a the link to the source), and removes the confusing mention of
`nix-env`.

the last of them should not be there to begin with. we don't want
beginners to use `nix-env`, as this is known to run them into trouble
eventually.

[0]: https://github.com/NixOS/nixpkgs/pull/76794
[1]: 1774d07242/pkgs/build-support/buildenv/default.nix (L66)
2023-09-25 16:23:01 +02:00
Yureka
6500b4580c
Revert "nixos/boot/rasbperrypi: add support for boot.initrd.secret with uboot (#240358)" (#257251)
This reverts commit 94e939985b.
2023-09-25 14:22:51 +02:00
github-actions[bot]
3e52e5929d
Merge master into staging-next 2023-09-25 12:01:02 +00:00
Thiago Kenji Okada
c69d9ad27a
Merge pull request #256945 from LeSuisse/mattermost-8.1.2
mattermost: 7.10.5 -> 8.1.2
2023-09-25 12:46:02 +01:00
Ryan Lahfa
4242ecd871
Merge pull request #248372 from yaxitech/amd-sev-guest 2023-09-25 13:10:42 +02:00
Alyssa Ross
c5c30274a3 nixosTests.tinywl: fix by adding Mesa drivers
Required since upstream commit 49738406 ("render: don't fall back to
Pixman if we have a render node").
2023-09-25 13:04:20 +02:00
WilliButz
2d30a37d9f
Merge pull request #248925 from FugiMuffi/prometheus-sabnzbd-exporter
prometheus-sabnzbd-exporter: init at 0.1.70
2023-09-25 12:09:36 +02:00
Frederik Rietdijk
f4822bb295
Merge pull request #254309 from pbsds/flit-prune
python3Packages.flitBuildHook: remove
2023-09-25 11:34:15 +02:00
Will Fancher
4bd4976b87
Merge pull request #251290 from Majiir/systemd-initrd-networking-features
nixos/network-interfaces-systemd: support `vlans`, `bridges` in systemd-initrd
2023-09-25 05:07:23 -04:00
misuzu
c220d280b0 nixosTests.castopod: init 2023-09-25 10:17:44 +04:00
misuzu
cf6e43a3dd nixos/castopod: init 2023-09-25 10:17:44 +04:00
github-actions[bot]
104c9ec59b
Merge master into staging-next 2023-09-25 06:01:10 +00:00
Charles Hall
94a42157f4 nixos/xonotic: init 2023-09-24 22:54:59 -03:00
github-actions[bot]
680b13891d
Merge master into staging-next 2023-09-25 00:02:13 +00:00
Artturi
713af20167
Merge pull request #241518 from Gerg-L/use-xdg-base-directories 2023-09-25 00:45:31 +03:00
ktrinh
8da771560c nixos/device-tree: Allow custom dtbSource and expose compileDts 2023-09-24 11:58:13 -07:00
github-actions[bot]
03a82ba5d4
Merge master into staging-next 2023-09-24 18:00:54 +00:00
Aaron Andersen
c51a273a92
Merge pull request #254370 from jakubgs/mtr-exporter/multi-job
mtr-exporter: support specifying multiple jobs
2023-09-24 11:39:23 -04:00
Adrian Pistol
191131077b unifi7: 7.4.156 -> 7.5.176 2023-09-24 17:25:08 +02:00
Ryan Lahfa
0fa52bd973
Merge pull request #257043 from Tom-Hubrecht/garage-envfile 2023-09-24 17:07:21 +02:00
Tom Hubrecht
2d38d9edc0 nixos/garage: Add an environmentFile option
Since garage 0.8.2, garage accepts environment variables for passing secrets,
e.g. `GARAGE_RPC_SECRET` or `GARAGE_ADMIN_TOKEN`. The added `environmentFile`
allows those secrets to not be present in the nix store.
2023-09-24 14:47:05 +02:00
Maximilian Bosch
9bd9e20e9a
Merge pull request #256090 from CRTified/sshd-validation-fix
nixos/sshd: Specify connection parameters for configuration validation
2023-09-24 14:12:46 +02:00
github-actions[bot]
b6d5fc29bc
Merge master into staging-next 2023-09-24 12:01:00 +00:00
Aryeh Hillman
b6766564ed Update wg-quick.nix
Update wg-quick.nix such that a search for `WireGuard` in the `NixOS Options` section of search.nixos.org brings up the convenient `networking.wg-quick.interfaces.wg0.configFile` option.
2023-09-24 13:24:27 +02:00
Lin Jian
c5ba4c687e
nixos/kanata: add default value, doc and warning for devices 2023-09-24 17:09:23 +08:00
Minijackson
6c7e768420
netbox_3_5: introduce alias
clears up ambiguity
use that alias in tests

Co-authored-by: Raito Bezarius <masterancpp@gmail.com>
2023-09-24 10:13:05 +02:00
Jakub Sokołowski
4e587ac821
mtr-exporter: support specifying multiple jobs
This ability has been added in `0.3.0` release:
https://github.com/mgumz/mtr-exporter/releases/tag/0.3.0
https://github.com/NixOS/nixpkgs/pull/252667

To achieve this a config is generated and symlinked at `/etc/mtr-exporter.conf`.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
2023-09-24 09:13:31 +02:00
github-actions[bot]
0e6413dbff
Merge master into staging-next 2023-09-24 00:02:23 +00:00
Felix Schröter
5365ecb40b rome: remove
rome is no longer maintained.
A fork called biome is available in nixpkgs.
2023-09-23 19:43:45 -03:00
Thiago Kenji Okada
a3a7520a2f
Merge pull request #119856 from ilian/oci-image
oci-image: init scripts to build and upload image
2023-09-23 21:09:07 +01:00
Martin Weinelt
1ff350f7b8
Merge pull request #81460 from vcunat/p/knot-nixConfig
nixos/knot: allow full configuration by nix values
2023-09-23 20:55:54 +02:00
Thomas Gerbet
a3e7a80c7e mattermost: 7.10.5 -> 8.1.2
Fixes MMSA-2023-00224, MMSA-2023-00230, MMSA-2023-00222, MMSA-2023-00223, MMSA-2023-00217,
MMSA-2023-00210, MMSA-2023-00234, MMSA-2023-00232 and MMSA-2023-00239.

Mattermost 7.10.x is EOL, this contribution moves to the 8.1.x branch which is the new ESR.

Changelog can be found here:
https://docs.mattermost.com/install/self-managed-changelog.html#release-v8-0-major-release
https://docs.mattermost.com/install/self-managed-changelog.html#release-v8-1-extended-support-release
2023-09-23 20:06:48 +02:00
github-actions[bot]
ab2ecc25c1
Merge master into staging-next 2023-09-23 18:00:59 +00:00
Nick Cao
1fe305df27
Merge pull request #256906 from oddlama/fix-typesense-0.25.1
nixos/typesense: disable MemoryDenyWriteExecute which is needed since 0.25.1
2023-09-23 11:37:13 -04:00
Janne Heß
cc55ef9d55
Merge pull request #254993 from helsinki-systems/feat/stc-mount-improvements
nixos/switch-to-configuration: Mount improvements and a lot more test cases
2023-09-23 17:03:13 +02:00
oddlama
11d4f6e4a8
nixos/typesense: disable MemoryDenyWriteExecute which is needed since 0.25.1
also adjust default state directory mode to allow typesense group
2023-09-23 16:37:23 +02:00
Aaron Andersen
2af64a3d1d
Merge pull request #246173 from bb2020/mbpfan
nixos/mbpfan: adjust defaults
2023-09-23 09:41:11 -04:00
Nick Cao
4a5b19463a
Merge pull request #256762 from mweinelt/matrix-synapse-network-online
nixos/matrix-synapse: wait for network-online.target
2023-09-23 09:12:06 -04:00
Maciej Krüger
9a914a7c52
Merge pull request #256491 from mkg20001/mkg/sudo-rs-resolve
nixos/{sudo,-rs}: revert sudo-rs, make own module
2023-09-23 15:08:06 +02:00
digital
94e939985b
nixos/boot/rasbperrypi: add support for boot.initrd.secret with uboot (#240358)
Co-authored-by: digital <didev@dinid.net>
2023-09-23 14:32:09 +02:00
Kirill Radzikhovskyy
ea9254a5a5 nixosTests.tranmission_4: init 2023-09-23 21:38:47 +10:00
Vladimír Čunát
1869818c57
nixos/knot: add release notes and partial compatibility 2023-09-23 10:05:17 +02:00
Martin Weinelt
45e71a7a99
nixosTests.kea: use knot.settings for configuration 2023-09-23 10:04:02 +02:00
Martin Weinelt
8e93f353cc
nixosTests.knot: use settings format 2023-09-23 10:04:02 +02:00
Vladimír Čunát
ce85980e77
nixos/knot: also allow config by YAML file 2023-09-23 10:04:02 +02:00
Vladimír Čunát
7fb737dde6
nixos/knot: allow full configuration by nix values (RFC 42) 2023-09-23 10:04:02 +02:00
github-actions[bot]
f95580a6ff
Merge master into staging-next 2023-09-23 06:00:57 +00:00
Artturi
87ee3c4fdf
Merge pull request #176886 from hyperfekt/nonderivation_fish-completion 2023-09-23 06:28:23 +03:00
Martin Weinelt
457d9bbc94
nixos/matrix-synapse: wait for network-online.target
While network.target only guarantees that network devices have been
created the `network-online.target` allows delaying service startup
until after a configurable network state has been reached.

This should resolve spurious failures, e.g. when synapse tries to load
the discovery information for its OIDC provider from a remote host.
2023-09-22 22:41:40 +02:00
Peder Bergebakken Sundt
bdda7b0a53 python3Packages.flitBuildHook: remove 2023-09-22 21:11:24 +02:00
Sergei Trofimovich
e57034f9a7 modules/xmr-stak: drop broken cudaSupport option
Tanvir Ahmed T. reports that `services.xmr-stak.enable = true;` shows
that `23.05` ships broken `xmr-stak` module:

    error: function 'anonymous lambda' called with unexpected argument 'cudaSupport'

I broke it when I removed `cudaSupport` flag in
    a5ce71d4e8

I'm just removing the option without an attempt to supply the stub as
module was already broken on `23.05` release. There are probably no
users of `xmr-stak` module by now.

Closes: https://github.com/NixOS/nixpkgs/issues/256703
2023-09-22 17:40:04 +01:00
Maciej Krüger
59a8959287
release-notes: adjust to sudo-rs module
As it's now called sudo-rs and also remove breaking changes for sudo
2023-09-22 15:14:15 +02:00
Maciej Krüger
8e9b72be82
nixos/sudo-rs: add crossCompile 'fix'
This is just a quick fix based on pname,
as I have no idea how to use slicing in the module

We should instead use slicing to get the package for the host
2023-09-22 15:14:14 +02:00
Maciej Krüger
04e64fa716
nixosTests.sudo-rs: use sudo-rs
As the module was renamed, we need to use the new one
2023-09-22 15:14:14 +02:00
Maciej Krüger
03762aa42a
test-driver: revert stderr nullpipe
Removes 2>/dev/null which re-adds stderr output breaking execute
2023-09-22 15:14:13 +02:00
Maciej Krüger
7c8b8bd3e4
nixos/sudo-rs: init
adds a new sudo-rs module that contains sudo-rs changes removed from sudo module
2023-09-22 15:14:13 +02:00
Maciej Krüger
57d41f9751
nixos/sudo: revert sudo-rs 922926cfbc (partial #253876)
This reverts the module changes that were added
by the addition of sudo-rs (merge 922926cfbc) from the sudo module.

Individual commits reverted:
* 409d29ca73 2023-08-31 | [nicoo] nixos/sudo: Split up `configFile` into individual sections
* 454151375d 2023-09-04 | [nicoo] nixos/sudo: Don't include empty sections
* 8742134c80 2023-09-04 | [nicoo] nixos/sudo: Only keep SSH_AUTH_SOCK if used for authentication
* f5aadb56be 2023-09-07 | [nicoo] nixos/sudo: Refactor option definitions
* 8b9e867ac8 2023-09-07 | [nicoo] nixos/sudo: Refactor checks for Todd C. Miller's implemetation
* 3a95964fd5 2023-09-07 | [nicoo] nixos/sudo: Drop useless `lib.` qualifiers
* b1eab8ca53 2023-09-07 | [nicoo] nixos/sudo: Handle `root`'s default rule through `extraRules`
* 717e51a140 2023-09-07 | [nicoo] nixos/sudo: Make the default rules' options configurable
* c11da39117 2023-09-07 | [nicoo] nixos/sudo: Drop the sudoers comment for `extraRules`
* f0107b4f63 2023-09-07 | [nicoo] nixos/sudo: Check syntax using the configured package
* 914bf58369 2023-09-07 | [nicoo] nixos/{sudo, terminfo}: Adjust defaults for compatibility with `sudo-rs`
* f66eb0df3b 2023-09-07 | [nicoo] nixos/sudo: Only wrap `sudoedit` when using Miller's sudo
* d63eb55e81 2023-09-13 | [nicoo] nixos/sudo: Generate `sudo-i` PAM config for interactive use of `sudo-rs`
* d8d0b8019f 2023-09-13 | [nicoo] nixos/sudo: Add myself as maintainer (nbraud/nixos/sudo-rs)
2023-09-22 15:13:56 +02:00
github-actions[bot]
3431cedfe3
Merge master into staging-next 2023-09-22 12:01:02 +00:00
K900
daebf5c6e2
Merge pull request #254071 from alois31/plasma-setuid
nixos/plasma5: remove pointless setuid wrappers
2023-09-22 14:21:03 +03:00
Linus Heckemann
f6f5f60879 bcachefs tests: unlock directly to the right keyring 2023-09-22 12:58:04 +02:00
Janne Heß
358347e8b6
nixos/switchTest: Also test swap devices 2023-09-22 10:26:11 +02:00
Janne Heß
85c1c30fd9
nixos/switch-to-configuration: Never unmount / or /nix
Also adds a huge test for fstab handling
2023-09-22 10:26:10 +02:00
Alyssa Ross
7d40fbbc04
nix-prefetch-git: ignore global and user git config
nix-prefetch-git is either run as part of a build, usually sandboxed,
or outside a build, unsandboxed, to prefetch something that will later
be used in a build.  It's important that the latter use produces
hashes that can be reproduced by the former.

One way that they can differ is if the user's git config does
something that changes the result of git clone.  I ran into this,
because my global git config automatically enables git-lfs, whereas
nix-prefetch-git otherwise only uses git-lfs if specifically
requested.  This led to very confusing hash mismatches.
2023-09-22 06:59:40 +00:00
github-actions[bot]
c651d7d9e9
Merge master into staging-next 2023-09-22 00:02:14 +00:00
Thiago Kenji Okada
371cebacb5 maintainers/scripts/oci: add missing parameter 2023-09-21 22:57:39 +01:00
Thiago Kenji Okada
c655cdb536 maintainers/scripts/oci: make scripts fail on error 2023-09-21 22:57:39 +01:00
Thiago Kenji Okada
d5d4b08488 nixos/virtualisation: always use EFI for OCI 2023-09-21 22:57:39 +01:00
Thiago Kenji Okada
cd67657ae2 nixos/virtualisation: use systemd-networkd for OCI 2023-09-21 22:57:39 +01:00
Thiago Kenji Okada
5eae6db9e3 nixos/virtualisation: remove deprecated option from OCI common 2023-09-21 22:57:39 +01:00
ilian
e8fc4d22e9 maintainers/scripts/oci: Fix indentation 2023-09-21 22:57:39 +01:00
Samuel Dionne-Riel
2eb41eb208 nixos/virtualization: Allow building EFI / A1 OCI images
A couple notes:
---------------

Adding invalid `console=` parameters is not an issue. Any invalid
console is unused. The kernel will use the "rightmost" (last) valid
`console=` parameter as the default output. Thus the SBBR-mandated AMA0
on A1, and ttyS0 on x86_64 as documented by Oracle.

`nvme_core.shutdown_timeout=10` was added as it was written this way in
the A1 images. Unclear whether `nvme.shutdown_timeout=10` is wrong. At
worst this is a no-op.
2023-09-21 22:57:38 +01:00
Samuel Dionne-Riel
d944fb4a19 nixos/virtualization: Allow building EFI OCI images 2023-09-21 22:57:38 +01:00
Samuel Dionne-Riel
9849ccb241 nixos: Add OCI image options
Follows what amazon images does.
2023-09-21 22:57:38 +01:00
Samuel Dionne-Riel
3a35abf169 nixos/oci-image: Minor cleanup 2023-09-21 22:15:22 +01:00
Samuel Dionne-Riel
5056824e64 maintainers/scripts/oci: Allow A1 image builds 2023-09-21 22:15:22 +01:00
ilian
362d1d6218 oci-image: init scripts to build and upload image
Add image configuration for Oracle Cloud Infrastructure and scripts to
build and upload the image as a Custom Image.
2023-09-21 22:15:22 +01:00
Artturi
ff10769cc9
Merge pull request #165298 from danielfullmer/gdm-banner 2023-09-21 23:40:15 +03:00
Bjørn Forsman
ed7c0c6e75 nixos/wireguard: add metric option
This new option, networking.wireguard.interfaces.NAME.metric, allows
increasing the metric of the routes, effectively lowering priority.

(I'm using high metric to allow having the Wireguard interface always
up, even when the client machines are on their home network. Before I
had to stop the interface when home to avoid packet routing issues.)
2023-09-21 22:19:21 +02:00
github-actions[bot]
25421963c7
Merge master into staging-next 2023-09-21 18:00:53 +00:00
Robert Gerus
294c4ec956 nixos/glasgow: init hardware module 2023-09-21 11:48:01 -05:00
Markus S. Wamser
02f0dc8cff grocy: add package option
apply review from @SuperSandro2000

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2023-09-21 18:01:23 +02:00
Maciej Krüger
7fd7b57ddc
release-notes: mention networking.networkmanager.firewallBackend
Co-authored-by: Florian Klink <flokli@flokli.de>

Co-authored-by: Lin Jian <me@linj.tech>
2023-09-21 16:19:07 +02:00
Sandro Jäckel
9a85d77152
nixos/networkmanager: default firewallBackend to nftables, remove firewallBackend
Co-authored-by: Florian Klink <flokli@flokli.de>

Co-authored-by: Lin Jian <me@linj.tech>
2023-09-21 16:18:57 +02:00
Sandro Jäckel
ad0ca163e1
nixos/networkmanager: cleanup, fix example rendering 2023-09-21 15:16:54 +02:00
Martin Weinelt
b4bd254b86
Merge pull request #256289 from Ma27/refactor-synapse-assertions
nixos/matrix-synapse: refactor assertions for missing listener resources
2023-09-21 14:06:38 +02:00
github-actions[bot]
4c610adf95
Merge master into staging-next 2023-09-21 12:01:19 +00:00
Maximilian Bosch
214cf0b934
nixos/rust-motd: .attrs.json -> "$NIX_ATTRS_JSON_FILE"
That way the derivation can also be built in a `nix-shell` where
`.attrs.json` isn't under "$NIX_BUILD_TOP".
2023-09-21 13:17:13 +02:00
Maximilian Bosch
11376df6d4
nixos/rust-motd: allow ordering sections by priority
Closes #234802

The problem here is that with e.g.

    {
      uptime.prefix = "Up";
      banner.command = "hostname | figlet -f slant";
    }

`banner` still appears before `uptime` in the final motd text because
Nix sorts attribute names alphabetically internally.

To work around this without breaking compatibility or losing the
property to override individual sections in other modules - e.g.

    {
      banner.color = mkForce "blue";
    }

I decided to introduce an option `priority` here, similar to the
priority field for `nginx`[1] and with the same semantics (i.e. higher
value means lower priority).

Internally a bunch of env vars are generated, i.e. `env0` to `envN` for
`N` sections with each of them containing a declaration for the TOML,
i.e. `env0` contains `{ uptime.prefix = "Up"; }` and `env1` contains
`{ banner.command = "hostname | figlet -f slant"; }` if `uptime.priority`
is set to a value below 1000.

In this order, the declarations are concatenated together by `jq(1)`
which doesn't sort keys alphabetically which results in a JSON
representation with `uptime` before `banner`. This is finally piped to
`json2toml` which converts this into TOML for rust-motd.

[1] https://nixos.org/manual/nixos/unstable/options#opt-services.nginx.virtualHosts._name_.locations._name_.priority
2023-09-21 13:17:13 +02:00
hexchen
8ec182e570 nixos/prometheus: fix blackbox exporter 2023-09-21 08:49:10 +02:00
github-actions[bot]
743d7baa31
Merge master into staging-next 2023-09-21 06:01:07 +00:00
Pierre Bourdon
2db9117928
Merge pull request #255556 from louib/allow_disabling_openssh_root_login
nixos/virtualisation: allow configuring openssh root login on GCE
2023-09-21 05:56:12 +02:00
github-actions[bot]
2b20c287ac
Merge master into staging-next 2023-09-21 00:02:13 +00:00
Artturi
7f45760504
Merge pull request #192593 from jlesquembre/test-driver 2023-09-21 00:47:45 +03:00
Fabián Heredia Montiel
b2f85dbf28 Merge remote-tracking branch 'origin/master' into staging-next 2023-09-20 15:08:16 -06:00
Yorick
829514e2da
Merge pull request #251597 from wietsedv/calibre-web
nixos/calibre-web: add package and enableKepubify options
2023-09-20 22:35:16 +02:00
Arnout Engelen
69ecad6acb
Merge pull request #254563 from raboof/prometheus-exporter-nextcloud-fixup
prometheus-exporter-nextcloud: require either tokenFile or passwordFile
2023-09-20 22:33:10 +02:00
Maximilian Bosch
0a71cf07a8
nixos/rust-motd: run once on bootup
That way e.g. the last login and uptime isn't completely bogus when
accessing a machine for the first time after a reboot.
2023-09-20 22:16:03 +02:00
Nikolay Korotkiy
09846eacb2
Merge pull request #252001 from imincik/qgis-nixos-test
qgis: add nixos tests
2023-09-20 23:46:57 +04:00
Robert Schütz
728bae020d
Merge pull request #253687 from dotlambda/plausible-2.0.0
plausible: 1.4.4 -> 2.0.0
2023-09-20 19:28:09 +00:00
José Luis Lafuente
c25c10e919 nixos/tests: make wait_for timeouts configurable
While working on #192270, I noticed that only some wait_for_* helper
functions make the timeout configurable. I think we should be able to
customize it in all cases
2023-09-20 21:56:46 +03:00
Robert Schütz
c4574a95c5 plausible: also install tracker 2023-09-20 09:07:28 -07:00
Maximilian Bosch
d004375485
nixos/matrix-synapse: refactor assertions for missing listener resources
While reviewing other changes related to synapse I rediscovered the
`lib.findFirst (...) (lib.last resources)` hack to find a listener
supporting the `client` resource. We decided to keep it that way for now
a while ago to avoid scope-creep on the RFC42 refactoring[1]. I wanted
to take care of that and forgot about it.

Anyways, I'm pretty sure that this is bogus: to register a user, you
need the `client` API and not a random listener which happens to be the
last one in the list. Also, you need something which serves the `client`
API to have the entire synapse<->messenger interaction working (whereas
`federation` is for synapse<->synapse).

So I decided to error out if no `client` listener is found. A listener
serving `client` can be defined in either the main synapse process or
one of its workers via `services.matrix-synapse.workers`[2].

However it's generally nicer to use assertions for that because then
it's possible to display multiple configuration errors at once and one
doesn't have to chase one `throw` after another. I decided to also error
out when using the result from `findFirst` though because module
assertions aren't thrown necessarily when you evaluate a single config
attribute, e.g. `config.environment.systemPackages` which depends on an
existing client listener because of `registerNewMatrixUser`[3].

While at it I realized that if `settings.instance_map` is wrongly
configured, e.g. by

    settings.instance_map = mkForce {
      /* no `main` in here */
    }

an `attribute ... missing` error will be thrown while evaluating the
worker assertion.

[1] https://github.com/NixOS/nixpkgs/pull/158605#discussion_r815500487
[2] This also means that `registerNewMatrixUser` will still work if you
    offload the entire `client` traffic to a worker.
[3] And getting a useful error message is way better for debugging in such a
    case than `value is null while a set was expected`.
2023-09-20 15:48:03 +02:00
bb2020
5caa82281e nixos/mbpfan: adjust defaults 2023-09-20 16:10:26 +03:00
Maciej Krüger
61536e7a1f
nixosTests.sudo-rs: fix syntax 2023-09-20 13:58:08 +02:00
Janik H.
3b673297e7
nixos/usbguard: restore ruleFile option 2023-09-20 13:55:55 +02:00
Maciej Krüger
922926cfbc
Merge pull request #253876 from nbraud/nixos/sudo-rs 2023-09-20 13:55:33 +02:00
Lin Jian
d27a248494
Merge pull request #255064 from tomfitzhenry/vikunja-cli
nixos/vikunja: install 'vikunja' CLI tool
2023-09-20 18:03:34 +08:00
zaldnoay
79599c86ae nixos/frp: fix example url of configure file 2023-09-20 13:55:53 +08:00
github-actions[bot]
429d006c1a
Merge master into staging-next 2023-09-20 00:02:14 +00:00
Weijia Wang
0425ad73b3
Merge pull request #255549 from wegank/wordpress-bump
wordpress: 6.2.2 -> 6.3.1
2023-09-20 00:41:56 +02:00
Will Fancher
c6db677b1c
Merge pull request #255008 from SuperSandro2000/x-triggers-name
systemd-lib: add name to X-{Reloads,Restart}-Triggers to easily ident…
2023-09-19 17:38:05 -04:00
Pol Dellaiera
3ff2629897
Merge pull request #255880 from Atemu/installer-configuration.nix-search.nixos.org
nixos/installer: mention search.nixos.org
2023-09-19 21:50:15 +02:00
github-actions[bot]
e26a9c8bb7
Merge master into staging-next 2023-09-19 18:01:23 +00:00
Niklas Hambüchen
1a8e576180
Merge pull request #255977 from nh2/vaultwarden-fix-default-config-evaluation
vaultwarden service: Fix doubly-nested `config` value. Fixes evaluation
2023-09-19 18:46:58 +02:00
Niklas Hambüchen
c460434104 nixos/vaultwarden: Fix doubly-nested config value. Fixes evaluation 2023-09-19 16:46:08 +00:00
Carl Richard Theodor Schneider
cd2dead42c nixos/tests/openssh: add Match config for validation test 2023-09-19 18:13:44 +02:00
Carl Richard Theodor Schneider
716bde190c nixos/sshd: specify lport,laddr for config validation 2023-09-19 18:13:44 +02:00
Nick Cao
e8e461df5d
Merge pull request #254833 from NickCao/qt4-leftover
nixos/environment: drop QT_PLUGIN_PATH for qt4 and kde4 as they has b…
2023-09-19 10:08:27 -04:00
Izorkin
64fe8c9292
nixos/nginx: allow enabling QUIC packet routing using eBPF 2023-09-19 16:16:34 +03:00
github-actions[bot]
e22ad0ef4c
Merge master into staging-next 2023-09-19 12:01:22 +00:00
Arnout Engelen
1bf360af28
prometheus-exporter-nextcloud: require either tokenFile or passwordFile
follow-up on 28b3156bc6 which broke
when tokenFile was left empty.

Making both options nullable also allows us to provide a more meaningful
error message when neither authentication method is configured.
2023-09-19 13:19:54 +02:00
Fabián Heredia Montiel
90040cd36a linux/hardened/patches/6.5: init at 6.5.3-hardened1 2023-09-19 07:09:14 +00:00
github-actions[bot]
3245a21e71
Merge master into staging-next 2023-09-19 06:01:00 +00:00
Artturi
73d552ecb7
Merge pull request #254918 from RaitoBezarius/dnssec-resolved 2023-09-19 06:45:07 +03:00
Daniel Fullmer
67c5103f40 nixos/gdm: add banner option
This exposes the banner message option in GDM. Some computing
environments have compliance requirements which include displaying a
message to the user before logon.
2023-09-19 05:17:59 +03:00
Erno Hopearuoho
7d112f7da3 luksroot: fix issue when yubikey is detached during boot process
Fixes #228141, which describes an issue where detaching Yubikey during the boot process
causes cryptsetup to write empty passphrase instead of the challenge-response salt stored
on the boot drive.
2023-09-18 23:10:06 -03:00
nicoo
d8d0b8019f nixos/sudo: Add myself as maintainer 2023-09-18 18:03:58 +00:00
nicoo
d63eb55e81 nixos/sudo: Generate sudo-i PAM config for interactive use of sudo-rs 2023-09-18 18:03:58 +00:00
nicoo
7b5b3f5124 nixos/sudo: Add tests for sudo-rs too
Duplicated sudo's testsuite for now, as its maintainer does not with
to collaborate on testing effors; see #253876.

Environment-related tests were removed, as sudo-rs does not support
`(NO)SETENV` yet; see memorysafety/sudo-rs#760
2023-09-18 18:03:58 +00:00
github-actions[bot]
f6ea8c7459
Merge master into staging-next 2023-09-18 18:01:08 +00:00
Maximilian Bosch
e4f0f0977e
Merge pull request #241973 from 999eagle/feat/synapse-workers
nixos/synapse: add support for workers, cleanup
2023-09-18 19:54:20 +02:00
Maciej Krüger
4729358fa5 nixos/test-driver: do not break if the command writes to stderr
Capturing `stderr` as part of the return `output` could break existing tests.
2023-09-18 17:36:16 +00:00
nicoo
f66eb0df3b nixos/sudo: Only wrap sudoedit when using Miller's sudo 2023-09-18 17:36:15 +00:00
nicoo
914bf58369 nixos/{sudo, terminfo}: Adjust defaults for compatibility with sudo-rs 2023-09-18 17:36:15 +00:00
nicoo
f0107b4f63 nixos/sudo: Check syntax using the configured package
This is preferable even for regular `sudo`, but will ensure the check is useful
when using `sudo-rs` in the future.

Also, dropped antediluvian comment about the syntax check being disabled,
when it was clearly not commented out:
  - introduced in 2007, commit 6d65f0ae03ae14f3e978d89959253d9a8f5e0ec1;
  - reverted in 2014, commit e68a5b265a,
    but without ammending the comments.
2023-09-18 17:36:15 +00:00
nicoo
c11da39117 nixos/sudo: Drop the sudoers comment for extraRules
All rules are now handled through `extraRules`,
and it is never empty so `optionalString` isn't needed either.
2023-09-18 17:36:15 +00:00
nicoo
717e51a140 nixos/sudo: Make the default rules' options configurable 2023-09-18 17:36:15 +00:00
nicoo
b1eab8ca53 nixos/sudo: Handle root's default rule through extraRules
This makes things more uniform, and simplifies compatibility with sudo-rs.

Moreover, users can not inject rules before this if they need to.
2023-09-18 17:35:45 +00:00
nicoo
3a95964fd5 nixos/sudo: Drop useless lib. qualifiers
Also normalise indentation for `mdDoc` to what's prevalent in this file.
2023-09-18 17:35:07 +00:00
nicoo
8b9e867ac8 nixos/sudo: Refactor checks for Todd C. Miller's implemetation 2023-09-18 17:35:07 +00:00
nicoo
f5aadb56be nixos/sudo: Refactor option definitions 2023-09-18 17:35:06 +00:00
nicoo
0365b05f13 nixos/terminfo: Add config option not to add extra sudo config
This will be necessary for compatibility with `sudo-rs`.
2023-09-18 17:35:06 +00:00
nicoo
8742134c80 nixos/sudo: Only keep SSH_AUTH_SOCK if used for authentication
This will make compatibility with `sudo-rs` easier.
2023-09-18 17:35:06 +00:00
nicoo
454151375d nixos/sudo: Don't include empty sections
This makes the generated sudoers a touch easier to read.
2023-09-18 17:35:06 +00:00
nicoo
409d29ca73 nixos/sudo: Split up configFile into individual sections 2023-09-18 17:35:06 +00:00
Atemu
9084f59d36 nixos/installer: mention search.nixos.org
It's immensely helpful and more user-friendly than the humongous
configuration.nix man page.
2023-09-18 14:38:26 +02:00
github-actions[bot]
9fd6a65a3a
Merge master into staging-next 2023-09-18 12:01:07 +00:00
Lin Jian
4dc624f9c7
Merge pull request #255264 from emilylange/nixos/caddy
nixos/caddy: ensure vhosts come after user-specified `cfg.extraConfig`
2023-09-18 19:34:34 +08:00
Matthieu Coudron
b53c715e50 services.postgres: add initialScript example 2023-09-18 11:57:58 +02:00
Matthieu Coudron
956a1876aa services.postgresql: add identMap example
to make things clearer
2023-09-18 11:57:58 +02:00
Matthieu Coudron
482619dac7 services.postgres: move the generated statement at the top of the file 2023-09-18 11:57:57 +02:00
emilylange
fcdcccaed6
nixos/caddy: ensure vhosts come after user-specified cfg.extraConfig
This solves an issue, where loading the nixos-unstable module in
nixos-stable using `disabledModules` and `imports` resulted in the
following Caddyfile:

```
<globalConfig>

<vhosts>

<extraConfig>
```

instead of

```
<globalConfig>

<extraConfig>

<vhosts>
```

This is important in cases where `cfg.extraConfig` contains so called
Caddyfile snippets.

See https://caddyserver.com/docs/caddyfile/concepts#structure

Co-authored-by: Lin Jian <me@linj.tech>
2023-09-18 11:12:19 +02:00
Sophie Tauchert
24f6a70abf
nixos/synapse: make sure workers require main process
This should ensure systemd handles starting all services (main and
workers) in a single transaction, thus preserving unit orderings
defined through After= even when not restarting the target.
2023-09-18 10:52:54 +02:00
Sophie Tauchert
aed8a5c6cd
nixos/synapse: add documentation for required reverse proxy setup 2023-09-18 08:24:38 +02:00
Maximilian Bosch
6b95c618e2
nixos/rl-2311: fix option references for synapse workers 2023-09-18 08:24:38 +02:00
Sophie Tauchert
dea34ad0fa
nixos/synapse: default tls to off for workers and document worker replication port 2023-09-18 08:24:37 +02:00
Sophie Tauchert
c693c2fd96
nixos/synapse: simplify replication listener assertion 2023-09-18 08:24:37 +02:00
Sophie Tauchert
ca1ffe5869
nixos/synapse: move services.matrix-synapse.workers.config to services.matrix-synapse.workers 2023-09-18 08:24:37 +02:00
Sophie Tauchert
53ab84cf49
nixos/synapse: automatically configure logging for synapse and workers 2023-09-18 08:24:36 +02:00
Sophie Tauchert
857b4932ec
nixos/synapse: remove obsolete log context
see 0304ad0c3d for when this was removed upstream
2023-09-18 08:24:36 +02:00
Sophie Tauchert
2edea7611b
nixos/synapse: document options better
Co-authored-by: Daniel Olsen <daniel.olsen99@gmail.com>
2023-09-18 08:24:36 +02:00
Sophie Tauchert
b20cbb12cd
nixos/synapse: add test for running synapse with workers
Co-authored-by: Daniel Olsen <daniel.olsen99@gmail.com>
2023-09-18 08:24:36 +02:00
Sophie Tauchert
3a6a07ecf1
nixos/synapse: automatically configure replication listener 2023-09-18 08:24:35 +02:00
Sophie Tauchert
72a26e2b54
nixos/synapse: add options to configure workers 2023-09-18 08:24:35 +02:00
Sophie Tauchert
b329180128
nixos/synapse: add option to configure redis automatically 2023-09-18 08:24:35 +02:00
Sophie Tauchert
b7c41da8d6
nixos/synapse: update listener settings
The resource type health is currently missing, but should be available
according to https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#listeners
2023-09-18 08:24:35 +02:00
Sophie Tauchert
f15212aad8
nixos/synapse: cleanup, split out listener type and service config 2023-09-18 08:24:33 +02:00
github-actions[bot]
cb25ab46c1
Merge master into staging-next 2023-09-18 00:02:10 +00:00
Philippe Hürlimann
7ae1eab886 ulogd: add support for multiple logging stacks
fixes #244469
2023-09-18 00:16:54 +02:00
Jörg Thalheim
fd6901755d stage1: use correct zfs package
This in particular broke zfsUnstable because it added symbols not present in zfsStable
2023-09-17 21:11:29 +02:00
github-actions[bot]
d2fdbb7e40
Merge master into staging-next 2023-09-17 18:00:59 +00:00
Robert Scott
1bd27e1de9
Merge pull request #255648 from risicle/ris-docker-tools-nixos-tests-disk-3072
nixosTests.docker-tools: bump `diskSize` from 2048 -> 3072
2023-09-17 16:49:54 +01:00
github-actions[bot]
4851185192
Merge master into staging-next 2023-09-17 12:01:05 +00:00
Maximilian Bosch
b4dbea193a
Merge pull request #255179 from Ma27/rm-grafana-migration-error
nixos/grafana: remove hacky deprecation helper from dashbaords & datasources
2023-09-17 13:44:33 +02:00
Robert Scott
0834c95bd6 nixosTests.docker-tools: bump diskSize from 2048 -> 3072 2023-09-17 12:18:42 +01:00
zaldnoay
b53e5a6479 nixos/frp: add test and link to package 2023-09-17 14:37:19 +08:00
zaldnoay
6cd38e43cd nixos/frp: init 2023-09-17 14:37:19 +08:00
github-actions[bot]
aafb7c13a2
Merge staging-next into staging 2023-09-17 06:01:27 +00:00
Jörg Thalheim
fd264ba8a2 nixos/zfs: fix tests on zfsUnstable 2023-09-17 05:58:38 +02:00
louib
66100e22f6 nixos/virtualisation: allow configuring openssh root login on GCE
This commit makes the OpenSSH option `PermitRootLogin` available to be
configured by other NixOS modules when using the Google Cloud Engine
(GCE) NixOS image builder. Other options like `PasswordAuthentication`
were already configurable, so I think it makes sense to make `PermitRootLogin`
configurable as well is order to disable it completely, for example.
2023-09-16 19:43:02 -04:00
Weijia Wang
b4521212e4 wordpress: 6.2.2 -> 6.3.1 2023-09-17 00:02:26 +02:00
github-actions[bot]
c43057cfb6
Merge staging-next into staging 2023-09-16 18:01:34 +00:00
Fabián Heredia Montiel
f8056c5007
Merge pull request #255145 from BuonHobo/patch-1
jellyfin: Start service after network is up
2023-09-16 12:00:21 -06:00
Naïm Favier
57b9e41dcc
Merge pull request #246515 from ncfavier/jq
jq: 1.6 -> 1.7
2023-09-16 19:15:18 +02:00
Artturin
09e3d7d7e4
jq: add a release note 2023-09-16 19:14:48 +02:00
github-actions[bot]
3bb223b1fb
Merge staging-next into staging 2023-09-16 12:01:45 +00:00
Christian Theune
697312fb82
nixos/swraid: only warn if swraid was explicitly enabled (#255426)
The default just recently changed in 23.11. Users that had
swraid enabled implicitly by NixOS in previous releases got surprised
by warnings even though they do not actually use software RAID.

Fixes #254807
2023-09-16 12:19:19 +02:00
github-actions[bot]
7f93574706
Merge staging-next into staging 2023-09-16 06:01:30 +00:00
mdarocha
f773e7cf09 pash: remove
The package is old and fully replaced by PowerShell
2023-09-16 02:55:44 +00:00
github-actions[bot]
61d4f1db27
Merge staging-next into staging 2023-09-15 18:01:26 +00:00
Robert Schütz
1f832ad576
Merge pull request #254306 from dotlambda/tedicross-drop
nodePackages.tedicross: drop
2023-09-15 17:23:54 +00:00
Maximilian Bosch
70dbb8795b
Merge pull request #255136 from Ma27/synapse-url-blacklist-type
nixos/matrix-synapse: fix type of `settings.url_preview_url_blacklist`
2023-09-15 18:53:36 +02:00
Martin Weinelt
1fc088bce0
Merge pull request #255250 from thillux/frr-9.0.1
frr: 8.5.2 -> 9.0.1
2023-09-15 16:36:37 +02:00
Nick Cao
315168eba4
nixos/environment: drop MOZ_PLUGIN_PATH
There are currently no references to MOZ_PLUGIN_PATH treewide in gecko[1].
And the support for this environment variable was dropped in 2019[2].

See also: https://bugzilla.mozilla.org/show_bug.cgi?id=1602308

[1] https://github.com/search?q=repo%3Amozilla%2Fgecko-dev+MOZ_PLUGIN_PATH&type=code
[2] https://hg.mozilla.org/mozilla-central/rev/9b4e603eb86a
2023-09-15 09:49:19 -04:00
Vincent Haupert
f13bf0c0d4 nixos/amd.sev: add test 2023-09-15 15:38:49 +02:00
Vincent Haupert
e22dff17f5 nixos/amd.sev: add hardware.cpu.amd.sevGuest option
Allow setting the owner, group and mode of the `/dev/sev-guest` device,
similar to what is already possible for `/dev/sev` through the
`hardware.cpu.amd.sev` options.

The `/dev/sev` device is available to AMD SEV hosts, e.g., to start an
AMD SEV-SNP guest. In contrast, the `/dev/sev-guest` device is only
available within SEV-SNP guests. The guest uses the device, for example,
to request an attestation report. Linux has in-tree support for SEV-SNP
guests since 5.19.
2023-09-15 15:38:19 +02:00
Maciej Krüger
7b737acb4a
Merge pull request #254967 from nbraud/sha256-to-hash/top-level 2023-09-15 14:36:49 +02:00
Maciej Krüger
11eae28c27
Merge pull request #254922 from nbraud/nixos/maintainer-nicoo 2023-09-15 14:34:36 +02:00
github-actions[bot]
a8b6cc7e11
Merge staging-next into staging 2023-09-15 12:01:33 +00:00
Markus Theil
8e5d42e8e9 nixos/frr: add mgmtd to service list
mgmtd is a new service in frr >= 9.0.

Signed-off-by: Markus Theil <theil.markus@gmail.com>
2023-09-15 13:19:19 +02:00
Valentin Gagarin
295a5e1e2b
fix capitalization (#254542) 2023-09-15 09:59:11 +02:00
github-actions[bot]
65bc8eea63
Merge staging-next into staging 2023-09-15 06:01:42 +00:00
Artturin
38f37080c5 nixos/lib/make-btrfs-fs: copy improvements from
https://git.sr.ht/~c00w/nixpkgs/tree/sdimagebtrfs/item/nixos/lib/make-btrfs-fs.nix

I made only one change which was to use `btrfs check` instead of
`fsck.btrfs` because of this warning

```
btrfs-fs.img> ++ fsck.btrfs /nix/store/6d46rc768c140asy6rjpc5rk568r36zq-btrfs-fs.img
btrfs-fs.img> If you wish to check the consistency of a BTRFS filesystem or
btrfs-fs.img> repair a damaged filesystem, see btrfs(8) subcommand 'check'.
```

Co-authored-by: Colin L Rice <colin@daedrum.net>
2023-09-15 08:04:40 +03:00
Artturi
fc21cde24b
Merge pull request #91956 from c00w/makebtrfs 2023-09-15 07:37:07 +03:00
github-actions[bot]
3578e69dcd
Merge staging-next into staging 2023-09-15 00:02:48 +00:00
tomf
e5d8baafcd
nixos/yubikey-touch-detector: init (#254947)
* nixos/yubikey-touch-detector: init

* nixos/yubikey-touch-detector: enable user socket
2023-09-14 20:15:32 +00:00
Maximilian Bosch
698c640e77
nixos/grafana: remove hacky deprecation helper from dashbaords & datasources
The problem we had back then was that `mkRenamedOptionModule` doesn't
work if an option will be moved a level depper, i.e.

    services.grafana.provision.dashboards

became

    services.grafana.provision.dashboards.settings.provider

I actually planned to remove this before 23.05 (since the change was
already released in 22.11), but as you can see that didn't happen ;-)

I think the grace-period was quite long already. And if someone is
migrating from <22.11 to a current NixOS now, there are very precise
instructions on how to upgrade in the 22.11 release notes.
2023-09-14 22:12:53 +02:00
github-actions[bot]
dd6646009e
Merge staging-next into staging 2023-09-14 18:01:28 +00:00
Alex
ec9009f8e4
Jellyfin service starts after network-online.target
To those who use Jellyfin's DLNA server, it can happen that the DLNA server starts before we are connected to the LAN.

When this happens, Jellyfin only publishes the DLNA server on the local ports and is not discoverable by devices in the LAN.

In order to fix this, I'm ensuring that Jellyfin starts after we are connected to the network, making it properly discoverable by DLNA clients.

After making this change, Jellyfin's DLNA server is now working as expected on my machine. It used to be consistently undiscoverable.

I verified that this doesn't break anything in situations where the LAN is not available: I disconnected my laptop from the network and rebooted it and Jellyfin started as expected.

This change was informed by reading the suggestion in this article: https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/
2023-09-14 18:31:22 +02:00
Edward Tjörnhammar
903ebdc0a0 nixos/nvidia: don't assume x11 is used.. 2023-09-14 18:19:15 +02:00
Maximilian Bosch
8a3c21bd82
nixos/matrix-synapse: fix type of settings.url_preview_url_blacklist
Actually, it's supposed to be `listOf (attrsOf str)` because each
list-item can match against multiple properties from `urlsplit`[1]. In
fact, `listOf str` breaks URL previews at runtime:

    Sep 14 15:03:47 soost synapse[1100355]: synapse.http.server: [GET-116] Failed handle request via 'PreviewUrlResource': <XForwardedForRequest at 0x7f691bd5f730 method='GET' uri='/_matrix/media/r0/preview_url?url=<redacted>' clientproto='HTTP/1.1' site='8448'>
                                            Traceback (most recent call last):
                                              [...]
                                              File "/nix/store/xk5yksbw09p6qwk0maq2cb2in3z6f4gn-matrix-synapse-1.91.2/lib/python3.10/site-packages/synapse/media/url_previewer.py", line 398, in _is_url_blocked
                                                for attrib, pattern in entry.items():
                                            AttributeError: 'str' object has no attribute 'items'

To make sure that people aren't confused when upgrading their configs, I
decided to work with `types.coercedTo` to "pretend" accepting the old
type signature, but then throwing an error explaining what to do (and
rejecting the broken configuration).

[1] https://docs.python.org/3/library/urllib.parse.html#urllib.parse.urlsplit
2023-09-14 17:32:26 +02:00
Pol Dellaiera
d30fde0977
Merge pull request #250735 from TheNeikos/fix/discourse
discourse: update 3.1.0.beta4 -> 3.1.0
2023-09-14 16:03:28 +02:00
Adam Stephens
8565cd862a
systemd: allow udev-trigger to run on lxd containers with nesting 2023-09-14 09:17:33 -04:00