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
..
default.nix	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
mediawiki-postgresql-fixes.patch	mediawiki: add patch for fixing postgresql errors	2014-07-07 23:19:31 +08:00
mediawiki.nix	Merge remote-tracking branch 'origin/master' into staging	2014-07-14 17:04:55 +02:00
mercurial.nix	Merge remote-tracking branch 'origin/master' into staging	2014-07-07 13:16:26 +02:00
per-server-options.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
phabricator.nix	Phabricator, a web application, snapshot of 2014-05-12	2014-05-12 19:59:40 +02:00
tomcat-connector.nix	Fix lib functions taken from pkgs.lib instead of lib in nixos	2014-08-01 16:23:56 -04:00
trac.nix	Remove use of obsolete flags	2014-04-29 10:13:21 +02:00
zabbix.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00