Vladimír Čunát 5b0398dc36 Merge branch 'master' into staging-next ... Conflicts: gobby and libinfinity - I took the hand-edited versions instead of those resuting from the mass-replacement. Hydra: ?compare=1473190		2018-08-13 20:43:59 +02:00
..
config	environment.extraInit: fix description typo	2018-08-13 14:28:52 +01:00
hardware	[bot] nixos/*: remove unused arguments in lambdas	2018-07-20 20:56:59 +00:00
i18n/input-method	options.i18n.inputMethod.package: fix type (#43239)	2018-07-09 22:37:27 +02:00
installer	set initialHashedPassword in installation-device.nix	2018-08-07 14:45:50 +02:00
misc	nixos/modules/misc/version.nix: Don't spam the user with vague warnings	2018-08-10 21:39:36 +02:00
profiles	set initialHashedPassword in installation-device.nix	2018-08-07 14:45:50 +02:00
programs	nixos/oh-my-zsh: add documentation	2018-08-07 15:47:02 +02:00
security	Merge pull request #42834 from Synthetica9/patch-1	2018-07-23 11:29:18 -04:00
services	Merge pull request #44876 from eadwu/display-managers/pulseaudio-rely-on-socket	2018-08-12 22:23:45 +02:00
system	Merge branch 'master' into staging-next	2018-08-13 20:43:59 +02:00
tasks	trackpoint: Make the device name configurable	2018-08-06 02:56:32 +02:00
testing	Revert "nixos: rename system.{stateVersion,defaultChannel} -> system.nixos.\1"	2018-07-28 00:12:55 +03:00
virtualisation	virtualbox module: allow to pass the package (#44907)	2018-08-11 19:40:00 +01:00
module-list.nix	Merge pull request #44556 from johanot/certmgr-module-init	2018-08-10 15:11:26 +02:00
rename.nix	nixos/disnix: undo dysnomia rename to fix disnix and retain compatibility with previous release	2018-08-06 01:25:38 +02:00