Skip to content

treewide: don't use spidermonkey attr #100095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
worldofpeace merged 3 commits into from
Oct 9, 2020
Merged

treewide: don't use spidermonkey attr #100095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be95ee6
Revert "treewide: Use spidermonkey_68 explicitly"
worldofpeace Oct 9, 2020
b89c851
Revert "couchdb: revert changes from 0da82de388a5214522262a3885080bad…
worldofpeace Oct 9, 2020
7b5864d
treewide: don't use spidermonkey attr
worldofpeace Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/servers/http/couchdb/2.0.0.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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 = ''
Expand Down
6 changes: 3 additions & 3 deletions pkgs/servers/http/couchdb/3.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey
{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey_68
, coreutils, bash, makeWrapper, python3 }:

stdenv.mkDerivation rec {
Expand All @@ -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
'';

Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/http/couchdb/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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"
Expand Down
3 changes: 0 additions & 3 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

Expand Down