about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorYorick van Pelt <yorick@yorickvanpelt.nl>2019-07-16 10:35:47 +0200
committerYorick van Pelt <yorick@yorickvanpelt.nl>2019-07-16 10:35:47 +0200
commita9baaf90f603615c81f2a546db49fb2c993f68ab (patch)
tree5edd07797719804281a3108e2dab7bb7172d4f40 /pkgs
parent333208a990bf4e92be3eaabeb8d48441709c74d1 (diff)
downloadnixlib-a9baaf90f603615c81f2a546db49fb2c993f68ab.tar
nixlib-a9baaf90f603615c81f2a546db49fb2c993f68ab.tar.gz
nixlib-a9baaf90f603615c81f2a546db49fb2c993f68ab.tar.bz2
nixlib-a9baaf90f603615c81f2a546db49fb2c993f68ab.tar.lz
nixlib-a9baaf90f603615c81f2a546db49fb2c993f68ab.tar.xz
nixlib-a9baaf90f603615c81f2a546db49fb2c993f68ab.tar.zst
nixlib-a9baaf90f603615c81f2a546db49fb2c993f68ab.zip
couchdb2: pin to erlangR21
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/servers/http/couchdb/2.0.0.nix2
-rw-r--r--pkgs/top-level/all-packages.nix1
2 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix
index 650b9053191d..cb630c266880 100644
--- a/pkgs/servers/http/couchdb/2.0.0.nix
+++ b/pkgs/servers/http/couchdb/2.0.0.nix
@@ -5,6 +5,8 @@ stdenv.mkDerivation rec {
   name = "couchdb-${version}";
   version = "2.3.0";
 
+  # when updating this, please consider bumping the OTP version
+  # in all-packages.nix
   src = fetchurl {
     url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
     sha256 = "0lpk64n6fip85j1jz59kq20jdliwv6mh8j2h5zyxjn5i8b86hf0b";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1acc477c0664..6ef3249f682d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14235,6 +14235,7 @@ in
 
   couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix {
     spidermonkey = spidermonkey_1_8_5;
+    erlang = erlangR21;
   };
 
   couchpotato = callPackage ../servers/couchpotato {};