mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 19:51:17 +00:00
Code Issues Wiki Activity
627721 commits 271 branches 124 tags 6.1 GiB
Commit graph

8239 commits

Author SHA1 Message Date
Bobby Rong a6ada0502b
nixos/pantheon: Don't enable modules for excludePackages 
ref: bc970e94e7
ref: nixpkgs issue 299877

While at it, also enable flatpak in nixosTests.pantheon so we ensure appcenter builds.
 2024-04-10 21:27:31 +08:00
Bobby Rong 14c7a500c0
nixos/cinnamon: Don't enable modules for excludePackages 
ref: bc970e94e7
ref: nixpkgs issue 299877
 2024-04-10 21:14:43 +08:00
tcmal d598b5d88d nixos/akkoma: check that upload and media proxy base url is specified 
new versions of akkoma require the upload base url to be specified in
order for updates to work properly.
this will be a breaking change in 24.05, but for now a reasonable
default is set.
 2024-04-09 13:58:03 +01:00
Sandro 4cc6ce454d
Merge pull request #291913 from SuperSandro2000/sddm-wayland-only 2024-04-09 14:31:12 +02:00
Robert Schütz 0dca19054c
Merge pull request #302389 from SuperSandro2000/vaultwarden-webvault 
vaultwarden.webvault: 2024.3.0 -> 2024.3.1
 2024-04-09 03:49:54 +00:00
Sandro Jäckel b6e0c42bc2
tests/vaultwarden: adjust to changes in frontend 2024-04-09 00:05:35 +02:00
Sandro Jäckel 476b8c276e
treewide: rename renamed sddm/displayManager settings 2024-04-08 21:56:38 +02:00
Sandro b32f206faa
Merge pull request #258520 from Benjamin-L/soju-admin-socket 2024-04-08 10:20:31 +02:00
Robert Hensing c740c98fc1
Merge pull request #292760 from PigeonF/dockertools-build-layered-compressor 
dockerTools: Fix changing compression method for `buildLayeredImage`
 2024-04-08 09:24:18 +02:00
Weijia Wang d217732cef
Merge pull request #302195 from anthonyroussel/fix-oddjobd 
nixos/oddjobd: enable dbus service to fix service startup
 2024-04-07 22:52:46 +02:00
Julien Malka 668834f72c
Merge pull request #295736 from mjm/bcachefs-clevis-systemd 2024-04-07 22:51:56 +02:00
Benjamin Lee e9fed4bcad
nixos/soju: add tests 
For now, just try creating a user with sojuctl. Actually connecting an
irc client is pretty annoying.
 2024-04-07 13:45:47 -07:00
Anthony Roussel b0f78fba37
nixosTests.oddjobd: init 2024-04-07 20:29:21 +02:00
Kira Bruneau f0034ee975
Merge pull request #297517 from kira-bruneau/nixos-containers 
nixos/nixos-containers: require mounts for bind mount host paths
 2024-04-06 18:07:45 -04:00
K900 2975aecbcb nixos/tests/switch-test: s/dbus.service/dbus-broker.service/g 
Fixes the test after the default DBus implementation change.
 2024-04-06 23:21:06 +03:00
Julien Malka 5afb7f3528 nixos/tests: add clevisBcachefs tests to installer-systemd-stage-1 tests 2024-04-05 15:25:01 +00:00
Kerstin 89000ace32
Merge pull request #299460 from linyinfeng/hledger-web 
nixos/hledger-web: fix access control option
 2024-04-05 17:04:47 +02:00
Bobby Rong 29f96f114b
Merge pull request #301847 from bobby285271/upd/pantheon 
pantheon.gala: Fix missing URI handler
 2024-04-05 22:53:24 +08:00
Bobby Rong bd3f680d37
pantheon.gala: Backport Wayland menu commit 
gala-daemon actually needs a correct environment for `AppInfo.launch_default_for_uri`.
 2024-04-05 21:23:11 +08:00
Ryan Lahfa 99ca8d4ea5
Merge pull request #300757 from K900/installer-tests-unfucking 
nixos/tests/installer: spring cleaning
 2024-04-05 03:50:39 -07:00
K900 15d95c7b74 nixos/qemu-vm: split up the "keep EFI variables from system image" logic 2024-04-05 09:00:12 +03:00
Weijia Wang c821c015c5
Merge pull request #291346 from aorith/init-silverbullet 
silverbullet: init at 0.7.6
 2024-04-05 06:31:50 +02:00
Kira Bruneau 7f3643bef6 nixos/nixos-containers: require mounts for bind mount host paths 
Fixes starting containers before bind mount host paths are mounted
 2024-04-04 19:48:15 -04:00
Kevin Cox 9c636e8416
Merge pull request #296718 from Rutherther/mautrix-meta-init 
mautrix-meta: init at 0.2.0
 2024-04-04 18:07:19 -04:00
K900 6f139367a3
Merge pull request #301617 from K900/kernels-20240404 
Kernel updates for 2024-04-04
 2024-04-04 23:40:39 +03:00
K900 b71cc870b6 linux_6_7: drop 2024-04-04 22:45:46 +03:00
Pol Dellaiera 53e51b19d4
Merge pull request #298742 from FabianRig/technitium-dns-server-module 
nixos/technitium-dns-server: init module
 2024-04-04 21:43:08 +02:00
Emily 053ab7f57c
Merge pull request #300981 from emilylange/forgejo-ldflags 
forgejo: add missing internal version ldflags, nixosTests.forgejo: test /api/forgejo/v1/version
 2024-04-04 21:31:02 +02:00
Florian Klink 1fb00f1396 mycelium: 0.4.5 -> 0.5.0 
Changed
 - Connection identifier is now included in the error log if we can't forward a
 - seqno request.
 - Garbage collection time for source entries has been increased from 5 to 30 minutes
 - for now.
 - The router implementation has been changed to use regular locks instead of an
 - always readable concurrency primitive for all but the actual routing table. This
 - should reduce the memory consumption a bit.
 - Public key and shared secret for a destination are now saved on the router, instead
 - of maintaining a separate mapping for them. This slightly reduces memory consumption
 - of the router, and ensures stale data is properly cleaned up when all routes to
 - a subnet are removed.
 - Hello packets now set the interval in which the next Hello will be sent properly
 - in centiseconds.
 - IHU packets now set the interval properly in centiseconds.
 - IHU packets now set an RX cost. For now this is the link cost, in the future
 - this will be set properly.
 - Route expiration time is now calculated from the interval received in updates.
 - Ip address derivation from public keys now uses the blake3 hash algorithm.

