Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ...

Conflicts:
	pkgs/desktops/e18/enlightenment.nix

2014-08-04 16:51:47 +02:00

..

amqp

Merge remote-tracking branch 'origin/master' into staging

2014-07-28 11:30:49 +02:00

audio

Add NixOS module for Mopidy, a music player daemon

2014-07-28 19:52:32 +02:00

backup

Get all lib functions from lib, not pkgs.lib, in modules

2014-07-02 12:28:18 -04:00

continuous-integration/jenkins

…

databases

nixos/redis: fix evaluation

2014-07-15 17:05:54 +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 remote-tracking branch 'origin/master' into staging

2014-07-07 13:16:26 +02:00

logging

Fix service to use logstash new directory layout

2014-07-21 16:24:18 +01:00

mail

…

misc

In Nix chroots, provide plain bash, not bash-interactive

2014-08-04 16:46:39 +02:00

monitoring

Merge remote-tracking branch 'origin/master' into staging

2014-07-28 11:30:49 +02:00

network-filesystems

Merge remote-tracking branch 'origin/master' into staging

2014-07-07 13:16:26 +02:00

networking

Merge remote-tracking branch 'origin/master' into staging

2014-07-28 11:30:49 +02:00

printing

…

scheduling

Get all lib functions from lib, not pkgs.lib, in modules

2014-07-02 12:28:18 -04:00

search

elasticsearch: Fix error in NixOS module, systemd ExecStart path must be absolute.

2014-07-28 20:12:19 +02:00

security

Get all lib functions from lib, not pkgs.lib, in modules

2014-07-02 12:28:18 -04:00

system

Merge remote-tracking branch 'origin/master' into staging

2014-07-07 13:16:26 +02:00

torrent

…

ttys

Get all lib functions from lib, not pkgs.lib, in modules

2014-07-02 12:28:18 -04:00

web-servers

Merge remote-tracking branch 'origin/master' into staging.

2014-08-04 16:51:47 +02:00

x11

Merge remote-tracking branch 'origin/master' into staging.

2014-08-04 16:51:47 +02:00