Vladimír Čunát 6168c2e45f Merge master into staging ... This is to cleanup the (re-)revert of merge to master.		2018-02-26 22:55:11 +01:00
..
config	tree-wide: autorename gnome packages to use dashes	2018-02-25 17:41:16 +01:00
hardware	rtl8723bs: Only include in enableAllFirmware if valid	2018-02-22 08:52:50 -05:00
i18n/input-method	Remove top-level kde5 attribute	2017-02-27 11:49:10 -06:00
installer	tree-wide: autorename gnome packages to use dashes	2018-02-25 17:41:16 +01:00
misc	nixpkgs module: update config example	2018-02-23 00:21:15 +01:00
profiles	Add setFunctionArgs lib function.	2018-01-31 14:02:19 -05:00
programs	nixos udevil: set up wrapper for udevil	2018-02-26 14:30:22 +08:00
security	tree-wide: autorename gnome packages to use dashes	2018-02-25 17:41:16 +01:00
services	Merge remote-tracking branch 'upstream/master' into HEAD	2018-02-26 10:50:18 +01:00
system	attempt to fix #30940 more robustly	2018-02-26 22:19:12 +01:00
tasks	Merge pull request #35141 from abbradar/dhcpcd-order	2018-02-20 16:07:49 +00:00
testing	nixos/qemu: Deduplicate QEMU serialDevice into qemu-flags.nix	2018-01-30 16:57:27 +02:00
virtualisation	Virtualbox: Fix type error in networking.interfaces.vboxnet0.ipv4.addresses	2018-02-19 17:48:15 +01:00
module-list.nix	Merge pull request #34028 from florianjacob/matomo	2018-02-26 06:53:58 +00:00
rename.nix	nixos/piwik: rename to matomo	2018-02-22 22:03:55 +01:00