Fixed
 - Don't try to forward seqno requests to a peer if we know its connection is dead.
 2024-04-04 12:44:23 +03:00
Wolfgang Walther 67510f6baa
nixosTests.postgresql-wal-receiver: remove left-over v12 conditionals 
We don't have postgresql < 12 in nixpkgs anymore.
 2024-04-04 08:41:19 +02:00
Wolfgang Walther aea4ba847a
postgresql: remove thisAttr argument by calling tests directly 
Previously, it was not possible to run tests on an overridden derivation, because
the derivation under test was always pulled from pkgs.

With this change, the following will return the same test:

  postgresql_jit.tests

and

  (postgresql.override { jitSupport = true; }).tests
 2024-04-04 08:41:17 +02:00
Pol Dellaiera e7cc626902
nixos/modules: add technitium-dns-server tests 2024-04-04 08:35:07 +02:00
Christian Kögler 29b575a0e8
Merge pull request #300728 from ck3d/nixos-test-machinectl-import-tar 
nixos/test/machinectl: Add import-tar test
 2024-04-03 22:58:06 +02:00
Rick van Schijndel 2600c7f38c
Merge pull request #297392 from Mindavi/hydra/2024-03-08 
hydra_unstable: 2023-12-24 -> 2024-03-08, use nix_2_20
 2024-04-03 20:59:45 +02:00
K900 7b602cff5c nixos/tests/installer: avoid create_machine, clean up 
- use normal VM nodes for target, with some extra trickery
- rename preBootCommands to postBootCommands to match its actual intent
- rename VMs to installer and target, so they're not all called machine
- set platforms on non-UEFI tests properly
- add missing packages for systemd-boot test
- fix initrd secrets leaking into the store and having wrong paths
 2024-04-03 16:16:11 +03:00
Pol Dellaiera f4255ff98d
Merge pull request #296679 from bhankas/ocis 
ocis-bin: init at 5.0.0
 2024-04-02 23:23:36 +02:00
Payas Relekar 427bf67bed nixos/ocis: init at 5.0.0 
Co-authored-by: Casey Link <unnamedrambler@gmail.com>
 2024-04-03 00:53:24 +05:30
Rutherther 5effc7956a mautrix-meta: init service 
Acked-by: Rutherther <rutherther@proton.me>
 2024-04-02 19:16:45 +02:00
emilylange 680bc07727
nixosTests.forgejo: test /api/forgejo/v1/version 
We forgot to set two version related ldflags in our packaging and this
should prevent this from going unnoticed again.

Further details are in dab7aa20ed.
 2024-04-02 17:04:29 +02:00
Aaron Andersen 46bcc66f01
Merge pull request #300805 from felixsinger/pkgs/redmine/fix-assertion 
nixos/redmine: Fix broken assertion when SQLite is used
 2024-04-02 11:37:39 +00:00
Yureka cfbde8ec8d nixos/tests/gitlab: reduce memory usage 
Co-Authored-By: Yaya <github@uwu.is>
 2024-04-02 07:30:12 +02:00
Janik H. 080c08d3c1
nixosTests.networking: split router into a separate file and remove with lib; antipattern 
this commit also does a tiny bit more, namely:
- removing unnecessary ping's to the hosts own ip
- and simplifying a few pieces of code like changing `{ inherit (pkgs) lib pkgs; };` to `{ inherit lib pkgs; };`
 2024-04-02 02:33:48 +02:00
Mario Rodas 5b3704b4d3
Merge pull request #296616 from Ma27/postgresql-rfc42-submodule 
nixos/postgresql: turn `settings` into a submodule
 2024-04-01 18:26:51 -05:00
Felix Singer 7245e78e2d nixos/tests/redmine: Add test case for SQLite backend 
Suggested-by: Zebreus <lennart@zebre.us>
Signed-off-by: Felix Singer <felixsinger@posteo.net>
 2024-04-02 00:21:12 +02:00
Weijia Wang a5fcefa1ad
Merge pull request #292835 from sinavir/castopod2 
nixos/castopod: updated nixos test and module
 2024-04-01 20:27:49 +02:00
Christian Kögler ff16d4597f nixos/test/machinectl: set stateVersion 2024-04-01 20:09:11 +02:00
sinavir 301a66e8ea nixos/castopod: Increase test timeouts 2024-04-01 19:16:30 +02:00
Alexander Tomokhov 552043a34d nixos/castopod: fix startup, displaying images, uploads up to 500 MiB 
- new maxUploadSize option
- new dataDir option (with ReadWritePaths systemd support)
- admin page reports correct free disk space (instead of /nix/store)
- fix example configuration in documentation
- now podcast creation and file upload are tested during NixOS test
- move castopod from audio to web-apps folder
- verbose logging from the browser test
 2024-04-01 19:16:25 +02:00
Christian Kögler 20e50bbb92 nixos/tests/machinectl: add import-tar test 2024-04-01 17:57:30 +02:00
Christian Kögler aefaae0c9d nixos/tests/machinectl: auto-format test 2024-04-01 17:25:30 +02:00
Casey Link 17d73dc9a1
nixos/davis: init 2024-04-01 12:55:29 +02:00
Alyssa Ross e7de14ea98 nixosTests.kernel-rust.linux_testing: init for aarch64 
Older kernels do not support Rust on aarch64, so we have to move the
platform check from all-tests.nix into the test itself.
 2024-04-01 09:37:19 +02:00
