Jan Tojnar ef935fa101 Merge branch 'master' into staging		2018-12-24 15:02:29 +01:00
..
config	Merge branch 'master' into staging	2018-12-24 15:02:29 +01:00
hardware	Merge pull request #47297 from greydot/bladerf	2018-12-18 09:29:32 +01:00
i18n/input-method	docs: format	2018-09-29 20:51:11 -04:00
installer	Merge staging-next into staging	2018-12-19 09:00:36 +01:00
misc	nixos/cockroachdb: create new service	2018-12-01 19:07:49 -06:00
profiles	Revert "zfs cannot be distributed. Disabling it in the isos."	2018-11-26 17:51:18 -05:00
programs	Merge staging-next into staging	2018-12-19 09:00:36 +01:00
security	config.security.googleOsLogin: add module	2018-12-21 17:52:37 +01:00
services	Merge branch 'master' into staging	2018-12-24 15:02:29 +01:00
system	Merge pull request #51600 from eburimu/fix/cross-extlinux-conf-builder	2018-12-19 11:01:31 -06:00
tasks	nixos: move system.autoUpgrade	2018-11-17 14:05:30 +01:00
testing	lib.makePerlPath -> perlPackages.makePerlPath	2018-12-15 03:50:31 +00:00
virtualisation	nixos/modules/virtualisation/google-compute-config.nix: remove google-accounts-daemon	2018-12-21 17:52:37 +01:00
module-list.nix	Merge branch 'master' into staging	2018-12-24 15:02:29 +01:00
rename.nix	ckb-next: move option renames to nixos/modules/rename.nix for consistency	2018-11-06 00:50:00 +00:00