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

2014-07-14 17:04:55 +02:00
parent 0b82b95322 b57bc220cc
commit ff97b7dbe6
1429 changed files with 4283 additions and 353 deletions
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -79,6 +79,8 @@ let
      sha256 = "07z5j8d988cdg4ml4n0vs9fwmj0p594ibbqdid16faxwqm52dkhl";
    };

+    patches = [ ./mediawiki-postgresql-fixes.patch ];
+
    skins = config.skins;

    buildPhase =