summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-07 13:16:26 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-07 13:16:26 +0200
commit95b828de42adaa2f825e5588d1cccb0d6398b20a (patch)
treeabfa4798c91b9932173212e7fbc6e5f7bd85f5d6 /pkgs/servers
parent421ce6439c2e685065fe9c256b751225de51e0b3 (diff)
parent1ecae5c2c123c0ca615d011b9ce32f501198e7c4 (diff)
downloadnixpkgs-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar
nixpkgs-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.gz
nixpkgs-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.bz2
nixpkgs-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.lz
nixpkgs-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.xz
nixpkgs-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.zst
nixpkgs-95b828de42adaa2f825e5588d1cccb0d6398b20a.zip
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/http/couchdb/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix
index 36d932c1ace..35d4ebbf89f 100644
--- a/pkgs/servers/http/couchdb/default.nix
+++ b/pkgs/servers/http/couchdb/default.nix
@@ -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