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

2014-07-07 13:16:26 +02:00
parent 421ce6439c 1ecae5c2c1
commit 95b828de42
224 changed files with 1831 additions and 665 deletions
--- a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix
@@ -1,8 +1,8 @@
-{ config, pkgs, serverInfo, ... }:
+{ config, pkgs, serverInfo, lib, ... }:

 let
  inherit (pkgs) mercurial;
-  inherit (pkgs.lib) mkOption;
+  inherit (lib) mkOption;

  urlPrefix = config.urlPrefix;