Tuomas Tynkkynen 34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/applications/misc/pytrainer/default.nix pkgs/development/tools/pew/default.nix pkgs/tools/misc/you-get/default.nix		2018-02-28 20:52:49 +02:00
..
config	tree-wide: autorename gnome packages to use dashes	2018-02-25 17:41:16 +01:00
hardware	digitalbitbox: init at 2.2.2 (#33787)	2018-02-27 22:40:22 +00:00
i18n/input-method
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	digitalbitbox: init at 2.2.2 (#33787)	2018-02-27 22:40:22 +00: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	digitalbitbox: init at 2.2.2 (#33787)	2018-02-27 22:40:22 +00:00
rename.nix	nixos/piwik: rename to matomo	2018-02-22 22:03:55 +01:00