Shea Levy 0f854cd2d1

Merge branch 'master' into staging

2018-03-24 01:34:53 -04:00

..

config

networkmanager-pptp: remove package

2018-03-23 22:24:50 +01:00

hardware

Merge pull request #33685 from corngood/amdgpu-pro-upgrade

2018-03-19 12:40:03 -05:00

i18n/input-method

Remove top-level kde5 attribute

2017-02-27 11:49:10 -06:00

installer

treewide: replace depecated alias s/mssys/ms-sys/g

2018-03-22 10:13:21 +00:00

misc

18.09: Jackrabbit -> Jellyfish

2018-03-16 12:26:03 +01:00

profiles

treewide: replace depecated alias s/mssys/ms-sys/g

2018-03-22 10:13:21 +00:00

programs

Merge commit '3ab2949' from staging into master

2018-03-15 22:30:56 +02:00

security

duosec: use root uid as sshd uid has been retired (#33597)

2018-03-21 18:46:35 -05:00

services

networkmanager-pptp: remove package

2018-03-23 22:24:50 +01:00

system

systemd: 237 -> 238

2018-03-22 22:37:26 +03:00

tasks

nixos/manual: fixed example config for networking.interfaces

2018-03-17 19:53:06 +01:00

testing

nixos/qemu: Deduplicate QEMU serialDevice into qemu-flags.nix

2018-01-30 16:57:27 +02:00

virtualisation

Merge pull request #35687 from volth/libvirt-4.1.0

2018-03-19 11:42:06 +00:00

module-list.nix

Merge pull request #34053 from thpham/serviio

2018-03-22 11:11:17 -05:00

rename.nix

nixos/prometheus-exporters: rewrite and restructure

2018-03-22 14:46:17 +01:00