Commit graph

2073 commits

Author SHA1 Message Date
Florian Klink eeaf1f702d
Merge pull request #75103 from sternenseemann/spacecookie
services/spacecookie: init
2019-12-23 11:09:52 +01:00
Aaron Andersen 086d1ad906
Merge pull request #75047 from kampka/trilium-server
Add trilium server and module
2019-12-22 20:26:57 -05:00
Christian Kampka ebf3f1fe78
trilium: Pin platforms to x86_64 linux 2019-12-22 15:04:09 +01:00
Maximilian Bosch 7675c0b2a9
nixos/tests/hydra: port to python 2019-12-22 14:36:11 +01:00
Maximilian Bosch f2915c1616
Merge pull request #75464 from mmilata/rspamd-python-test
nixosTests.rspamd: port to python
2019-12-21 01:25:18 +01:00
Dmitry Kalinkin aa934faff2
Merge pull request #75703 from kampka/port-tests-3
Port NixOS tests to python
2019-12-20 09:52:33 -05:00
Florian Klink dee7a7f301
Merge pull request #75721 from kampka/port-tests-networking
nixosTests.networking: Port tests to python
2019-12-19 21:10:37 +01:00
Michael Raskin 6210c15573
Merge pull request #67507 from misuzu/package-3proxy
3proxy: init at 0.8.13
2019-12-19 15:42:15 +00:00
Christian Kampka 9f97485399
trilium-server: Add nginx reverse proxy configuration to module 2019-12-19 10:14:13 +01:00
Christian Kampka 82f038d468
trilium-server: Add module 2019-12-19 10:14:12 +01:00
Frederik Rietdijk f79e10061f Merge master into staging-next 2019-12-19 09:19:50 +01:00
Jan Tojnar 6be14ee97b
Merge pull request #53843 from hedning/session-default
nixos/displayManager: introduce defaultSession
2019-12-18 21:16:06 +01:00
Dmitry Kalinkin 9faa37cfdf
Merge pull request #75701 from kampka/port-tests-2
Port NixOS tests to python
2019-12-17 21:51:42 -05:00
Dmitry Kalinkin fc47ec691f
Merge pull request #75695 from kampka/port-tests
Port NixOS tests to python
2019-12-17 21:45:59 -05:00
sternenseemann 25503db8e8 nixos/spacecookie: add service module and test 2019-12-17 14:17:03 +01:00
Christian Kampka 98d562f0b3
nixosTests.networking: Port tests to python 2019-12-17 11:22:28 +01:00
Christian Kampka 05587aba8b
nixosTests.hitch: Port tests to python 2019-12-17 09:37:07 +01:00
Christian Kampka 5cb7b2cf60
nixosTests.hadoop.yarn: Port tests to python 2019-12-17 09:37:06 +01:00
Christian Kampka 563eea492b
nixosTests.hadoop.hdfs: Port tests to python 2019-12-17 09:37:02 +01:00
Christian Kampka a6ac3fd89f
nixosTests.initrd-network: Port tests to python 2019-12-16 12:52:34 +01:00
Christian Kampka 9fbb427f67
nixosTests.haproxy: Port tests to python 2019-12-16 12:52:33 +01:00
Christian Kampka 0de0b6a281
nixosTests.leaps: Port tests to python 2019-12-16 12:52:32 +01:00
Christian Kampka 40ed6896e3
nixosTests.lidarr: Port tests to python 2019-12-16 12:52:31 +01:00
Christian Kampka 1f2030fdcb
nixosTests.mailcatcher: Port tests to python 2019-12-16 12:52:30 +01:00
Christian Kampka 23d164edb4
nixosTests.wireguard.namespaces: Port test to python 2019-12-16 12:52:29 +01:00
Christian Kampka 229a0afb28
nixosTests.paperless: Port tests to python 2019-12-15 20:10:57 +01:00
Christian Kampka d76ab647e6
nixosTests.pdns-recursor: Port tests not python 2019-12-15 20:08:02 +01:00
Christian Kampka d58814ac5a
nixosTests.peerflix: Port tests to python 2019-12-15 20:08:01 +01:00
Christian Kampka a20683acbe
nixosTests.pgmanage: Port tests to python 2019-12-15 20:08:00 +01:00
Christian Kampka 1bf1ec35bc
nixosTests.php-pcre: Port tests to python 2019-12-15 20:07:59 +01:00
Christian Kampka d029e28b78
nixosTests.postgis: Port tests to python 2019-12-15 20:07:58 +01:00
Christian Kampka e96802ccb2
nixosTests.quagga: Port tests to python 2019-12-15 20:07:52 +01:00
Christian Kampka c811e76d82
nixosTests.mutable-users: Port tests to python 2019-12-15 19:53:17 +01:00
Christian Kampka 58cd46ba21
nixosTests.mxisd: Port tests to python 2019-12-15 19:46:53 +01:00
Christian Kampka 8c683b3b13
nixosTests.nesting: Port tests to python 2019-12-15 19:42:21 +01:00
Christian Kampka e51673bb77
nixosTests.nghttpx: Port tests to python 2019-12-15 19:36:44 +01:00
Christian Kampka 1f3f9fd3a2
nixosTests.novacomd: Port tests to python 2019-12-15 19:35:33 +01:00
Christian Kampka 065770607e
nixosTests.nzbget: Port tests to python 2019-12-15 19:29:17 +01:00
Christian Kampka 57e8bd9ebe
nixosTest.orangefs: Port tests to python 2019-12-15 19:26:06 +01:00
Christian Kampka 862a7393f3
nixosTests.osrm-backend: Port tests to python 2019-12-15 19:19:11 +01:00
Christian Kampka 5ae92144ba
nixosTests.overlayfs: Port tests to python 2019-12-15 19:13:56 +01:00
Christian Kampka bcf6aa5519
nixosTests.sonarr: Port tests to python 2019-12-15 18:24:45 +01:00
Christian Kampka aeeabe0b89
nixosTests.switch-test: Port tests to python 2019-12-15 18:22:35 +01:00
Christian Kampka 69b1b0cff0
nixosTests.systemd-timesyncd: Port tests to python 2019-12-15 18:16:00 +01:00
Frederik Rietdijk 7266f3ad2b Merge staging-next into staging 2019-12-15 16:12:48 +01:00
Jan Tojnar 8dc5ff7dcf
nixos/displayManager: deprecate separate options for default wm/dm
The upstream session files display managers use have no concept of sessions being composed from
desktop manager and window manager. To be able to set upstream session files as default
session, we need a single option. Having two different ways to set default session would be confusing,
though, so we decided to deprecate the old method.

We also created separate script for each session, just like we already had a separate desktop
file for each one, and started using displayManager.sessionPackages mechanism to make the
session handling more uniform.
2019-12-15 04:16:20 +01:00
Tor Hedin Brønner d25365c3c1
nixos/displayManager: introduce defaultSession
There's two ways of providing graphical sessions now:
- `displayManager.session` via. `desktopManager.session` and
  `windowManager.session`
- `displayManager.sessionPackages`

`sessionPackages` doesn't make a distinction between desktop and window
managers. This makes selecting a session provided by a package using
`desktopManager.default` nonsensical.

We therefor introduce `displayManager.defaultSession` which can select a session
from either `displayManager.session` or `displayManager.sessionPackages`.

It will default to `desktopManager.default + windowManager.default` as before.
If the dm default is "none" it will select the first provided session from
`sessionPackages`.
2019-12-15 04:16:20 +01:00
Jan Tojnar aa3cb8b00e
Merge branch 'staging-next' into staging 2019-12-14 23:09:23 +01:00
Christian Kampka c98d54a3e9
zsh-history: Add tests 2019-12-14 10:58:38 +01:00
Jan Tojnar 919297f369
nixosTests.xmonad: fix 2019-12-13 17:16:59 +01:00