From 7b5864db179bd6111c9e82cd3f35b4738f650c6a Mon Sep 17 00:00:00 2001
From: WORLDofPEACE <worldofpeace@protonmail.ch>
Date: Fri, 9 Oct 2020 13:42:05 -0400
Subject: [PATCH] treewide: don't use spidermonkey attr
---
pkgs/servers/http/couchdb/2.0.0.nix | 4 ++--
pkgs/servers/http/couchdb/default.nix | 4 ++--
pkgs/servers/mediatomb/default.nix | 4 ++--
pkgs/top-level/all-packages.nix | 3 ---
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix
index 8396e3511ec4..737947c0524b 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_68
+{ 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_68 (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/default.nix b/pkgs/servers/http/couchdb/default.nix
index 07f353e87493..b484cce15a26 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_68, 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_68 curl ];
+ buildInputs = [ erlang icu openssl spidermonkey_1_8_5 curl ];
postInstall = ''
substituteInPlace $out/bin/couchdb --replace getopt "${getopt}/bin/getopt"
diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix
index d996a6ad0ef2..ff3d31ea2e72 100644
--- a/pkgs/servers/mediatomb/default.nix
+++ b/pkgs/servers/mediatomb/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchgit
-, sqlite, expat, mp4v2, flac, spidermonkey, taglib, libexif, curl, ffmpeg_3, file
+, sqlite, expat, mp4v2, flac, spidermonkey_68, taglib, libexif, curl, ffmpeg_3, file
, pkgconfig, autoreconfHook }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1mimslr4q6mky865y6561rr64cbn4gf0qc2dhgb31hxp4rc1kmzd";
};
- buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg_3 file mp4v2 flac
+ buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg_3 file mp4v2 flac
pkgconfig autoreconfHook ];
meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 614af626d413..259fff1ec9a1 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;
};