Merge recent master into staging

Hydra nixpkgs: ?compare=1151601
2014-09-13 21:44:45 +02:00
parent 6a63d1e1e1
commit d957b4bd78
138 changed files with 9314 additions and 7050 deletions
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, curl, libgcrypt}:

 stdenv.mkDerivation rec {
-  name = "libmicrohttpd-0.9.35";
+  name = "libmicrohttpd-0.9.37";

  src = fetchurl {
    url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
-    sha256 = "1z0h6llx7pra78358ryi3bdh8p0ns0bn97n6bl0fj6cib9cz2pdw";
+    sha256 = "1p3wnhr43v6vqdgl86r76298wjfxz2ihj9zh9kpz8l7va30br357";
  };

  buildInputs = [ curl libgcrypt ];