Michael Raskin 3ecaf3b4b5 Merge pull request #25168 from tadfisher/ups-fix ... ups: fix config generation		2017-05-01 16:09:18 +02:00
..
config	Merge pull request #22489 from avnik/nixos-locales	2017-04-30 18:19:31 +02:00
hardware	rtl8192su-firmware: init at unstable-2016-10-05	2017-03-31 10:49:38 +02:00
i18n/input-method	Remove top-level kde5 attribute	2017-02-27 11:49:10 -06:00
installer	nix: 1.11.8 -> 1.11.9	2017-04-25 17:19:10 +02:00
misc	Merge branch 'master' into clickhouse	2017-05-01 07:33:31 +02:00
profiles	nixos/hardened profile: disable user namespaces at runtime	2017-04-30 15:17:27 +02:00
programs	Merge pull request #24803 from pajowu/master	2017-05-01 11:27:17 +02:00
security	nixos/lock-kernel-modules: fix typo in unitConfig	2017-04-30 15:17:29 +02:00
services	Merge pull request #25168 from tadfisher/ups-fix	2017-05-01 16:09:18 +02:00
system	Merge pull request #25005 from Lassulus/copytoram	2017-04-30 11:22:45 +02:00
tasks	Add Elantech ETPS/2 Trackpoint (ThinkPad Yoga 260)	2017-04-22 13:42:57 +02:00
testing	kdm: drop service	2017-02-11 13:55:09 -05:00
virtualisation	Merge pull request #25245 from bachp/docker-proxy	2017-04-27 11:03:46 +02:00
module-list.nix	Merge pull request #24803 from pajowu/master	2017-05-01 11:27:17 +02:00
rename.nix	zsh-syntax-highlighting: Add more configuration options and move to module (#25153)	2017-04-23 21:17:31 +02:00