William A. Kennington III ce8c8f1e1b Merge pull request #11890 from Baughn/zfs ... zfs:Add option for zpool import -d, and set it to /dev/disk/by-id.		2016-01-05 14:37:19 -08:00
..
config	Fix package name typo	2016-01-02 12:37:20 -08:00
hardware	nixos/bumblebee: update for new packages	2015-12-05 00:54:09 +03:00
installer	Merge pull request #11279 from rickynils/nixos-rebuild-remote	2016-01-04 11:52:25 +01:00
misc	nixos/mathics: New service and test	2016-01-02 14:34:55 -08:00
profiles	installation-cd-graphical: Enable the 'synaptics' touchpad driver	2015-12-24 17:45:51 +02:00
programs	Merge pull request #11945 from jgillich/fish	2016-01-06 01:25:37 +03:00
security	nixos/acme: fix timer unit	2015-12-13 17:01:59 +03:00
services	Revert "Basic Declaritive Network Configuration in wpa_supplicant Service"	2016-01-05 19:32:41 +01:00
system	NixOS tests: Increase hung_task_timeout_secs	2016-01-04 16:53:42 +01:00
tasks	Merge pull request #11890 from Baughn/zfs	2016-01-05 14:37:19 -08:00
testing	NixOS tests: Increase hung_task_timeout_secs	2016-01-04 16:53:42 +01:00
virtualisation	btrfsProgs -> canonical btrfs-progs	2016-01-03 20:38:44 +01:00
module-list.nix	Merge pull request #11945 from jgillich/fish	2016-01-06 01:25:37 +03:00
rename.nix	Merge pull request #11920 from bjornfor/rename-host-to-listen-address	2016-01-05 12:54:15 +01:00