Vladimír Čunát 2d6179d1e8 Merge branch 'master' into staging ... A few trivial conflicts due to *Platforms mass replace.		2018-09-01 17:38:18 +02:00
..
config	Merge branch 'master' into staging	2018-09-01 17:38:18 +02: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	nixos/doc: add instructions for installation behind a proxy (#45854)	2018-09-01 16:12:35 +02:00
misc	nixos/zeronet: init (#44842)	2018-08-31 11:40:23 +01:00
profiles	usb-storage -> uas	2018-08-23 01:42:34 +00:00
programs	Merge pull request #45058 from michaelpj/imp/freedesktop-modules	2018-08-30 16:14:35 +01:00
security	Merge pull request #42834 from Synthetica9/patch-1	2018-07-23 11:29:18 -04:00
services	Merge branch 'master' into staging	2018-09-01 17:38:18 +02:00
system	nixos/doc: add instructions for installation behind a proxy (#45854)	2018-09-01 16:12:35 +02:00
tasks	linuxPackages.zfsUnstable: 2018-05-22 -> 2018-08-13	2018-08-14 14:12:07 +02:00
testing	nixos/tests: Set DefaultTimeoutStartSec very high (#44916)	2018-08-29 12:12:12 +02:00
virtualisation	reewide: Purge all uses stdenv.system and top-level system	2018-08-30 17:20:32 -04:00
module-list.nix	nixos/zeronet: init (#44842)	2018-08-31 11:40:23 +01:00
rename.nix	virtualization.growPartition -> virtualisation.growPartition	2018-08-28 14:24:39 +02:00