Jörg Thalheim 7b211da119 Merge pull request #25531 from Infinisil/fix/ipfs-dataDir ... ipfs service: Fix dataDir being ignored		2017-05-10 07:19:23 +01:00
..
config	environment.profileRelativeEnvVars: remove sbin from example	2017-05-09 08:51:04 +01:00
hardware	hardware.enableRedistributableFirmware: fix spelling error	2017-05-09 20:13:15 +01:00
i18n/input-method	Remove top-level kde5 attribute	2017-02-27 11:49:10 -06:00
installer	Merge pull request #25611 from Lassulus/copytoram-option	2017-05-09 22:36:59 +01:00
misc	Merge branch 'master' into clickhouse	2017-05-01 07:33:31 +02:00
profiles	hardware.enableRedistributableFirmware: fix spelling error	2017-05-09 20:13:15 +01:00
programs	environment: remove sbin from PATH	2017-05-06 08:39:27 +01:00
security	nixos/lock-kernel-modules: fix typo in unitConfig	2017-04-30 15:17:29 +02:00
services	Merge pull request #25531 from Infinisil/fix/ipfs-dataDir	2017-05-10 07:19:23 +01:00
system	Merge pull request #25005 from Lassulus/copytoram	2017-04-30 11:22:45 +02:00
tasks	zfs: zed service is now called zfs-zed	2017-05-07 10:22:14 +01:00
testing	kdm: drop service	2017-02-11 13:55:09 -05:00
virtualisation	Merge pull request #25397 from clefru/qemu-OVMF-on-channels	2017-05-09 16:36:45 +08:00
module-list.nix	Add salt master module (#25632)	2017-05-09 18:20:35 +01:00
rename.nix	zsh-syntax-highlighting: Add more configuration options and move to module (#25153)	2017-04-23 21:17:31 +02:00