Commit Graph

35446 Commits

Author SHA1 Message Date
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
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
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
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
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
Jörg Thalheim
fd264ba8a2 nixos/zfs: fix tests on zfsUnstable 2023-09-17 05:58:38 +02: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
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
mdarocha
f773e7cf09 pash: remove
The package is old and fully replaced by PowerShell
2023-09-16 02:55:44 +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
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
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
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
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
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
Michele Guerini Rocco
607cb89351
Merge pull request #254512 from rnhmjoj/pr-anbox
anbox: always use postmarket OS images
2023-09-14 12:57:39 +02:00
Mihai Fufezan
cef441709d nixos/hyprland: update portal override 2023-09-14 11:03:04 +02:00
happysalada
1e335c516b nixos/cfdyndns: dynamic user and loadcredentials 2023-09-14 07:53:36 +00:00
Kerstin Humm
d989b040da nixos/mobilizon: migrate to mdDoc 2023-09-14 07:53:23 +00:00
Robert Schütz
536969cad3 nodePackages.tedicross: drop
It fails to build with

    npm ERR! code 1
    npm ERR! path /nix/store/n7sdkr41nax0mn8drh3lxymqbmrradi4-tedicross-0.8.7/lib/node_modules/tedicross/node_modules/sodium
    npm ERR! command failed
    npm ERR! command sh -c node install.js --preinstall
    npm ERR! Static libsodium was not found at /nix/store/n7sdkr41nax0mn8drh3lxymqbmrradi4-tedicross-0.8.7/lib/node_modules/tedicross/node_modules/sodium/deps/build/lib/libsodium so compiling libsodium from source.
    npm ERR! automake is required, but wasn't found on this system
    npm ERR! make: *** [Makefile:62: libsodium] Error 1
    npm ERR! /nix/store/n7sdkr41nax0mn8drh3lxymqbmrradi4-tedicross-0.8.7/lib/node_modules/tedicross/node_modules/sodium/install.js:287
    npm ERR!             throw new Error(cmdLine + ' exited with code ' + code);
    npm ERR!             ^
    npm ERR!
    npm ERR! Error: make libsodium exited with code 2
    npm ERR!     at ChildProcess.<anonymous> (/nix/store/n7sdkr41nax0mn8drh3lxymqbmrradi4-tedicross-0.8.7/lib/node_modules/tedicross/node_modules/sodium/install.js:287:19)
    npm ERR!     at ChildProcess.emit (node:events:514:28)
    npm ERR!     at ChildProcess._handle.onexit (node:internal/child_process:291:12)
    npm ERR!
    npm ERR! Node.js v18.17.1
2023-09-13 15:00:38 -07:00
Artturin
696353fcf4 nixos/zfs: disable redundant scheduler
I (according to the comment) wrote this somewhere and since then it has
spread to many configs.

https://github.com/search?q=artturin+ENV%7BID_FS_TYPE%7D%3D%3D%22zfs_member%22%2C+ATTR%7B..%2Fqueue%2Fscheduler%7D%3D%22none%22&type=code

https://github.com/NixOS/nixpkgs/issues/169457#issuecomment-1523873402
2023-09-13 21:36:36 +02:00
pennae
0af23b2c3b
Merge pull request #254919 from rnhmjoj/pr-password
nixos/user-groups: fixup of 5666a378
2023-09-13 19:27:52 +02:00
nicoo
fe138d36c9 doc: Replace sha256 with hash where appropriate 2023-09-13 17:24:49 +00:00
rnhmjoj
7d6ee8ce1e
nixos/tests/shadow: test hashedPasswordFile 2023-09-13 17:00:05 +02:00
Nick Cao
74c10dd002
Merge pull request #254941 from foo-dogsquared/update-clash-verge-docs
nixos/clash-verge: fix module descriptions
2023-09-13 09:01:24 -04:00
Marcel Müller
52f22574ea nixosTests.discourse: Do not use deprecated field 2023-09-13 14:48:17 +02:00
Gabriel Arazas
ffa538dfc4 nixos/clash-verge: fix module descriptions 2023-09-13 20:30:28 +08:00
Mario Rodas
5f9390646a
Merge pull request #254827 from hanleym/trust-dns
trust-dns: 0.22.1 -> 0.23.0
2023-09-13 06:56:03 -05:00
nicoo
9d27026328 nixos/auto-cpufreq: Add nicoo to maintainers 2023-09-13 10:25:53 +00:00
nicoo
46a0c5ebbe nixos/below: Document maintainer 2023-09-13 10:25:28 +00:00
rnhmjoj
205b56cffc
nixos/user-groups: fixup of 5666a378 2023-09-13 11:44:19 +02:00
Ryan Lahfa
eb23738e85
Merge pull request #252283 from flokli/fcc-unlock-extra 2023-09-13 10:18:06 +02:00
linsui
840f02aa54 nixos/yazi: add to module-list.nix 2023-09-13 14:48:24 +08:00
Robert Scott
9e64f794d1
Merge pull request #208944 from risicle/ris-dockertools-makeoverridable
dockerTools: use makeOverridable for buildImage family of functions
2023-09-12 23:16:06 +01:00
Michael Hanley
a60936606c trust-dns: 0.22.1 -> 0.23.0 2023-09-12 18:06:33 -04:00
Fabián Heredia Montiel
cc1fdc5376
Merge pull request #254181 from StillerHarpo/adguardhome
nixos/adguardhome: Fix openFirewall
2023-09-12 16:23:16 -05:00
Fabián Heredia Montiel
8f711593fc
Merge pull request #254296 from Gerg-L/direnv
nixos/direnv: remove persistDerivations
2023-09-12 16:20:15 -05:00