Luca Bruno 83221f3886 Merge branch 'master' into staging ... Makes the build more useful: - Disabled hybrid iso, makes installer tests pass again - Imagemagick fixes to the "Illegal instruction" thing		2014-11-08 15:56:40 +01:00
..
amqp	nixos/rabbitmq: wait for start	2014-09-13 02:16:53 +02:00
audio	Try fixing #4084	2014-09-21 07:04:01 +01:00
backup	rsnapshot: add git version & make it configurable in the nixos module	2014-10-27 20:38:39 +01:00
computing/torque	Merge recent master into staging	2014-09-13 21:48:29 +02:00
continuous-integration/jenkins	Merge recent master into staging	2014-09-13 21:48:29 +02:00
databases	nixos/neo4j: add package option	2014-10-18 13:18:37 +02:00
desktops	Move at_spi2_core and at_spi2_atk outside of the gnome3 attrset	2014-07-10 11:39:16 +02:00
games
hardware	Merge branch 'master' into staging	2014-11-08 15:56:40 +01:00
logging	Revert "Revert "syslog-ng: Update from 3.5.6 to 3.6.1""	2014-11-06 21:59:04 +01:00
mail	Add mlmmj package and nixos module.	2014-08-23 12:30:45 +04:00
misc	gitolite: add dataDir	2014-11-02 02:24:41 +03:00
monitoring	nixos/graphite: fix user creation	2014-11-04 19:38:24 +01:00
network-filesystems	fix eval	2014-10-15 12:00:20 +02:00
networking	quassel: make a proper systemd unit (also properly works in containers now)	2014-11-08 14:59:25 +01:00
printing	CUPS system wide client configuration.	2014-08-20 18:48:42 +02:00
scheduling	nixos: Add option services.cron.cronFiles	2014-10-01 17:33:38 +02:00
search	nixos/elasticsearch: wait for start	2014-09-13 02:21:31 +02:00
security	nixos/fail2ban: don't use types.string (it's deprecated)	2014-09-05 22:56:30 +02:00
system	Enable systemd's mymachines NSS module	2014-08-24 17:10:19 +02:00
torrent	nixos/transmission: Start after local-fs.target	2014-11-04 18:40:13 +01:00
ttys	Make console-getty only used inside container by default	2014-09-02 01:36:10 +04:00
web-servers	Fixes to Apache 2.4 configuration	2014-11-06 21:58:40 +01:00
x11	Merge remote-tracking branch 'origin/master' into staging.	2014-10-31 11:14:24 +01:00