JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #100095 from worldofpeace/eval-fix

Browse Source 
treewide: don't use spidermonkey attr
This commit is contained in:
WORLDofPEACE 2020-10-09 17:09:49 -04:00 committed by GitHub
commit b863ef1e5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/http/couchdb/2.0.0.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey { stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5
, coreutils, bash, makeWrapper, python3 }: , coreutils, bash, makeWrapper, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ makeWrapper ]; 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 ]; patches = [ ./jsapi.patch ];
postPatch = '' postPatch = ''

6
pkgs/servers/http/couchdb/3.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey { stdenv, fetchurl, erlang, icu, openssl, spidermonkey_68
, coreutils, bash, makeWrapper, python3 }: , coreutils, bash, makeWrapper, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "1vgqj3zsrkdqgnwzji3mqkapnfd6kq466f5xnya0fvzzl6bcfrs8"; 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 = '' 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 patchShebangs bin/rebar
''; '';

4
pkgs/servers/http/couchdb/default.nix
View File

@ -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 }: , sphinx, which, file, pkgconfig, getopt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ help2man which file pkgconfig sphinx ]; nativeBuildInputs = [ help2man which file pkgconfig sphinx ];
buildInputs = [ erlang icu openssl spidermonkey curl ]; buildInputs = [ erlang icu openssl spidermonkey_1_8_5 curl ];
postInstall = '' postInstall = ''
substituteInPlace $out/bin/couchdb --replace getopt "${getopt}/bin/getopt" substituteInPlace $out/bin/couchdb --replace getopt "${getopt}/bin/getopt"

3
pkgs/top-level/all-packages.nix
View File

@ -16418,18 +16418,15 @@ in
}; };
couchdb = callPackage ../servers/http/couchdb { couchdb = callPackage ../servers/http/couchdb {
spidermonkey = spidermonkey_1_8_5;
sphinx = python27Packages.sphinx; sphinx = python27Packages.sphinx;
erlang = erlangR19; erlang = erlangR19;
}; };
couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix { couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix {
spidermonkey = spidermonkey_1_8_5;
erlang = erlangR21; erlang = erlangR21;
}; };
couchdb3 = callPackage ../servers/http/couchdb/3.nix { couchdb3 = callPackage ../servers/http/couchdb/3.nix {
spidermonkey = spidermonkey_68;
erlang = erlangR22; erlang = erlangR22;
}; };