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
@@ -3,11 +3,11 @@

 stdenv.mkDerivation rec {
  name = "couchdb-${version}";
-  version = "1.5.1";
+  version = "1.6.0";

  src = fetchurl {
    url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
-    sha256 = "0isddp29zh72idgwjaswqy887c1fwx5g1lwlbzscwcv6q70xrmfr";
+    sha256 = "0m4k7i3gibzzcabssysv42rmdr89myppc6765xr0jggwkwdxgxmx";
  };

  buildInputs = [ erlang icu openssl spidermonkey curl help2man sphinx which