Merge master into x-updates

Conflicts (trivial): pkgs/games/spring/default.nix
2014-02-10 19:15:58 +01:00
parent 74c34763e7 3269027235
commit dfdf164f87
76 changed files with 919 additions and 441 deletions
--- a/pkgs/data/fonts/andagii/default.nix
+++ b/pkgs/data/fonts/andagii/default.nix
@@ -19,6 +19,7 @@ in
 rec {
  src = a.fetchurl {
    url = sourceInfo.url;
+    curlOpts = "--user-agent 'Mozilla/5.0'";
    sha256 = sourceInfo.hash;
  };