Frederik Rietdijk
f79e10061f
Merge master into staging-next
2019-12-19 09:19:50 +01:00
Maximilian Bosch
4b51d1391e
Merge pull request #75787 from chkno/see-also-man-configuration-dot-nix
...
nixos/nixos-option: "See also configuration.nix manpage" in nixos-option manpage
2019-12-19 01:38:55 +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
Chuck
55eb76a783
nixos/nixos-option: "See also configuration.nix manpage" in nixos-option manpage
2019-12-18 12:03:35 -08: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
Niklas Hambüchen
f7b6824e5d
Merge pull request #75795 from kampka/port-tests-4
...
Port NixOS tests to python
2019-12-18 02:14:43 +00:00
Frederik Rietdijk
bf2877b9ab
Merge master into staging-next
2019-12-17 17:16:52 +01:00
Linus Heckemann
6eff44f9fb
Merge pull request #75578 from WilliButz/oxidized-pidfile
...
nixos/oxidized: specify PID file in service
2019-12-17 11:39:41 +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
Lassulus
f061413686
Merge pull request #74722 from gnidorah/mame
...
mame: 0.215 -> 0.216
2019-12-17 07:57:54 +01:00
Frederik Rietdijk
7aedd744d8
Merge master into staging-next
2019-12-16 20:28:10 +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
Leonhard Markert
56622fa339
lorri: add git to daemon path
...
Lorri's daemon invokes Nix which requires Git on its path.
https://github.com/target/lorri/issues/255
2019-12-16 10:09:59 +01:00
Franz Pletz
0f783bc7ca
Merge pull request #75193 from Ma27/optional-networkd-gateway
...
nixos/networkd: only set gateway if it's explicitly specified in the module system
2019-12-15 22:15:32 +00:00
Danylo Hlynskyi
c8c30fac9b
Merge pull request #75692 from kampka/postgresql-backup-default
...
postgresql-backup: Use saner defaults for pg_dump
2019-12-15 23:16:50 +02: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
Frederik Rietdijk
49b3d9ae62
Merge staging into staging-next
2019-12-15 18:49:26 +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
Danylo Hlynskyi
d206f2304f
nixos containers: disable NixOS manual in container config. ( #75659 )
...
This makes ~2.5x speed up of an empty container instantiate, hence reduces
rebuild time of system with many declarative containers.
Note that this doesn't affect production systems much, becaseu those most
likely already include `minimal.nix` profile.
2019-12-15 18:21:52 +02:00
Frederik Rietdijk
7266f3ad2b
Merge staging-next into staging
2019-12-15 16:12:48 +01:00
Frederik Rietdijk
c20cd71d60
Merge master into staging-next
2019-12-15 16:09:28 +01:00
Christian Kampka
2387deec3d
postgresql-backup: Use saner defaults for pg_dump
2019-12-15 13:14:21 +01:00
Bernardo Meurer
5ee439eb08
nixos: fix ip46tables invocation in nat
2019-12-14 20:13:12 -08: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
53ef29c138
nixos/lightdm: enable wayland sessions
...
Note: can't launch gnome on wayland due to duplicate entry names:
https://github.com/CanonicalLtd/lightdm/issues/16
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
Tor Hedin Brønner
58e5290fce
nixos/displayManager: check for provided sessions in mkDesktops
2019-12-15 04:16:20 +01:00
Tor Hedin Brønner
dd7144b860
nixos/sessionPackages: provide session names in passthru
...
We want access to the valid session names at evaluation time.
2019-12-15 04:16:18 +01:00
Tor Hedin Brønner
d362df6682
nixos/display-manager: extraSessionFilePackages -> sessionPackages
2019-12-15 04:14:56 +01:00
worldofpeace
22f57b8925
Merge pull request #75625 from kampka/zsh-history-module
...
zsh-history: Add tests
2019-12-14 19:51:20 -05:00
Jan Tojnar
aa3cb8b00e
Merge branch 'staging-next' into staging
2019-12-14 23:09:23 +01:00
Jan Tojnar
429561978b
Merge branch 'master' into staging-next
2019-12-14 23:09:06 +01:00
Léo Gaspard
226ea5c17a
Merge pull request #75294 from kampka/postgres-service-refactor
...
matrix-synapse: Use postgres service to create database and user
2019-12-14 21:36:59 +01:00
WilliButz
10c5b2d91c
Merge pull request #75363 from primeos/sway-display-manager-integration
...
nixos/sway: Enable the display manager integration
2019-12-14 17:02:33 +01:00