Pablo Ovelleiro Corral 7f797a698f
wastebin: init at 2.4.3 (#287455) 
* wastebin: init at 2.4.3

* nixos/wastebin: init

Add module and test for wastebin
 2024-04-01 04:55:15 +04:00
Robert Schütz 8d6af72637 calendar-cli: add meta.mainProgram 2024-03-31 14:25:27 -07:00
Naïm Favier 92514e4863
Merge branch 'master' into haskell-updates 2024-03-31 10:23:44 +02:00
Lin Yinfeng 484c1c1ff8
nixos/hledger-web: fix access control options 2024-03-31 12:50:08 +08:00
Weijia Wang 93a725e1a5
Merge pull request #296361 from bhankas/workout-tracker 
workout-tracker: init at 0.10.5
 2024-03-31 04:50:58 +02:00
Morgan Helton dd2c6f1840 nixos/sunshine: init 2024-03-30 20:07:35 -05:00
Maximilian Bosch 5142b7afa8
nixos/postgresql: turn settings into a submodule 
The main idea behind that was to be able to do more sophisticated
merging for stuff that goes into `postgresql.conf`:
`shared_preload_libraries` is a comma-separated list in a `types.str`
and thus not mergeable. With this change, the option accepts both a
comma-separated string xor a list of strings.

This can be implemented rather quick using `coercedTo` +
freeform modules. The interface still behaves equally, but it allows to
merge declarations for this option together.

One side-effect was that I had to change the `attrsOf (oneOf ...)` part into
a submodule to allow declaring options for certain things. While at it,
I decided to move `log_line_prefix` and `port` into this structure as
well.
 2024-03-30 14:23:05 +01:00
github-actions[bot] 506e353092
Merge master into haskell-updates 2024-03-30 00:12:08 +00:00
Bobby Rong e96d5c13d0
Merge pull request #140429 from bobby285271/pantheon-systemd 
pantheon: manage user session with systemd
 2024-03-29 22:55:39 +08:00
ajs124 b2d16906b0
Merge pull request #260867 from helsinki-systems/upd/xfsprogs 
xfsprogs: 6.4.0 -> 6.6.0
 2024-03-29 14:00:29 +01:00
github-actions[bot] d48c2529ec
Merge master into haskell-updates 2024-03-29 00:12:42 +00:00
Robert Schütz 7cdbfcbbd2
Merge pull request #278981 from dotlambda/mollysocket-init 
mollysocket: init at 1.3.0, nixos/mollysocket: init
 2024-03-28 18:51:07 +00:00
Robert Hensing b40caf8c8a
Merge pull request #273769 from Izorkin/update-peertube 
peertube: 5.2.1 -> 6.0.3
 2024-03-28 19:40:42 +01:00
Thiago Kenji Okada 48f9437cd1
Merge pull request #263360 from duament/nixos-rebuild-pipe 
nixos-rebuild: use --pipe instead of --pty in systemd-run
 2024-03-28 18:25:08 +00:00
Robert Schütz 078994248a nixos/mollysocket: init 2024-03-28 09:55:10 -07:00
Payas Relekar 466b994af9 nixos/workout-tracker: init 2024-03-28 20:08:28 +05:30
github-actions[bot] 8de0afeb83
Merge master into haskell-updates 2024-03-28 00:12:55 +00:00
Jacob Moody d9039fcdd2 nixos/tests: readd builtins.currentSystem to make-test-python.nix 
There is more nuance in the  ways people expect to run tests,
as such this still has some breakage. Revert for now.
 2024-03-27 08:37:43 -05:00
Sandro f87c956ea7
Merge pull request #281236 from melvyn2/update-kavita 2024-03-27 11:17:39 +01:00
lassulus e91a1ad1e3
Merge pull request #298737 from MatthewCroughan/mc/scion-modules 
nixos/scion: init
 2024-03-27 10:15:37 +01:00
matthewcroughan 4d841207c5 nixos/tests/ustreamer: init 2024-03-27 06:35:55 +00:00
Yongun Seong 477dce3b9a
nixos/kavita: accept freeform settings, ensure locales in tests 2024-03-26 21:15:29 -07:00
github-actions[bot] 7f599f6511
Merge master into haskell-updates 2024-03-27 00:12:11 +00:00
matthewcroughan 99e488e2df nixos/scion: init 2024-03-26 15:54:09 +00:00
Adam C. Stephens d729632b6f
Merge pull request #297782 from adamcstephens/fix-linger 
nixos/users-groups: fix broken linger
 2024-03-26 09:48:05 -04:00
Mario Rodas 6adcdc8526
Merge pull request #298611 from anthonyroussel/update/goss 
goss: 0.4.4 -> 0.4.6
 2024-03-26 08:37:47 -05:00
github-actions[bot] 39a71cf239
Merge master into haskell-updates 2024-03-26 00:12:22 +00:00
Adam C. Stephens c9c612f159
Merge pull request #294548 from adamcstephens/incus/override 
incus: move wrapper to nixos module
 2024-03-25 16:40:14 -04:00
Adam C. Stephens 8893c5886a
Merge pull request #263404 from camillemndn/firefoxpwa 
firefoxpwa: init at 2.11.1
 2024-03-25 16:38:52 -04:00
j-k 88e7ad7c30
tracee: 0.13.1 -> 0.20.0 (#297661) 
Adjust the build process
Skip some integration tests I can't fix
 2024-03-25 19:01:56 +01:00
Anthony Roussel e994c804b6
nixosTests.goss: fix unstable test 2024-03-25 18:49:46 +01:00
Jörg Thalheim ea503179c5
Merge pull request #298607 from Mic92/nix-ld-rs 
nix-ld-rs: init at 2024-03-23
 2024-03-25 14:52:21 +01:00
superherointj 283fa362e6
Merge pull request #298481 from superherointj/k3s-nixos-tests-fix-maintainers 
k3s/nixos/tests: sync meta.maintainers to k3s package
 2024-03-25 08:33:36 -03:00
github-actions[bot] 3edac3b767
Merge master into haskell-updates 2024-03-25 00:13:28 +00:00
Weijia Wang ff41f7134d
Merge pull request #297262 from StillerHarpo/monetdb-nixos-test 
nixos/monetdb: Init nixos test
 2024-03-24 23:15:56 +01:00
paki23 c3a1620624
firefoxpwa: init at 2.11.1 
firefoxpwa: move to pkgs/by-name
 2024-03-24 18:02:25 -04:00
Sandro 60f419e047
Merge pull request #284626 from numinit/armagetronad-unstable-updates 
armagetronad.*: 0.2.9.1.1 -> 0.2.9.2.3
 2024-03-24 22:14:33 +01:00
Sandro 0e1cac923d
Merge pull request #286685 from max-niederman/photonvision 
photonvision: init at 2024.2.3
 2024-03-24 22:05:36 +01:00
Rick van Schijndel 838750a9fd
hydra_unstable: 2023-12-24 -> 2024-03-08, use nix_2_20 
Update tests according to ceff5c5cfe
 2024-03-24 20:40:01 +01:00
Jörg Thalheim 04ec4568c6 nix-ld-rs: init at 2024-03-23 2024-03-24 12:27:20 +01:00
github-actions[bot] 31a14cb69e
Merge master into haskell-updates 2024-03-24 00:14:19 +00:00
superherointj 56b4159e23 nixos/tests/k3s: sync meta.maintainers to k3s package 2024-03-23 19:55:00 -03:00
Soispha bc54360b99
nixos/tests: add redlib test using the libreddit module 2024-03-23 17:03:34 +01:00
Birk 6ed0323361
Merge branch 'master' into drbd-kernel-module 2024-03-23 15:11:41 +00:00
superherointj 7809138b7f nixos/tests/etcd: enable aarch64-linux 
* move etcd tests to it's own directory
 2024-03-23 06:13:41 -03:00
github-actions[bot] 39632d3d4c
Merge master into haskell-updates 2024-03-23 00:12:18 +00:00
Bobby Rong 5cf5dd0fb0
Merge pull request #297727 from bobby285271/upd/budgie-nemo-terminal 
nixos/budgie: Use gnome-terminal by default
 2024-03-22 13:20:40 +08:00
Adam Stephens 790fb86a7f
nixos/users-groups: move linger to oneshot and add nixos test 2024-03-21 19:51:05 -04:00
sternenseemann b4d48b0f9e Merge branch master into haskell-updates 2024-03-21 21:01:05 +01:00
Bobby Rong b79ac84d84
nixos/budgie: Use gnome-terminal by default 
- Both budgie-desktop-view and cinnamon-desktop defaults to gnome-terminal, there
  are no clear reason why we don't use the defaults here.
  The cinnamon-desktop org.cinnamon.desktop.default-applications.terminal schema
  is used in nemo for default emulator, since we use nemo by default this fixes nemo
  open in terminal entry without introducing another override.
- There are theming issues with Qogir when opening right-click menu in a second tab.
- Transparency is broken when hovering on other windows, showing only the wallpaper.

This also ensures a stable default for budgie-desktop-view, by using only the
executable name and not a nix store path.

ref: https://github.com/BuddiesOfBudgie/budgie-desktop-view/blob/v1.3/data/org.buddiesofbudgie.budgie-desktop-view.gschema.xml#L60
ref: https://github.com/linuxmint/cinnamon-desktop/blob/6.0.0/schemas/org.cinnamon.desktop.default-applications.gschema.xml.in#L46
ref: https://github.com/linuxmint/nemo/blob/6.0.0/src/nemo-view.c#L7193
 2024-03-21 22:16:25 +08:00
Martin Weinelt 3b7d9c77b3
Merge pull request #297622 from mweinelt/kea-exporter-0.7.0 
kea-exporter: 0.6.1 -> 0.7.0
 2024-03-21 14:29:42 +01:00
Stig 468417b7f3
Merge pull request #296479 from marcusramberg/marcus/nimdow 
nixos/nimdow: module updates
 2024-03-21 12:14:56 +01:00
Doron Behar 2897be360b
Merge pull request #287966 from Guanran928/clash-meta 
nixos/mihomo: init
 2024-03-21 10:40:10 +02:00
Martin Weinelt e4f6d1a618
nixos/tests/kea: test ctrl-agent via kea-exporter 2024-03-21 06:17:59 +01:00
Martin Weinelt 5b97e8d76d
nixos/tests/prometheus-exporters/kea: remove 
The test framework for exporters is too limited to do sensible testing
of this exporter.
 2024-03-21 06:17:59 +01:00
Morgan Jones 4fb4d7a3b4
nixos/tests/armagetronad: fix test runner 2024-03-20 19:45:36 -07:00
github-actions[bot] 2015f3cc71
Merge master into haskell-updates 2024-03-21 00:13:28 +00:00
Sandro 5d59704211
Merge pull request #295387 from majiru/drawterm-update 2024-03-20 17:19:26 +01:00
Florian Klink 40e49b40ab
Merge pull request #296949 from NixOS/mycelium_service 
nixos/mycelium: init
 2024-03-20 11:50:46 +02:00
lassulus 0f0aaa517c nixos/tests/mycelium: init 2024-03-20 03:56:59 +01:00
Adam Stephens deb5be50c4
incus: move wrapper to nixos module 2024-03-19 22:48:07 -04:00
Jacob Moody e4789ca32a drawterm: unstable-2024-02-18 -> unstable-2024-03-20 2024-03-19 20:18:57 -05:00
github-actions[bot] 05f9a72c0e
Merge master into haskell-updates 2024-03-20 00:12:21 +00:00
Florian Engel 1cd1834ec0
nixos/monetdb: Init nixos test 2024-03-19 21:54:05 +01:00
Bobby Rong a5bee07d3f
Merge pull request #297208 from bobby285271/fix/budgie-test 
nixosTests.budgie: Split run dialog subtest
 2024-03-20 00:28:10 +08:00
Bobby Rong b5f838a2ca
nixosTests.budgie: Split run dialog subtest 
The original b-c-c subtest is probably flaky, as I didn't actually ensure
the inputbox focused before typing. Instead of another hacky xdotool,
split the run dialog subtest out.

https://hydra.nixos.org/build/253473303/nixlog/37
 2024-03-19 23:59:56 +08:00
Andrew Kaster b467733c33 ladybird: unstable-2023-01-17 -> 0-unstable-2024-03-16 2024-03-19 12:39:07 +01:00
Someone 63709965b7
Merge pull request #178717 from ShamrockLee/write-multiple-references 
trivial-builders: replace writeReferencesToFile with writeClosure
 2024-03-19 08:57:20 +00:00
github-actions[bot] 11c9a7e4d3
Merge master into haskell-updates 2024-03-19 00:12:43 +00:00
ibbem 1642654453 agda: Remove the --local-interfaces flag 
Upstream now provides a library file for the builtin library and ensured
that the existing interface files will be used regardless of whether
--local-interfaces is in effect. Hence, Agda will not try to write to
the Nix store anymore except if the build flags are changed.
 2024-03-18 23:10:27 +01:00
Yueh-Shun Li 97a7ce7aa6 nixosTests.nixops: remove dead code from Nix expression 2024-03-19 05:30:53 +08:00
nikstur a1c4f0a754
Merge pull request #282022 from ElvishJerricco/gpt-auto-root 
nixos: Support systemd-gpt-auto-root
 2024-03-18 10:27:22 +01:00
Sandro ca0de94ebb
Merge pull request #276816 from majiru/nixos-tests-build-discrepancy 
Nixos tests build discrepancy
 2024-03-17 23:59:58 +01:00
Bobby Rong bf2ba6e629
nixosTests.pantheon: Add test for io.elementary.gala.daemon@x11.service 
Which is manually added in the nixos module.
 2024-03-17 13:42:34 +08:00
Bobby Rong e49a58b847
nixosTests.pantheon: Fix gala environ subtest 
This is changed after we manage session with systemd, as
io.elementary.gala@.service has `ExecStart=@bindir@/gala`.
 2024-03-17 13:42:33 +08:00
Adam C. Stephens 79edbc3691
Merge pull request #295376 from adamcstephens/incus/test-zfs 
nixos/tests/incus: add storage test and exercise zfs integration
 2024-03-16 16:31:15 -07:00
Will Fancher 3758681200 nixos/tests/hibernate: Use EFI 
So that resumeDevice isn't needed to make systemd stage 1 work.
 2024-03-16 15:12:15 -04:00
Marcus Ramberg 11855d0fe1 tests/nimdow: init 2024-03-16 19:32:47 +01:00
Martin Weinelt fe8d02e2bc
Merge pull request #296180 from mweinelt/pretix 
pretix: init at 2024.2.0
 2024-03-16 17:28:20 +01:00
Manuel Sanchez Pinar b8f91b87a3
nixosTests.silverbullet: init 2024-03-16 17:12:16 +01:00
MinerSebas 9e1fe5cddd nixos/restic-rest-server: Make the service socket activated 2024-03-16 17:07:55 +01:00
Martin Weinelt a01acbcefe
nixos/tests/pretix: init 2024-03-16 14:50:57 +01:00
Bobby Rong 3b48b3aaa9
Merge pull request #289062 from bobby285271/upd/mate 
MATE 1.28
 2024-03-16 21:38:24 +08:00
MinerSebas c197e4a1e0 restic-rest-server: add nixos test 2024-03-16 08:18:30 +01:00
Bobby Rong fc3d133b48
Merge pull request #296347 from bobby285271/upd/budgie-tests 
nixosTests.budgie: Extend the test
 2024-03-16 14:40:35 +08:00
Bobby Rong 41fdcd0303
nixosTests.budgie: Extend the test 2024-03-16 13:25:05 +08:00
Adam Stephens 9d411861b5
nixos/tests/incus: add storage test and exercise zfs integration 2024-03-15 20:39:54 -04:00
Will Fancher f1731f2e28 nixos: Support systemd-gpt-auto-root 2024-03-15 18:22:04 -04:00
Guillaume Girol 1f26e67560
Merge pull request #278064 from symphorien/nix_config_extra 
nixos/nix: add workaround for https://github.com/NixOS/nix/issues/9487
 2024-03-15 22:46:51 +01:00
Mario Rodas e6aefe20a1
Merge pull request #292533 from flyingcircusio/init-postgresql-anonymizer 
postgresqlPackages.anonymizer: init at 1.3.1; add me & osnyx to flyingcircus team
 2024-03-14 20:53:36 -05:00
Christian Kögler f56c78f50a
Merge pull request #295443 from ck3d/machinectl-routable 
nixos.test.machinectl: add routable network and shared store
 2024-03-14 22:46:14 +01:00
Christian Kögler f4f99bf8cc nixos/tests/machinectl: Add declarative shared container 2024-03-14 22:07:58 +01:00
Bobby Rong 596f75bf1f
nixosTests.mate-wayland: init 2024-03-14 23:34:12 +08:00
Bobby Rong abd9d0bec5
nixosTests.mate: Add trivial tests for MATE 1.28 changes 2024-03-14 23:34:12 +08:00
Bobby Rong 830f5f84e6
Merge pull request #295798 from bobby285271/adopt/budgie 
budgie: add myself as maintainer
 2024-03-14 13:28:15 +08:00
Bobby Rong 1d3d0d6a89
budgie: add myself (bobby285271) as maintainer 
Let's hope this package set is not too hard to maintain.
 2024-03-14 12:29:36 +08:00
Bobby Rong 180575819a
Merge pull request #295696 from FedericoSchonborn/drop-federicoschonborn 
maintainers: drop federicoschonborn
 2024-03-14 12:13:07 +08:00
Federico Damián Schonborn 91a2510d05
maintainers: drop federicoschonborn 
Signed-off-by: Federico Damián Schonborn <federicoschonborn@disroot.org>
 2024-03-13 16:21:10 -03:00
Maximilian Bosch 0cdaede144
pg-dump-anon: init at 1.3.1 
This is a Go program inside the sources of `postgresql_anonymizer` that
allows to perform database dumps, but with anonymized data. I figured
that it's a little awkward to have a client program to be part of the
extension package.

So I decided to create a second package called `pg-dump-anon`. Since
it's one repository, both share `version` & `src`.

Also extended the VM test to make sure we're getting properly anonymized
data when dumping with `pg_dump_anon`.
 2024-03-13 16:15:54 +01:00
Pol Dellaiera 6710011819
Merge pull request #295199 from blakesmith/gotosocial_14_2 
gotosocial 0.14.1 -> 0.14.2
 2024-03-13 08:53:37 +01:00
Blake Smith b0529146b9 nixos/gotosocial: add blakesmith as a maintainer 2024-03-12 21:13:22 -05:00
Christian Kögler bdd7e48646 nixos/test/machinectl: Add test for shared nix store 2024-03-12 23:27:45 +01:00
Christian Kögler de52b2b49e nixos/tests/machinectl: Make network routable 2024-03-12 23:27:45 +01:00
Pol Dellaiera 734b199708
Merge pull request #295197 from abysssol/ollama-tests 
nixos/ollama: add tests
 2024-03-12 20:28:16 +01:00
Jacob Moody 112a71eef7 nixos/tests: remove builtints.currentSystem from make-test-python.nix 
When build using 'nix build' if we hit this default we will fail to
evaluate. Most instances that this should break have been fixed so
we remove this to prevent this from happening further in the future.
 2024-03-12 10:09:59 -05:00
Jacob Moody 4db920ed4f nixos/tests: fix discrepancy between nix-build and nix build 2024-03-12 10:09:59 -05:00
abysssol efed30f903 nixos/ollama: add test for the ollama service 2024-03-11 21:37:48 -04:00
cmspam 701fcd7982 nixos/incus: add openvswitch support 
1. Added openvswitch integration to incus service.
2. Added tests to test openvswitch functionality with incus.
 2024-03-12 01:03:39 +00:00
Cosima Neidahl a44e09da5e
Merge pull request #294555 from r-ryantm/auto-update/miriway 
miriway: unstable-2024-02-14 -> unstable-2024-03-06
 2024-03-11 19:04:18 +01:00
Maximilian Bosch 8d0e5a3402
postgresqlPackages.anonymizer: init at 1.3.1 2024-03-11 14:09:17 +01:00
OPNA2608 a49c3d2689 nixos/tests/miriway: Be more lenient when identifying the terminal prompts 2024-03-11 11:37:49 +01:00
Atemu ce8ddcd321
Merge pull request #281192 from diogotcorreia/pgvecto.rs 
postgresqlPackages.pgvecto-rs: init at 0.2.1
 2024-03-11 07:12:52 +00:00
Guanran Wang 84bbdc744e
nixos/mihomo: add tests 2024-03-11 09:51:36 +08:00
Diogo Correia 6b97ba66a4
nixos/tests/pgvecto-rs: init 2024-03-11 01:02:17 +00:00
Peder Bergebakken Sundt 4a4a70ca31
Merge pull request #280836 from numinit/nebula-port-zero 
nixos/nebula: default to port 0 for hosts other than lighthouse/relay
 2024-03-10 05:01:04 +01:00
Peder Bergebakken Sundt 3021170dfe
Merge pull request #265687 from iblech/patch-test-socks 
nixos/tests/privoxy: Verify socks support
 2024-03-10 04:27:38 +01:00
Sandro c86e8fd7a0
Merge pull request #133542 from fpletz/refactor/pinentry-remove-multiple-outputs 
pinentry: remove multiple outputs
 2024-03-09 23:57:27 +01:00
Maciej Krüger 8b8bc2c64b
Merge pull request #294497 from cmspam/patch-1 
incus.ui: Added incus-specific patches to fix branding and API
 2024-03-09 18:32:40 +01:00
Maciej Krüger 8a274e0c18
nixosTests.incus.*: enable nftables to fix tests 2024-03-09 17:23:03 +01:00
Peder Bergebakken Sundt 5f9689332a
Merge pull request #278537 from wfdewith/syncoid-permissions 
nixos/syncoid: add missing ZFS mount permission
 2024-03-08 00:11:39 +01:00
Max Niederman ea7101783c
nixos/tests/photonvision: init 2024-03-07 14:59:21 -08:00
Nick Cao b4f564dbff
Merge pull request #293821 from NickCao/knot-test-quic 
nixosTests.knot: test zone transfer over quic
 2024-03-07 09:43:04 -05:00
Robert Hensing 76fc2db1f5 nixosTests.nixops_unstable: Set memorySize to 2G 
Give the evaluator some breathing room.
 2024-03-06 22:47:23 +01:00
Robert Hensing 663b3d4be7 nixops_unstable*: Make withPlugins.*.tests.nixos behave correctly 2024-03-06 22:47:22 +01:00
Nick Cao 3b7625845b
nixosTests.knot: test zone transfer over quic 2024-03-06 13:41:24 -05:00
Adam C. Stephens a51a27a78b
Merge pull request #291554 from jnsgruk/homepage-config 
nixos/homepage-dashboard: support structured config
 2024-03-05 09:48:19 -05:00
Jon Seager 0b39e86cbc
nixosTests.homepage-dashboard: test managed and unmanaged configs 2024-03-05 14:38:53 +00:00
adisbladis 5cdb38bb16
Merge pull request #288579 from blitz/vbox-kvm-2 
virtualboxKvm: init
 2024-03-05 18:58:57 +13:00
Mikael Voss fe639ca418 nixos/tests/akkoma: Adapt to latest toot release 2024-03-05 05:27:40 +01:00
Nick Cao 8e19126885
Merge pull request #289009 from 999eagle/feat/miniflux-no-db 
nixos/miniflux: add option to disable configuring a local postgresql db
 2024-03-04 09:47:14 -05:00
Sophie Tauchert cb5f2a8e87
nixos/tests/miniflux: add test for external database 2024-03-04 09:07:21 +01:00
Martin Weinelt f09b7dc6a5
Merge pull request #289961 from leona-ya/vikunja-0.23.0 
vikunja: 0.22.1 -> 0.23.0
 2024-03-03 19:15:35 +01:00
Guillaume Girol 5b274d5f01 nixos/nix: add workaround for https://github.com/NixOS/nix/issues/9487 
Nix has a suprising behavior where if the option `extra-foo` is set before `foo`, then setting `foo` overwrites the setting for `extra-foo`. This is reported as https://github.com/NixOS/nix/issues/9487, and will likely not be fixed any time soon.

This works around this issue by always putting `extra-*` settings after non-extra ones in the nixos-generated `/etc/nix.conf`.
 2024-03-03 17:03:46 +01:00
Pascal Bach 8240cbf81b
Merge pull request #292124 from r-ryantm/auto-update/minio 
minio: 2024-02-24T17-11-14Z -> 2024-02-26T09-33-48Z
 2024-03-03 11:22:22 +01:00
Pascal Bach 7305821c58 tests/minio: fix broken minio test 
Since last update minio pre allocates 2GiB of memory, so the test VM
needs more than that to not run out of memory.

We also remove the time based tests as it makes the test non deterministic
 2024-03-03 11:20:44 +01:00
Julien Malka 4ee410d8f8
Merge pull request #283547 from r-vdp/boot_sort_key 2024-03-02 22:17:52 +01:00
nikstur b6401f808a
Merge pull request #292636 from RaitoBezarius/smm-works-for-something-else-than-x86-actually 
OVMF: remove invalid `assert` on SMM
 2024-03-02 21:04:12 +01:00
Franz Pletz 764d15f59f
pinentry: remove multiple outputs package 
fixes #133156 #124753
 2024-03-02 17:16:53 +01:00
Jonas Fierlings f73a079352
dockerTools: Test changing compression of buildLayeredImage 2024-03-02 10:18:53 +01:00
Gabriella Gonzalez b8698cd8d6
macOS support for NixOS tests (#282401) 
Closes #193336
Closes #261694
Related to #108984

The goal here was to get the following flake to build and run on
`aarch64-darwin`:

```nix
{ inputs.nixpkgs.url = <this branch>;

  outputs = { nixpkgs, ... }: {
    checks.aarch64-darwin.default =
      nixpkgs.legacyPackages.aarch64-darwin.nixosTest {
        name = "test";

        nodes.machine = { };

        testScript = "";
      };
  };
}
```

… and after this change it does.  There's no longer a need for the
user to set `nodes.*.nixpkgs.pkgs` or
`nodes.*.virtualisation.host.pkgs` as the correct values are inferred
from the host system.
 2024-03-02 06:33:14 +01:00
r-vdp a8ab8b59a7
systemd-boot: introduce options to set a sort-key for systemd-boot entries 
Without sort-keys specified on entries, the entries are sorted only by
file name (in decreasing order, so starting at the end of the alphabet!),
without taking any other fields into account (see
[the boot loader specification reference][1]).
Moreover, entries without a sort-key are always ordered after all
entries with a sort-key, so by not adding a sort-key to the NixOS ones,
we cannot add a sort-key to any other entry while keeping it below the
NixOS entries.

So currently we have options to set the file names for additional entries like
memtest and netbootxyz.
However, as mentioned above, the sorting by file name is not very intuitive and
actually sorts in the opposite order of what is currently mentioned in the option
descriptions.

With this commit, we set a configurable sort-key on all NixOS entries,
and add options for setting the sort-keys for the memtest and netbootxyz
entries.
The sorting by sort-key is more intuitive (it starts at the start of the
alphabet) and also takes into account the machine-id and version for entries
with identical sort-keys.

We use a bootspec extension to store the sort keys, which allows us to
redefine the sort key for individual specialisations without needing any
special casing.

[1]: https://uapi-group.org/specifications/specs/boot_loader_specification/#sorting
 2024-03-02 02:11:32 +01:00
nikstur ee2a53dc86 nixos/tests/systemd-boot: make secureBoot test work on different architectures 2024-03-01 23:45:07 +01:00
Ryan Lahfa fae73881ba
Merge pull request #292561 from arianvp/fix-make-disk-image-systemd-boot-homeless-shelter-clobber 
nixos/lib/make-disk-image.nix: fix systemd-boot-builder clobbering /homeless-shelter
 2024-03-01 16:59:16 +01:00
Adam C. Stephens b52452f8c7
Merge pull request #291951 from amarshall/zfs-pkgs-renaming 
zfs: rename zfsStable -> zfs_2_2; zfsUnstable -> zfs_unstable; remove enableUnstable option in favor of package
 2024-03-01 10:09:12 -05:00
Sandro b84bc4ea3a
Merge pull request #264087 from leonm1/matter-server-module 2024-03-01 13:51:19 +01:00
Sandro 51e92056db
Merge pull request #283660 from ocfox/transfer 2024-03-01 13:36:03 +01:00
Arian van Putten b75a29cb6c nixos/lib/make-disk-image.nix: fix systemd-boot-builder clobbering /homeless-shelter 
systemd-boot-builder.py calls nix-env --list-generations which creates
$HOME/.nix-defexpr/channels/nixos if it doesn't exist. This would cause a folder
/homeless-shelter to show up in the final image which in turn breaks nix builds
in the target image if sandboxing is turned off (as /homeless-shelter is never
allowed to exist).
 2024-03-01 12:52:48 +01:00
Sarah Brofeldt 13a94ad1fb
Merge pull request #292291 from cafkafk/dockerRegistry-openFirewall 
nixos/dockerRegistry: add `openFirewall` option
 2024-03-01 09:57:07 +01:00
Christina Sørensen d31cbb78ca
nixos/dockerRegistry: add openFirewall option 
Signed-off-by: Christina Sørensen <christina@cafkafk.com>
 2024-03-01 09:56:03 +01:00
Sandro bbabfca453
Merge pull request #263765 from numinit/armagetronad-module 
nixos/armagetronad: Add module with NixOS tests
 2024-03-01 00:46:34 +01:00
Robert Schütz 603c5af519 nixos/tests/searx: use configured package for static content 
Also use the simple theme because upstream dropped the oscar one:
https://github.com/searxng/searxng/discussions/1167
 2024-02-28 17:51:29 -08:00
Adam C. Stephens 8ed07da2ed
Merge pull request #290433 from adamcstephens/consul/tests 
nixos/tests/consul: enable unfree
 2024-02-28 13:35:48 -05:00
Adam C. Stephens 6b834b5e9a
Merge pull request #290570 from adamcstephens/lxc/sysctl 
nixos/lxc/generator: remove sysctl error handling
 2024-02-28 13:34:48 -05:00
Adam Stephens 5f1b65f75f
nixos/tests/incus: ensure sysctl rules apply successfully to lxc containers 2024-02-28 11:59:39 -05:00
Julian Stecklina 3661b3ee53 nixosTests.virtualbox: add happy path KVM test 
The KVM support is still new and experimental. There is no point in
doing extensive testing. Just check whether it works in general.
 2024-02-28 17:43:43 +01:00
Julian Stecklina 77c7ac6c35 nixosTests.virtualbox: allow additional parameters for tests 2024-02-28 17:36:22 +01:00
K900 16f963794a nixos/tests: add plasma6 2024-02-28 18:49:33 +03:00
Alyssa Ross dc6eafa64f linux_6_5: remove 2024-02-28 12:48:08 +01:00
K900 d53c203739
Merge pull request #291544 from K900/ovmf-oof 
nixos/tests: drop LegacyStartCommand
 2024-02-28 09:32:26 +03:00
Morgan Jones a5c305d170
nixos/armagetronad: address code review feedback 2024-02-27 18:59:37 -08:00
Robert Hensing 57c1108204
Merge pull request #282886 from WxNzEMof/docker-tools-uid 
Allow streaming layered containers with non-root Nix store
 2024-02-28 03:43:07 +01:00
Will Fancher a587a6a357
Merge pull request #285401 from sdht0/systemd-boot-xbootldr 
nixos/systemd-boot: Add support for an XBOOTLDR partition
 2024-02-27 20:35:03 -05:00
Andrew Marshall 929fcf9335 zfs_unstable: Rename from zfsUnstable 
This matches the naming of other zfs_* pkgs.
 2024-02-27 18:45:55 -05:00
Andrew Marshall 1c84667539 nixos/tests/zfs: Get test name from pkg under test 
The previous names are already this.
 2024-02-27 18:45:47 -05:00
Andrew Marshall dcff4f8318 zfs_2_2: Rename from zfsStable 
The `zfs` alias already has equivalent semantics. Instead, make this
like zfs_2_1 so folks who want to pin a specific release series can do
so easily and clearly to have more control over when more substantial
updates occur.

Rename all tests to match the pkg attr they are testing.
 2024-02-27 18:45:43 -05:00
K900 423098c284 nixos/lib/test-driver: drop LegacyStartCommand, clean up create_machine API 
We can finally do this now that it's no longer used.
 2024-02-27 23:15:59 +03:00
K900 786f391922 nixos/tests/installer: inline + fix UEFI start command generation 2024-02-27 23:15:59 +03:00
K900 61cb46e6bf nixos/tests/boot: inline + fix UEFI start command generation 2024-02-27 23:15:59 +03:00
K900 bf5c44d0d7 nixos/tests/boot/ubootExtlinux: mark broken 2024-02-27 23:15:58 +03:00
Atemu 97f445e8f1
Merge pull request #245005 from Scrumplex/nixos-monado 
nixos/monado: init
 2024-02-27 20:11:04 +00:00
superherointj 471dfadc48
Merge pull request #288790 from superherointj/nixos-tests-k3s-etcd 
nixos/tests/k3s: add etcd backend
 2024-02-27 07:31:38 -03:00
Siddhartha b470b4432d nixos/systemd-boot: Add support for an XBOOTLDR partition 2024-02-26 21:55:49 -05:00
Peder Bergebakken Sundt 9f6ae93dc8
Merge pull request #278374 from OPNA2608/init/lomiri/lomiri-system-settings 
lomiri.lomiri-system-settings{,-unwrapped,-security-privacy}: init at 1.0.2
 2024-02-26 22:46:52 +01:00
Atemu f53c775852
Merge pull request #278454 from litchipi/mealie 
mealie: init at 1.2.0
 2024-02-26 21:01:49 +00:00
WxNzEMof 4733b52c6b dockerTools.tests.docker-tools: Add non-root streamLayeredImage test 2024-02-26 19:29:04 +00:00
WxNzEMof 2697d34603 streamLayeredImage: Change mode of /nix, /nix/store to 755 
The change is insignificant when the owner is root.  However, when it
is not root, this change is needed to allow using Nix (as an
unprivileged user) inside the container.
 2024-02-26 18:10:51 +00:00
OPNA2608 66129d5e24 tests/lomiri-system-settings: init 2024-02-26 10:11:41 +01:00
Adam C. Stephens af810fc67e
Merge pull request #284874 from shlevy/ovmf-ms 
Enable MS-compatible secure boot with OVMF
 2024-02-25 22:34:05 -05:00
Ryan Lahfa 077d41f9d8
Merge pull request #289856 from pennae/supfs-set 
nixos/filesystems: make supportedFilesystems an attrset
 2024-02-25 18:05:29 +01:00
K900 f5c4b5837d
Merge pull request #289748 from picnoir/pic/ppd020 
power-profiles-daemon: 0.13 -> 0.20
 2024-02-24 12:30:49 +03:00
Félix Baylac Jacqué 1da7dfa57d nixosTests.power-profiles-daemon: test profilectl CLI 
We also take advantage of that change to point to the new dbus
canonical names.
 2024-02-24 09:39:28 +01:00
Sefa Eyeoglu 8fc2690b73
nixos/monado: add test 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2024-02-23 14:25:16 +01:00
Emery Hemingway e7d3db0954 nixos/ccache: add test 2024-02-23 11:08:02 +00:00
0x4A6F a9134fc109
Merge pull request #278896 from helsinki-systems/upd/matomo 
matomo_5: Init at 5.0.2
 2024-02-23 09:38:19 +01:00
Litchi Pi aeb79caaf6 nixos/mealie: init tests 
Signed-off-by: Litchi Pi <litchi.pi@proton.me>
 2024-02-23 07:15:44 +01:00
Sandro 78745f4652
Merge pull request #289934 from jnsgruk/scrutiny 2024-02-23 00:43:55 +01:00
Jon Seager 41a1acde71
nixosTests.scrutiny: init 2024-02-22 21:20:10 +00:00
Peder Bergebakken Sundt b775c0299d
Merge pull request #262433 from OPNA2608/init/lomiri/morph-browser 
lomiri.morph-browser: init at 1.1.0
 2024-02-22 18:34:55 +01:00
Maximilian Bosch 0fac694dba
Merge pull request #290507 from dotlambda/nextcloud-notify_push-meta 
nextcloud-notify_push.test_client: add meta
 2024-02-22 17:28:11 +01:00
OPNA2608 a8069ff58a tests/morph-browser: Add standalone (non-Lomiri) test 2024-02-22 10:36:50 +01:00
Adam C. Stephens f8131a5a2c
Merge pull request #290288 from mkg20001/lxc-initrd-fix 
nixos/lxc-container: link to prepare-root when boot.initrd.systemd.enable is on
 2024-02-21 22:29:04 -05:00
Jörg Thalheim 87f6f1fcbd
Merge pull request #290490 from nikstur/idempotent-etc-activation 
nixos/etc: make re-mounting /etc overlay idempotent
 2024-02-22 07:23:22 +07:00
Robert Schütz 16e379fa03 nextcloud-notify_push.test_client: add meta 2024-02-21 15:12:58 -08:00
nikstur 5df8caced4 nixos/etc: make re-mounting /etc overlay idempotent 2024-02-21 22:54:00 +01:00
Adam Stephens 96e208a605
nixos/tests/consul: enable unfree 2024-02-21 08:41:06 -05:00
Maximilian Bosch b0e2f85051
Merge pull request #287819 from Ma27/nc-regression-test 
nixos/nextcloud: add regression test for not delivering code anymore
 2024-02-21 14:14:28 +01:00
Maciej Krüger c607e70f70
nixosTests.incus: add test with old and new init 2024-02-20 23:42:59 +01:00
Leona Maroni 47b7eb8fd9
nixos/vikunja: remove setupNginx option 
The required nginx configuration is now really simple, and e.g. SSL/ACME
already required the user to interact with `services.nginx.virtualHosts`.
Therefore, and to reduce complexity, we now leave the web server
configuration to the user.
 2024-02-20 22:43:53 +01:00