diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix index 3f6f00e1bdb..737947c0524 100644 --- a/pkgs/servers/http/couchdb/2.0.0.nix +++ b/pkgs/servers/http/couchdb/2.0.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey +{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5 , coreutils, bash, makeWrapper, python3 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ erlang icu openssl spidermonkey (python3.withPackages(ps: with ps; [ requests ]))]; + buildInputs = [ erlang icu openssl spidermonkey_1_8_5 (python3.withPackages(ps: with ps; [ requests ]))]; patches = [ ./jsapi.patch ]; postPatch = '' diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/servers/http/couchdb/3.nix index 3716afae490..18271e82a8f 100644 --- a/pkgs/servers/http/couchdb/3.nix +++ b/pkgs/servers/http/couchdb/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey +{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_68 , coreutils, bash, makeWrapper, python3 }: stdenv.mkDerivation rec { @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { sha256 = "1vgqj3zsrkdqgnwzji3mqkapnfd6kq466f5xnya0fvzzl6bcfrs8"; }; - buildInputs = [ erlang icu openssl spidermonkey (python3.withPackages(ps: with ps; [ requests ]))]; + buildInputs = [ erlang icu openssl spidermonkey_68 (python3.withPackages(ps: with ps; [ requests ]))]; postPatch = '' - substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-68' "${spidermonkey.dev}/include/mozjs-68" + substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-68' "${spidermonkey_68.dev}/include/mozjs-68" patchShebangs bin/rebar ''; diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index b8807532181..b484cce15a2 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man +{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5, curl, help2man , sphinx, which, file, pkgconfig, getopt }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ help2man which file pkgconfig sphinx ]; - buildInputs = [ erlang icu openssl spidermonkey curl ]; + buildInputs = [ erlang icu openssl spidermonkey_1_8_5 curl ]; postInstall = '' substituteInPlace $out/bin/couchdb --replace getopt "${getopt}/bin/getopt" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 614af626d41..259fff1ec9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16418,18 +16418,15 @@ in }; couchdb = callPackage ../servers/http/couchdb { - spidermonkey = spidermonkey_1_8_5; sphinx = python27Packages.sphinx; erlang = erlangR19; }; couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix { - spidermonkey = spidermonkey_1_8_5; erlang = erlangR21; }; couchdb3 = callPackage ../servers/http/couchdb/3.nix { - spidermonkey = spidermonkey_68; erlang = erlangR22; };