Commit Graph

33457 Commits

Author SHA1 Message Date
Martin Weinelt
557f89f5d1
Merge pull request #228492 from LeSuisse/tt-rss-2023-04-13-php81
tt-rss: unstable-2022-10-15 -> unstable-2023-04-13, module use PHP 8.1
2023-05-13 02:17:24 +02:00
github-actions[bot]
2f665c348c
Merge master into staging-next 2023-05-13 00:02:05 +00:00
Harshil Jani
aa0b851e83
manual: fix matrix room link (#231523)
Co-authored-by: figsoda <figsoda@pm.me>
2023-05-12 18:55:19 -04:00
Isa
c7629a78b7 graylog: let the user decide which version of graylog to use 2023-05-12 20:43:03 +02:00
Isa
efbcbc5611 graylog: init at 4.0.8, 4.3.8, 5.0.6 2023-05-12 20:16:05 +02:00
github-actions[bot]
206417b7a2
Merge master into staging-next 2023-05-12 18:01:18 +00:00
nikstur
fa09e0a3c7 nixos/filesystems: init erofs
Enable using an erofs filesystem as one of the filesystems needed to
boot the system. This is useful for example in image based deployments
where the Nix store is mounted read only.
[erofs](https://docs.kernel.org/filesystems/erofs.html) offers multiple
benefits over older filesystems like squashfs. Skip fsck.erofs because
it is still experimental.
2023-05-12 19:55:32 +02:00
nikstur
1bd62f43eb nixos/systemd-repart: add myself as maintainer 2023-05-12 18:55:09 +02:00
Katze
dfb8a2a7c4
nixos/syncplay: add saltFile and extraArgs option (#220096)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2023-05-12 18:01:33 +02:00
Martin Weinelt
1c80c494ca
Merge pull request #228422 from mweinelt/gitea-actions-runner-module
nixos/gitea-actions-runner: init
2023-05-12 17:54:16 +02:00
Fabian Möller
c51fe112cc
treewide: pass system argument to eval-config.nix
Calling `eval-config.nix` without a `system` from a Nix flake fails with
`error: attribute 'currentSystem' missing` since #230523. Setting
`system = null` removes the use of `currentSystem` and instead uses the
value from the `nixpkgs` module.
2023-05-12 14:56:23 +02:00
github-actions[bot]
30ae8398a9
Merge master into staging-next 2023-05-12 12:01:26 +00:00
Martin Weinelt
dc8f1bfe48
Merge pull request #231255 from Ma27/fix-vrf-test
nixos/tests/systemd-networkd-vrf: fix build & clean up
2023-05-12 12:47:54 +02:00
github-actions[bot]
0a82cd9e62
Merge master into staging-next 2023-05-12 08:49:13 +00:00
K900
b136129246
Merge pull request #231293 from K900/libinput-default
nixos/x11/hardware/libinput: enable by default
2023-05-12 09:42:23 +03:00
Federico Damián Schonborn
8e01b9d98c
nixos/budgie: Update description for sessionPath, add example for extraPlugins
Signed-off-by: Federico Damián Schonborn <fdschonborn@gmail.com>
2023-05-11 21:35:27 -03:00
Federico Damián Schonborn
7da8045e7e
budgiePlugins.budgie-analogue-clock-applet: rename from budgie.budgie-analogue-clock-applet
Signed-off-by: Federico Damián Schonborn <fdschonborn@gmail.com>
2023-05-11 21:09:54 -03:00
github-actions[bot]
84352fc449
Merge master into staging-next 2023-05-12 00:01:57 +00:00
Gabriel Fontes
e74d936730
nixos/tests/headscale: update test
Version 0.19.0 renamed 'namespace' to 'user'
https://github.com/juanfont/headscale/blob/main/CHANGELOG.md#0190-2023-01-29
2023-05-11 19:31:02 -03:00
Martin Weinelt
3c09f66193
Merge pull request #231096 from kai-tub/vector/add-pkg-opt
vector: add `package` Option
2023-05-11 22:10:20 +02:00
Robert Hensing
2e2f0d28ea nixos: Use checks instead of extraDependencies
... as appropriate.

This drops a few unnecessary store paths from the system closure.
2023-05-11 21:18:38 +02:00
Robert Hensing
5bdf63819b nixos/top-level.nix: Add system.checks
Note that this does not add to the `forbiddenDependenciesRegex`
code because that code check should be unaffected as it only checks
output dependencies, not build dependencies.
Build deps are added after that check, if those are enabled in the
first place.
2023-05-11 21:18:38 +02:00
Arian van Putten
6c0935d466
Merge pull request #231140 from NixOS/rosetta-nix-build
modules/rosetta: configure nix build sandbox to use rosetta
2023-05-11 14:21:54 -04:00
github-actions[bot]
b9c14e0e61
Merge master into staging-next 2023-05-11 18:01:13 +00:00
Kai Norman Clasen
3142dd9827 nixosTests.vector: fix race condition 2023-05-11 19:45:47 +02:00
Kai Norman Clasen
8989ea2778 nixos/vector: add package Option 2023-05-11 19:44:50 +02:00
Ilan Joselevich
e4298360d4
Merge pull request #231310 from Kranzes/harmonia
nixos/tests/harmonia: check if settings work
2023-05-11 19:23:10 +03:00
Robert Hensing
5c3e59b6d6
Merge pull request #230523 from hercules-ci/fast-nixos-test-eval
Fast nixos test eval
2023-05-11 17:34:46 +02:00
Ilan Joselevich
64d505e227
nixos/tests/harmonia: check if settings work 2023-05-11 18:03:14 +03:00
Robert Hensing
16e3647337 nixos/all-tests: Enable readOnlyPkgs by default for runTest
Most tests are not affected by this because they use the `handleTest`
function instead.
2023-05-11 16:36:49 +02:00
Robert Hensing
b0e17891f2 nixos/testing/nodes.nix: Do not rely on disabledModules
It's just not necessary.
2023-05-11 16:24:01 +02:00
Robert Hensing
0f83261f0e nixos/testing: Add node.pkgsReadOnly escape hatch
By adding this option indirection, a test can declare all by itself
that it needs a custom nixpkgs. This is a more convenient way of
going about this when the caller of the test framework receives a
`node.pkgs` unconditionally.
2023-05-11 16:24:01 +02:00
Robert Hensing
f659db7ba2 nixos/testing: Add node.pkgs option
By factoring out this logic, it's easier for other projects to make
use of it this optimization too (and do it correctly).
2023-05-11 16:24:00 +02:00
Robert Hensing
d0b0f9e441 nixosTests.acme: Use a read-only pkgs
This speeds up evaluation by a factor 2.

Ballpark figures from my machine:

```
$ time nix-build nixos/release.nix -A tests.acme
/nix/store/q4fxp55k64clcarsx8xc8f6s10szlfvz-vm-test-run-acme
/nix/store/lnfqg051sxx05hclva84bcbnjfc71c8x-vm-test-run-acme

real    1m28.142s
user    1m7.474s
sys     0m7.932s

$ time nix-build nixos/release.nix -A tests.acme
/nix/store/q4fxp55k64clcarsx8xc8f6s10szlfvz-vm-test-run-acme
/nix/store/lnfqg051sxx05hclva84bcbnjfc71c8x-vm-test-run-acme

real    0m38.235s
user    0m33.814s
sys     0m2.283s

```
2023-05-11 16:24:00 +02:00
Robert Hensing
b213791e7e nixos/all-tests.nix: Add readOnlyPkgs module 2023-05-11 16:24:00 +02:00
K900
9fec1a09bd nixos/x11/hardware/libinput: enable by default
Basically everything Wayland uses this, it's much more actively
maintained than xf86-input-evdev, and we should really be shipping
it by default.
2023-05-11 16:49:10 +03:00
Robert Hensing
f212785e1e
Merge pull request #231246 from yayayayaka/gitlab-test-fix-warning
nixosTests.gitlab: Use module system based runner
2023-05-11 15:13:08 +02:00
Robert Hensing
8b2d1e4554
nixos/tests/gitlab.nix: Document running it
`nix-build $file` is not possible anymore, so this helps both newcomers and old hands.
It's documented in the manual, but that's far away.
2023-05-11 14:31:21 +02:00
Naïm Favier
ea81a2465e
make-iso9660-image: use __structuredAttrs
Makes it easier to enable discarding of references, a feature of Nix
2.14 which requires structured attrs.
2023-05-11 14:25:44 +02:00
Naïm Favier
56226c4674
make-squashfs: use __structuredAttrs
Makes it easier to enable discarding of references, a feature of Nix
2.14 which requires structured attrs.
2023-05-11 14:25:31 +02:00
github-actions[bot]
387f5d9a5f
Merge master into staging-next 2023-05-11 12:01:42 +00:00
Martin Weinelt
537d611a75 nixos/sshd: Remove algorithms that do MAC-then-encrypt
Algorithms with the -etm suffix calculate the MAC after encryption,
which is generally considered safer.
2023-05-11 12:54:32 +02:00
ajs124
89f2a7f6ee
Merge pull request #231105 from helsinki-systems/upd/mariadb
mariadb: 10.4.29, 10.5.20, 10.6.13, 10.10.4, 10.11.3
2023-05-11 12:49:48 +02:00
ajs124
fbfa1ec989
Merge pull request #231190 from aanderse/nixos/automysqlbackup
nixos/automysqlbackup: add some missing permissions
2023-05-11 12:47:39 +02:00
wrvsrx
05129aab01
nixos/lib: save triggers of systemd into nix store 2023-05-11 17:38:54 +08:00
Maximilian Bosch
501d0a65d4
nixos/tests/systemd-networkd-vrf: clean up
* Removed unused variables
* Deduplicate config for `node{1..3}`
2023-05-11 11:07:54 +02:00
Maximilian Bosch
8ccfd7a659
nixos/tests/systemd-networkd-vrf: fix build
For this round of ZHF: #230712
Failing Hydra build: https://hydra.nixos.org/build/219234565

Not sure why this a problem now and not in the past, but routes to
the corresponding `/24`-subnet are only configured if addresses are
specified with the correct CIDR.
2023-05-11 11:04:56 +02:00
Yaya
439625d5d5 nixosTests.gitlab: Use module system based runner 2023-05-11 07:31:13 +00:00
github-actions[bot]
d16e82bf21
Merge master into staging-next 2023-05-11 06:01:36 +00:00
Martin Weinelt
ec7af23e7e
Merge pull request #231153 from helsinki-systems/drop/trusted-grub
trustedGrub: remove
2023-05-11 02:05:25 +02:00
github-actions[bot]
079dc4c27d
Merge master into staging-next 2023-05-11 00:02:13 +00:00
Aaron Andersen
55b3b7029d nixos/automysqlbackup: rename config option to settings 2023-05-10 20:00:09 -04:00
Aaron Andersen
a73e7383c0 nixos/automysqlbackup: add some missing permissions 2023-05-10 19:57:48 -04:00
Ilan Joselevich
a8eea70935
Merge pull request #231113 from Kranzes/harmonia
nixos/harmonia: adjust module and test to upstream, harmonia: 0.6.3 -> 0.6.4
2023-05-11 00:37:41 +03:00
figsoda
9eff400dd9
Merge pull request #230939 from figsoda/sniffnet-module 2023-05-10 17:24:47 -04:00
ajs124
96fbdcedcd trustedGrub: remove 2023-05-10 22:17:56 +02:00
ajs124
1319323458 nixos/grub: turn definition of version option from an error into a warning
because a lot of configurations (generated by nixos-generate-config) contain it
2023-05-10 21:51:26 +02:00
ajs124
30bea8d82d nixos/*: remove boot.grub.version 2023-05-10 21:51:26 +02:00
ajs124
6db7450827 nixos/installer/grub1: remove 2023-05-10 21:51:26 +02:00
Ilan Joselevich
7ecf20b490
nixos/harmonia: adjust module and test to upstream 2023-05-10 22:28:03 +03:00
Arian van Putten
a33d032939 modules/rosetta: configure nix build sandbox to use rosetta
With this we can do x86_64 builds on aarch64
2023-05-10 14:28:50 -04:00
Luflosi
ada7f14219
kubo: 0.19.2 -> 0.20.0
https://github.com/ipfs/kubo/releases/tag/v0.20.0

When creating a repository with `ipfs init`, `--empty-repo=true` is now the default according to the changelog. Modify the NixOS module to reflect this change and fix the `emptyRepo` setting to work with this change.
2023-05-10 19:50:46 +02:00
ajs124
81244087ab nixosTests.mysql-replication: fix deprecation warning 2023-05-10 18:22:41 +02:00
Aaron Andersen
dd2c3b1310 nixos/lxc-container: ensure /sbin/init is updated on nixos-rebuild boot 2023-05-10 11:04:07 -04:00
Ryan Lahfa
fe7b996d66
Merge pull request #230857 from s1341/bugfix_pam_sssd
nixos/pam: Allow password changing via sssd
2023-05-10 16:56:47 +02:00
Sandro
84b4373d8c
Merge pull request #230550 from Mic92/harmonia 2023-05-10 16:55:06 +02:00
Sandro
dfc76445d0
Merge pull request #228738 from Luflosi/update/aaaaxy 2023-05-10 16:02:19 +02:00
Robert Hensing
cd358fe24e nixos/all-tests.nix: Set nixpkgs.system 2023-05-10 15:55:09 +02:00
Robert Hensing
e5db80ae48 nixosModules.pkgsReadOnly: init 2023-05-10 15:55:09 +02:00
Robert Hensing
693e2c3287 nixos/eval-config: Remove statically known mkIf
mkIf is unnecessary when the condition is statically known - that is
knowable before entering the module evaluation.

By changing this to a precomputed module, we support changing the
defined options to readOnly options.
2023-05-10 15:55:09 +02:00
Robert Hensing
6e594fedb3 nixos/nixpkgs: Use types.pkgs 2023-05-10 15:55:09 +02:00
Robert Hensing
16d594a0e2 lib.types.pkgs: init
A nominal type.
2023-05-10 15:55:08 +02:00
happysalada
47bedc81f8 uptime-kuma: add defaults for simpler initial setup 2023-05-10 09:54:56 -04:00
Jörg Thalheim
76ffeaf06c nixos/harmonia: init service 2023-05-10 14:52:31 +02:00
Luflosi
220a0f4ca3
nixos/tests/aaaaxy: fix test
It got broken by 5c0aa81909.
The fix is to use a real X server instead of xvfb-run.
2023-05-10 14:45:01 +02:00
Sandro
7b22f5b4a2
Merge pull request #215494 from poelzi/webdav-server-rs-debug 2023-05-10 14:29:26 +02:00
github-actions[bot]
71874015ba
Merge master into staging-next 2023-05-10 12:01:10 +00:00
Jörg Thalheim
e758377984
Merge pull request #230926 from bachp/geth-test-zhf
nixos/geth: fix failing test
2023-05-10 07:23:24 +01:00
Pierre Bourdon
ac4abaa9d5
nixos/tests/nginx: fix etag test flakiness 2023-05-10 05:01:50 +02:00
github-actions[bot]
2d07e76d1a
Merge staging-next into staging 2023-05-10 00:03:33 +00:00
figsoda
282e5e03a8 nixos/sniffnet: init 2023-05-09 15:53:34 -04:00
asonix
cb2941db79 pict-rs: 0.3.0-alpha.37 -> 0.3.3 2023-05-09 15:24:54 -04:00
Pascal Bach
7e14b746c0
Merge pull request #230890 from linyinfeng/tocken
nixos/networkd: fix typo of `tokenBucketFilterConfig`
2023-05-09 20:49:37 +02:00
Pascal Bach
301ec4c067 nixos/geth: fix failing test
Run authrpc on different ports for main and testnet to avoid collision.
2023-05-09 20:35:28 +02:00
github-actions[bot]
b5b52a946a
Merge staging-next into staging 2023-05-09 18:02:32 +00:00
Martin Weinelt
42aaea3606
Merge pull request #230889 from mweinelt/shadow-encrypt-method
nixos/shadow: Set default encrypt method
2023-05-09 19:43:06 +02:00
Sandro
8f6cd53206
Merge pull request #229022 from SuperSandro2000/nox-mpv-wayland
nixos/no-x-libs: disable wayland for mpv
2023-05-09 19:07:16 +02:00
Weijia Wang
419d7f9c8d
Merge pull request #230753 from fetsorn/typos
several typos
2023-05-09 19:16:12 +03:00
Atemu
9c946bce87
Merge pull request #230680 from alyssais/netboot-squashfs
nixos/netboot: add squashfsCompression option
2023-05-09 18:13:27 +02:00
Ryan Lahfa
fb250ff2c9
Merge pull request #172340 from 06kellyjac/k3d
k3d: rename kube3d to k3d
2023-05-09 18:02:30 +02:00
s1341
d5fd433208 nixos/test/sssd-ldap: do new login on a different VT 2023-05-09 18:51:47 +03:00
Martin Weinelt
daf7d8861f
Merge pull request #230871 from IndeedNotJames/nixos-tests-2047mb
nixosTests.gitea,nixosTests.forgejo,nixosTests.wiki-js: fix test on `i686-linux`
2023-05-09 17:22:32 +02:00
s1341
73811d22bb nixos/test/sssd-ldap: nixpkgs-fmt 2023-05-09 18:13:09 +03:00
Lin Yinfeng
1e05869917
nixos/networkd: fix typo of tokenBucketFilterConfig 2023-05-09 23:06:47 +08:00
Martin Weinelt
a3c7dcd88d
nixos/shadow: Set default encrypt method
Fixes the default for tools like chpasswd, chgpasswd and gpasswd.

Closes: #230880
2023-05-09 17:05:34 +02:00
Sandro
d199137345
Merge pull request #230560 from legendofmiracles/upddate-nodjs-asf 2023-05-09 16:58:52 +02:00
Alyssa Ross
e5e49df7fd
nixos/netboot: add squashfsCompression option
This is copied from isoImage.squashfsCompression.  It's useful to be
able to customise, as iteration cycles are very slow with xz, and
subjectively systems booted with less efficiently compressed squashfs
stores appear to have faster reads (although I didn't test that
scientificly so there could be other factors).
2023-05-09 14:15:10 +00:00
Alyssa Ross
096cdeeac4
nixos/iso-image: type isoImage.squashfsCompression 2023-05-09 14:15:02 +00:00
fetsorn
5e77899001 nixos/tpm2: fix typo
"acess" -> "access"
2023-05-09 18:02:17 +04:00
fetsorn
1a4e993104 nixos/prometheus: fix typo
"nixpgs" -> "nixpkgs"
2023-05-09 18:02:17 +04:00
fetsorn
f035683f55 nixos/matomo: fix typo
"suported" -> "supported"
2023-05-09 18:02:17 +04:00
fetsorn
d1398dd05c nixos/deluge: fix typo
"secuerly" -> "securely"
2023-05-09 18:02:17 +04:00
fetsorn
ac5f6d9100 nixos/apparmor: fix typo
"usualy" -> "usually"
2023-05-09 18:02:17 +04:00
purin
9595113480 nixos/openrgb: fix data dir & amd i2c 2023-05-10 01:34:21 +12:00
06kellyjac
6b78c0b80e k3d: add notice of rename in release notes 2023-05-09 14:22:59 +01:00
IndeedNotJames
260ddac146
nixosTests.wiki-js: fix test on i686-linux
Fail pattern:
1. Unsuspecting `qemu-kvm` notice:
```
server # qemu-kvm: at most 2047 MB RAM can be simulated
```

2. Hard fail
```
    self.shell.send(out_command.encode())
BrokenPipeError: [Errno 32] Broken pipe
```

(Took me a while to consider those lines are related)
2023-05-09 15:22:35 +02:00
IndeedNotJames
0cbeb283cf
nixosTests.gitea,nixosTests.forgejo: fix test on i686-linux
Fail pattern:
1. Unsuspecting `qemu-kvm` notice:
```
server # qemu-kvm: at most 2047 MB RAM can be simulated
```

2. Hard fail
```
    self.shell.send(out_command.encode())
BrokenPipeError: [Errno 32] Broken pipe
```

(Took me a while to consider those lines are related)
2023-05-09 15:21:53 +02:00
Martin Weinelt
558b23afe3
Merge pull request #230844 from pennae/mosquitto-test-fix
nixos/mosquitto: use networkd for tests
2023-05-09 14:57:30 +02:00
Martin Weinelt
35a73717df
Merge pull request #218599 from Izorkin/update-peertube
peertube: 5.0.0 -> 5.1.0
2023-05-09 14:37:44 +02:00
ajs124
ae9c464f31
Merge pull request #230822 from helsinki-systems/fix/mariadb-i686-tests
nixos/mariadb: Fix test on i686
2023-05-09 13:16:39 +02:00
Jacek Galowicz
b7dfa5082a
Merge pull request #228220 from R-VdP/test_driver_guest_shell_timeout
nixos-test-driver: include a timeout for the recv call, do not assume sh == bash
2023-05-09 13:05:28 +02:00
s1341
20d707c8c4 nixos/test/sssd-ldap: make tests actually check login, password change 2023-05-09 13:46:17 +03:00
s1341
e2d538fead pam: remove unused try_first_pass 2023-05-09 13:45:15 +03:00
s1341
765ae4d581 nixos/pam: allow changing password using sssd 2023-05-09 13:43:06 +03:00
Florian Klink
6c9bef6b0f
Merge pull request #230777 from nikstur/systemd-repart-definitions-in-initrd
systemd-repart definitions in initrd
2023-05-09 13:24:04 +03:00
Sandro
443a8f398a
Merge pull request #230756 from NixOS/fzf-fix 2023-05-09 11:54:38 +02:00
pennae
5f5b5a76b9 nixos/mosquitto: use networkd for tests
the non-networkd backend does not wait for slaac to finish (ie, ipv6
addresses coming out of tentative state), and that breaks the mosquitto
bind_interface test slightly. if slaac takes too long the test will run
into mosquitto restart limits and fail.
2023-05-09 11:41:17 +02:00
Janne Heß
20e186b7e2
nixos/mariadb: Fix test on i686
RocksDB is not built on that platform and the .so is missing
2023-05-09 09:15:52 +02:00
github-actions[bot]
b872b6b45c
Merge staging-next into staging 2023-05-09 06:01:52 +00:00
lom
ea1cef8c00 ArchiSteamFarm.ui: use buildNpmPackage 2023-05-08 20:34:21 -04:00
Aaron Andersen
cf0327810b
Merge pull request #207093 from ymarkus/alertmanager
nixos/alertmanager: add checkConfig option
2023-05-08 20:15:17 -04:00
github-actions[bot]
5b562cf621
Merge staging-next into staging 2023-05-09 00:02:44 +00:00
nikstur
d85abd2764 nixos/systemd-repart: definition files in initrd
Store the definition files in the initrd instead of reading them from
the Nix store in /sysroot.

This way, the initrd has to be re-generated every time the definition
files change. When the path to the defintion files instead of the
definition files themselves are embedded in the initrd, however, the
initrd also has to be re-generated every time. In this regard, this
change does not improve the status quo.

However, now systemd-repart also works reliable when the Nix store is
mounted separately from the root partition.

This change also enables new use-cases like creating partitions
necessary to boot the system. However, by default, the root partition
cannot be created on first boot because the systemd-repart service
requires a /sysroot to be mounted. Otherwise, systemd-repart cannot
determine the device to operate on.
2023-05-09 00:11:21 +02:00
nikstur
5c2a7490cf nixos/systemd-repart: fix
Since v253, systemd-repart tries to create temporary directories in
/var/tmp. However, this directory doesn't exist in the initrd. This
commit adds an enviroment variable to re-use the existing /tmp directory
instead of /var/tmp.
2023-05-08 23:12:59 +02:00
Izorkin
1afcb4c6ef
nixos/peertube: update nginx configuration 2023-05-08 23:49:03 +03:00
Izorkin
8d76c0b6fb
peertube: 5.0.0 -> 5.1.0 2023-05-08 23:48:32 +03:00
Ryan Lahfa
43a413de73
Merge pull request #230731 from NixOS/bump/netdata
netdata: 1.38.1 -> 1.39.0
2023-05-08 21:59:56 +02:00
Sandro Jäckel
edf57fef9b
nixos/fzf: fix evaluation if ohMyZsh is enabled 2023-05-08 21:10:28 +02:00
github-actions[bot]
54295bf976
Merge staging-next into staging 2023-05-08 18:02:09 +00:00
Raito Bezarius
16658f7634 nixos/netdata: introduce deadlineBeforeStopSec
Previously, we hardcoded a 60 second timer to stop netdata if we didn't have any answer back.
This is wrong and can cause data loss because the SIGTERM sent by systemd can sometimes be not honored.
Which in turn becomes a SIGKILL, causing potential data loss / corruption.

Offer a flag to users and bump the deadline to 2 minutes.
2023-05-08 19:29:13 +02:00
Ryan Lahfa
98167d573d
Merge pull request #229313 from mped-oticon/mped_proxmox_assert
nixos/proxmox-image: Disable O_DIRECT to fix assert when writing to tmpfs
2023-05-08 16:11:40 +02:00
Atemu
cb0f64e45d
Merge pull request #230665 from alyssais/iso-image-targetPlatform
nixos/iso-image: targetPlatform -> hostPlatform
2023-05-08 15:06:48 +02:00
Alyssa Ross
ecc1ec2c72 llvmPackages_latest: move to aliases.nix
Because llvmPackages_latest is used in Nixpkgs, by quite a few
packages, it's difficult to keep it up to date, because updating it
requires some level of confidence that every package that uses it is
going to keep working after the update.  The result of this is that
llvmPackages_latest is not updated, and so we end up in the situation
that "latest" is two versions older than the latest version we
actually provide.  This is confusing and unexpected.

"But won't this end up fragmenting our LLVM versions, if every package
previously using _latest is separately pinned to LLVM 14?", I hear you
ask.  No.  That fragmentation is already happening, even with an
llvmPackages_latest, because packages that actually require the
_latest_ version of LLVM (15/16), have already been decoupled from
llvmPackages_latest since it hasn't been upgraded.  So like it or not,
we can't escape packages depending on specific recent LLVMs.  The only
real fix is to get better at keeping the default LLVM up to
date (which I'm reasonably confident we're getting into a better
position to be feasibly better able to do).

So, unless we want to double down on providing a confusingly named
"llvmPackages_latest" attribute that refers to some arbitrary LLVM
version that's probably not the latest one (or even the latest one
available in Nixpkgs), we only have two options here: either we don't
provide such an attribute at all, or we don't use it in Nixpkgs so we
don't become scared to bump it as soon as we have a new LLVM available.
2023-05-08 13:05:33 +00:00
Weijia Wang
6a139314d8
Merge pull request #230653 from wineee/nixos/release.nix
nixos/release: add deepin closure
2023-05-08 15:47:47 +03:00
Nick Cao
aa7197b091
Merge pull request #230539 from OPNA2608/update/miriway
miriway: unstable-2023-03-17 -> unstable-2023-04-25
2023-05-08 20:27:47 +08:00
Alyssa Ross
bf7de549b9
nixos/iso-image: targetPlatform -> hostPlatform
This is not a compiler, and therefore does not need to care about the
target platform.
2023-05-08 11:50:06 +00:00
Mark Ruvald Pedersen
66fb2f539a nixos/proxmox-image: Disable O_DIRECT to fix assert
Context summary:
'vma create' can't otherwise write to tmpfs such as /dev/shm.
This is important when used from non-nixos machines which may
have /build as tmpfs.

VMA is Proxmox's virtual machine image format that wraps QEMU images,
augmenting these with proxmox-specific configuration file.
proxmox-image.nix uses the VMA tool to create vma image files.
The VMA tool exists as a patchset ontop of QEMU.

VMA writes its output with open() and O_DIRECT flag.
O_DIRECT does not work on Linux tmpfs [1]. Thus:
$ vma create ~/output.vma ...  # works, assuming home isn't tmpfs.
$ vma create /dev/shm/output.vma ...  # fails since /dev/shm is tmpfs
Failure results in assert(*errp == NULL).

O_DIRECT is a cache performance hint.
But it currently blocks our usage of nixos-generate -f proxmox from
Non-NixOS hosts and Docker.

The patch here simply removes O_DIRECT:
vma-writer.c later performs memalign due to O_DIRECT, but this is
safe to do with or without O_DIRECT.
Ideally, this should be fixed in upstream Proxmox: Perhaps by falling
back to open without O_DIRECT.

Another attempt to fix this SIGABRT is [2], which writes the vma file
directory to $out/ folder -- however that may still be tmpfs mounted
which it is in our case.

[1] https://lore.kernel.org/lkml/45A29EC2.8020502@tmr.com/t/
[2] https://github.com/NixOS/nixpkgs/pull/224282
2023-05-08 12:33:41 +02:00
rewine
82c778627d
nixos/release: add deepin closure 2023-05-08 18:25:41 +08:00
Jörg Thalheim
3288479636 nixos/envfs: make mounts non-critical
We usually don't want to bring the whole machine into emergency mode
just because we couldn't mount envfs. It's usually not on the critical
path.
2023-05-08 11:24:18 +02:00
github-actions[bot]
4532c723ec
Merge staging-next into staging 2023-05-08 00:02:49 +00:00
Sandro
6197953fb6
Merge pull request #207106 from autrimpo/gonic-module
nixos/gonic: init
2023-05-08 01:28:24 +02:00
Michal Koutenský
8118e3de43 nixos/gonic: init 2023-05-07 22:43:23 +02:00
Ilan Joselevich
6a751fe806
Merge pull request #227765 from zhaofengli/darling
darling: init at unstable-2023-05-02
2023-05-07 22:29:02 +03:00
github-actions[bot]
048e91e57b
Merge staging-next into staging 2023-05-07 18:01:53 +00:00
Bernardo Meurer
3cf3f4395a
Merge pull request #230449 from lovesegfault/mainsail-module 2023-05-07 11:49:59 -04:00
Mikaela Allan
445d7cae2a
nixos/config/swap: refactor startup script generation 2023-05-07 11:42:36 -04:00
OPNA2608
fc3c5947a9 nixos/miriway: Adjust default and example config
The keybinds for the WM's internal commands have been made configurable.
2023-05-07 17:32:20 +02:00
github-actions[bot]
7b8084a6b9
Merge staging-next into staging 2023-05-07 12:02:13 +00:00
Martin Weinelt
cd0f4fc67c
Merge pull request #230256 from lovesegfault/systemd-can
nixos/networkd: add TransmitQueues and TransmitQueueLength
2023-05-07 11:53:35 +02:00
Naïm Favier
0767f800e0
Merge pull request #224688 from Izorkin/add-nginx-upstream-timeout
nixos/nginx: allow arbitrary parameters in upstream servers
2023-05-07 11:43:39 +02:00
Izorkin
2809915f19
nixos/nginx: allow arbitrary parameters in upstream servers
Adds a `freeformType` to `services.nginx.upstreams.<name>.servers` to
allow setting arbitrary parameters.
2023-05-07 11:17:49 +02:00
Bernardo Meurer
4804f7a09b
nixos/mainsail: init 2023-05-07 01:41:03 -04:00
Zhaofeng Li
4b8e060167 nixos/tests/darling: init 2023-05-06 22:49:35 -06:00
Zhaofeng Li
1e39c977f7 nixos/darling: init 2023-05-06 22:49:35 -06:00
Bernardo Meurer
aa8eff129d
nixos/networkd: add TransmitQueues and TransmitQueueLength
These are relevant when using networkd to configure CAN networks

Co-authored-by: Martin Weinelt <mweinelt@users.noreply.github.com>
2023-05-06 21:55:09 -04:00
wrvsrx
cc41b47c6f
nixos/lib: hash triggers after converting them to string in systemd-lib
This change is made for two reasons:

1.  If `toString config.restartTriggers` containes `\n`, systemd unit
    file will be ill-formed.
2.  This change can limit length of the trigger, although it doesn't
    matter in most cases.
2023-05-07 09:04:18 +08:00
github-actions[bot]
a0eb573683
Merge staging-next into staging 2023-05-07 00:03:11 +00:00
Vladimír Čunát
e700696f49
Merge #230386: Revert "nixos/qemu-vm: fix diskless VMs" 2023-05-06 22:00:39 +02:00
Martin Weinelt
f4ca022023
Merge pull request #229999 from ambroisie/update-tandoor-recipes
tandoor-recipes: 1.4.4 -> 1.4.9
2023-05-06 21:58:04 +02:00
Vladimír Čunát
5674901601
Revert "nixos/qemu-vm: fix diskless VMs" 2023-05-06 21:41:14 +02:00
Jonas Chevalier
d3ff0e4114
Merge pull request #229111 from zimbatm/cloud-init-settings
cloud-init module: adopt the settings format
2023-05-06 21:34:11 +02:00
Sandro
6a8a43e5f2
Merge pull request #225341 from SuperSandro2000/ohmyzsh-fzf
nixos/fzf: add ohMyZsh integration
2023-05-06 21:24:15 +02:00
Robert Hensing
216315c6c4
Merge pull request #197547 from hercules-ci/module-class-and-flake-import
module system: Improve error messages around faulty imports
2023-05-06 20:16:34 +02:00
github-actions[bot]
1edcdf34e3
Merge staging-next into staging 2023-05-06 18:01:44 +00:00
Gabriel Fontes
16b3b0c53b nixos/tests/kavita: init 2023-05-06 13:57:53 -03:00
Gabriel Fontes
e2854d332d nixos/kavita: init 2023-05-06 13:57:53 -03:00
Robert Hensing
8054785157 lib/modules: Move class out of specialArgs 2023-05-06 18:32:58 +02:00
Robert Hensing
79703eef08 nixos,nixpkgs: Add module classes
This allows modules that declare their class to be checked.
While that's not most user modules, frameworks can take advantage
of this by setting declaring the module class for their users.
That way, the mistake of importing a module into the wrong hierarchy
can be reported more clearly in some cases.
2023-05-06 18:29:04 +02:00
Robert Scott
3d40c1b0e9
Merge pull request #229458 from martinetd/libbpf
libbpf: upgrade to 1.2.0
2023-05-06 16:39:29 +01:00
Martin Weinelt
1c963cea48
nixos/gitea-actions-runner: init 2023-05-06 17:34:15 +02:00
Rick van Schijndel
5e2d479540
Merge pull request #229874 from mcnesium/fix_ambig_char
fix ambiguous unicode characters
2023-05-06 16:54:54 +02:00
Bruno BELANYI
9650310348 nixos/tandoor-recipes: disable debug toolbar 2023-05-06 14:22:17 +01:00
github-actions[bot]
76e7973d1c
Merge staging-next into staging 2023-05-06 00:02:57 +00:00
Weijia Wang
3fdc233395
Merge pull request #230189 from nikstur/systemd-repart-release-note
nixos/release-notes: add systemd-repart
2023-05-06 01:06:25 +03:00
Dominique Martinet
5e8a27296b nixosTests.bpf: disable kfunc test on aarch64
commit fd5d7b2586 ("tests/bpf: add module BTF test") added a new test
for module BTF, but that test does not work on aarch64. (merged in
https://github.com/NixOS/nixpkgs/pull/214001 )

This is not a regression (kfuncs didn't work on bpftrace 0.16,
even if you do not use features requiring BTF like argument name
or type), so just disable the test on aarch64 until it is fixed.
2023-05-06 06:40:30 +09:00
nikstur
c947bf5c0c nixos/release-notes: add systemd-repart 2023-05-05 22:45:44 +02:00
Pierre Bourdon
2ddbabec4d
nixos/xserver: fix xserver.conf reproducibility (sort ModulePath entries) 2023-05-05 22:33:09 +02:00
Ryan Lahfa
0b0c5fdf95
Merge pull request #230027 from jmbaur/fix-cross-nixos-system
nixos/bootspec: Fix cross for nixos-system systemBuilder
2023-05-05 22:05:44 +02:00
Ryan Lahfa
32264d614a
Merge pull request #227696 from aktaboot/fix-install-tools-deps
nixos/installer: fix util-linux dependencies in install script
2023-05-05 21:58:23 +02:00
github-actions[bot]
cfd87655c8
Merge staging-next into staging 2023-05-05 18:01:52 +00:00
Mikaela Allan
21b6bec0ff
nixos/config/swap: improve randomEncrytion
* add sector size parameter to swap randomEncryption
  * add key size parameter to swap randomEncryption
  * allow deviceName to be overridden for encrypted swap
  * create test for swap random encryption
  * update release notes
2023-05-05 13:36:42 -04:00
aktaboot
b3ef821489 nixos/installer: fix util-linux dependencies in install scripts 2023-05-05 18:11:57 +02:00
Ryan Lahfa
275a6e3d8d
Merge pull request #193469 from minijackson/mount-options-stage-1
nixos/stage-1: follow mount options
2023-05-05 17:05:48 +02:00
Ryan Lahfa
1ab4d7d0c3
Merge pull request #228047 from RaitoBezarius/diskless-vm
nixos/qemu-vm: fix diskless VMs
2023-05-05 15:37:11 +02:00
Emily Lange
549bee9851
nixos/grafana-agent: add extraFlags option (#228883) 2023-05-05 15:14:41 +02:00
github-actions[bot]
2181c1e956
Merge staging-next into staging 2023-05-05 12:02:09 +00:00
Jacek Galowicz
3ba45b082e
Merge pull request #228111 from alyssais/nixosTest-hostname
nixosTest: remove hostname limitations
2023-05-05 08:12:36 +02:00
Jared Baur
67561dcc59
nixos/bootspec: Fix cross for nixos-system systemBuilder
When `nixpkgs.hostPlatform` != `nixpkgs.buildPlatform`, building the
top-level attribute fails since the bootspec portion of the system
builder tries to reference the host platform's `jq`. Change this to
reference the build platform's `jq`.
2023-05-04 20:09:16 -07:00
github-actions[bot]
1b8f2397cf
Merge staging-next into staging 2023-05-05 00:02:42 +00:00
Sandro
3971f4c98c
Merge pull request #226652 from totoroot/remove-qlandkartegt
qlandkartegt: remove
2023-05-04 23:07:21 +02:00
K900
57ee58ca54
Merge pull request #229026 from SuperSandro2000/nox-pipewire
nixos/no-x-libs: add pipewire
2023-05-05 00:04:09 +03:00
Sandro Jäckel
1b6078a24a
nixos/no-x-libs: add pipewire 2023-05-04 23:03:06 +02:00
github-actions[bot]
1a2b84561d
Merge staging-next into staging 2023-05-04 18:01:54 +00:00
Jonas Chevalier
3d2bdd0788
python: implement PEP 668 (#229166)
Add a marker file to the python outputs that tells pip and other tooling
following PEP 668 that they should not be installing things system-wide.

This provides better feedback to the user and also potentially avoids issues in
single-user installs where the /nix/store is owned by the user.

For more details, see <https://peps.python.org/pep-0668/>

Here is how it currently looks like:

    $ pip install requests
    error: externally-managed-environment

    × This environment is externally managed
    ╰─> This command has been disabled as it tries to modify the immutable
        `/nix/store` filesystem.

        To use Python with Nix and nixpkgs, have a look at the online documentation:
        <https://nixos.org/manual/nixpkgs/stable/#python>.
2023-05-04 18:30:25 +02:00
Rene Hollander
a70c7aba36 nixos/networkd: Fix typo in usage sectionBridgeVLAN
The `B` in bridge should be capitalized.

It currently leads to an evuluation error: 
```
error: attribute 'sectionbridgeVLAN' missing

       at /nix/store/7wmrwj0sgwg1iivxk43lpkqjhji57mq7-source/nixos/modules/system/boot/networkd.nix:2386:56:

         2385|       example = { VLAN = "10-20"; };
         2386|       type = types.addCheck (types.attrsOf unitOption) check.network.sectionbridgeVLAN;
             |                                                        ^
         2387|       description = lib.mdDoc ''
       Did you mean sectionBridgeVLAN?
```
2023-05-04 16:20:56 +02:00
Martin Weinelt
12a2201d61
Merge pull request #229780 from NixOS/home-assistant
home-assistant: 2023.4.6 -> 2023.5.0
2023-05-04 15:43:40 +02:00
Weijia Wang
cddc413c66
Merge pull request #229845 from pitkling/fix/qemu-vm-escape-variable
virtualisation/qemu-vm: fix unescaped bash variable in shell script
2023-05-04 15:47:26 +03:00
mcnesium
36af786eda
fix ambiguous unicode characters 2023-05-04 12:54:56 +02:00
Jörg Thalheim
be8e3128b9
Merge pull request #223418 from Mic92/grub
nixos/grub-install: don't rely on shell to run commands
2023-05-04 09:48:41 +01:00
Peter Kling
996db6d059
virtualisation/qemu-vm: escape bash variable in shell script
Fixes #229729
2023-05-04 09:52:49 +02:00
Vladimír Čunát
fb91facda2
nixos/tests/installer.nix: add missing kbd.dev
Sometimes the tests fail since splitting kbd.dev in PR #226247
https://hydra.nixos.org/build/218620685/nixlog/2/tail
Apparently the failure isn't 100% reproducible; I don't know how/why.
2023-05-04 08:35:23 +02:00
Martin Weinelt
6d934088ea
nixos/home-assistant: update bluetooth components 2023-05-04 07:33:32 +02:00
Sandro Jäckel
da15c5054e
nixos/nextcloud-notify_push: add bendDomainToLocalhost 2023-05-03 22:41:23 +02:00
Sandro Jäckel
546d4d4b76
nixos/nextcloud: add configureRedis option 2023-05-03 22:40:41 +02:00
Matthias Thym
4138d6a449 qlandkartegt: remove 2023-05-03 21:58:12 +02:00
pennae
aad25290ee nixos/emacs: restore example markup
these examples were turned into untitle anchors previously because at
the time supporting examples was not deemed necessary or useful. now
that we have them we can restore them though.
2023-05-03 19:58:21 +02:00
pennae
407f6196a2 nixos-render-docs: add examples support
the nixos manual contains enough examples to support them as a proper
toc entity with specialized rendering, and if in the future the nixpkgs
wants to use nixos-render-docs we will definitely have to support them.
this also allows us to restore some examples that were lost in previous
translation steps because there were too few to add renderer support
back then.
2023-05-03 19:58:21 +02:00
Ryan Lahfa
da28a7a3d0
Merge pull request #228347 from NixOS/uefi-without-bootloaders
nixos/qemu-vm: make it possible to use UEFI without bootloaders
2023-05-03 17:08:47 +02:00
Weijia Wang
5d1f6e2d83
Merge pull request #229654 from onny/wordpress62
wordpress: 6.1.1 -> 6.2; wordpress6_2: init
2023-05-03 16:34:59 +03:00
Jonas Heinrich
9679582652 wordpress: 6.1.1 -> 6.2; wordpress6_2: init 2023-05-03 13:56:50 +02:00
Michael Livshin
11b851718e system76-scheduler: don't enable unconditionally
Oops :(
2023-05-03 10:34:32 +03:00
Izorkin
edb40b3e4f nixos/fail2ban: others small update 2023-05-03 08:45:26 +02:00
Izorkin
544ebba973 nixos/fail2ban: update bantime options 2023-05-03 08:45:26 +02:00
Raito Bezarius
6e8248c8b2 nixos/qemu-vm: make it possible to use UEFI without bootloaders
`useEFIBoot` is somewhat misleading, but we should make it possible to
enable UEFI environment / firmware without buying into a bootloader.

This makes it possible.
2023-05-02 23:20:03 +02:00
Bernardo Meurer
b04b3345f1
Merge pull request #195082 from cmm/system76-scheduler 2023-05-02 09:25:05 -07:00
Artturi
2d256ca7c2
Merge pull request #227499 from tollb/w20230421d_use_systemd_hwdb_to_build_udev_hwdb 2023-05-02 19:04:06 +03:00
Robert Hensing
c4793e85f1
Merge pull request #229427 from Mic92/hercules-ci-agent
nixos/hercules-ci-agent: increase stack limit
2023-05-02 13:42:42 +02:00
Michael Livshin
549fd53520 system76-scheduler: add config module 2023-05-02 13:43:36 +03:00
Martin Weinelt
826418fc35
Merge pull request #227990 from Mic92/mediawiki-webserver
nixos/mediawiki: make apache2 optional
2023-05-02 12:39:10 +02:00
Jörg Thalheim
301d6bb9c2 nixos/hercules-ci-agent: increase stack limit
see https://github.com/hercules-ci/hercules-ci-agent/pull/451 for context
2023-05-02 09:53:41 +02:00
Jonas Heinrich
d932d6929b
Merge pull request #227401 from onny/maddytls2
nixos/maddy: Add tls option
2023-05-02 07:32:56 +02:00
Sandro
7b02d16807
Merge pull request #227973 from tensor5/nixos/nextcloud--fix-notify_push-configuration-parse-error 2023-05-02 01:05:02 +02:00
figsoda
ed153ccbfd
Merge pull request #229209 from Misterio77/navidrome-cfg-package
nixos/navidrome: add package option
2023-05-01 18:31:34 -04:00
Gabriel Fontes
1c3c2c8203
nixos/navidrome: add package option 2023-05-01 16:29:17 -03:00
Jörg Thalheim
077e950f7a nixos/mediawiki: also test fcgi socket 2023-05-01 20:51:11 +02:00
Jörg Thalheim
d309952a5d nixos/mediawiki: make apache optional 2023-05-01 20:51:11 +02:00
Jonas Heinrich
fcf6662fb5
Merge pull request #229159 from Misterio77/refactor-nextcloud-createlocally
nixos/nextcloud: refactor database.createLocally
2023-05-01 20:04:20 +02:00
Jonas Heinrich
616ba4ae5c nixos/maddy: Add tls option 2023-05-01 19:12:26 +02:00
Gabriel Fontes
fddf531c6f
nixos/nextcloud: refactor database.createLocally
Fixes https://github.com/NixOS/nixpkgs/issues/228971
2023-05-01 12:20:40 -03:00
Matthieu Coudron
7fe4909bee
services.datadog: remove python2 from systemd service (#228312)
which caused a security warning. seems to work without it so let's ditch it
2023-05-01 16:37:34 +02:00
Nick Cao
cb6c1de07d
Merge pull request #229138 from exzombie/fix/fstrim-interval
nixos/fstrim: fix overriding the timer interval
2023-05-01 17:23:36 +08:00
Vladimír Čunát
8663481786
Merge #228476: staging-next 2023-04-27 2023-05-01 11:20:22 +02:00
K900
5c95114a2f
Merge pull request #228951 from aacebedo/aacebedo/asusctl_4.6.2
asusctl: 4.5.8 -> 4.6.2
2023-05-01 12:08:37 +03:00
Alexandre Acebedo
576d7d34c4 asusctl: 4.5.8 -> 4.6.2 2023-05-01 11:07:39 +02:00
Weijia Wang
cdefca3d7a nixos/release-notes: fix typo 2023-05-01 14:21:01 +08:00
github-actions[bot]
7e5a4795a7
Merge master into staging-next 2023-05-01 06:01:42 +00:00
Weijia Wang
b87aa62298
Merge pull request #227936 from wineee/dde
nixos/deepin: init
2023-05-01 08:38:45 +03:00
github-actions[bot]
2b265000ed
Merge master into staging-next 2023-04-30 18:01:17 +00:00
Kira Bruneau
50200de3f4
Merge pull request #216230 from tcheronneau/master
nixos/{consul-template,vault-agent}: init
2023-04-30 13:53:57 -04:00
gaykitty
3056e9c395 nixos/stargazer: remove with lib 2023-04-30 13:05:34 -03:00
gaykitty
d4f3dd4f71 nixos/stargazer: fix route ordering 2023-04-30 13:05:34 -03:00
Jure Varlec
44438e0dcd nixos/fstrim: fix overriding the timer interval
The OnCalendar systemd setting is additive. To clear the setting defined
by the pre-existing unit file, it has to be set first to an empty
string, then to the desired value.
2023-04-30 17:36:49 +02:00
zimbatm
406a6dfa26 cloud-init module: adopt the settings format
This makes it easier to for example set `datasource_list = [ "Vultr" ];`
so that cloud-init doesn't scan trough all of the datasources when you
know on which target the system is going to be deployed.

Previously, one had to copy-paste the default config and adapt it.
2023-04-30 15:08:10 +02:00
zimbatm
4a1fd4afe0 cloud-init module: remove superfluous lib. prefixes 2023-04-30 14:59:16 +02:00
zimbatm
de8b1cf647 cloud-init module: format with nixpkgs-fmt 2023-04-30 14:58:29 +02:00
Nick Cao
1acfbbb2e7
Merge pull request #125865 from eliasp/restic-private-tmp
nixos/restic: use private tmp for service unit
2023-04-30 20:37:07 +08:00
github-actions[bot]
5122e188ab
Merge master into staging-next 2023-04-30 12:01:35 +00:00
Ilan Joselevich
a36b310b7a
Merge pull request #228858 from m-bdf/hyprland-xwayland-conditional-default
nixos/hyprland: conditionally enable Xwayland
2023-04-30 13:21:53 +03:00
Maximilian Bosch
5c9977a524
Merge pull request #224891 from KFearsoff/fix-grafana-assertions-in-yaml
nixos/grafana: fix assertions leaking into YAML
2023-04-30 11:39:48 +02:00
Elias Probst
3bd1c64a5b
nixos/restic: use private tmp for service unit
To reduce the danger of accidentally exposing sensitive files processed
by a restic backup to other services/users, enable the `PrivateTmp=`
feature of restic service units, which provides a per service isolation
of `/tmp` and `/var/tmp`.

Co-authored-by: Daniel Nagy <danielnagy@posteo.de>
2023-04-30 10:39:29 +02:00