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

treewide: Use spidermonkey_68 explicitly

Browse Source 
A fix for #100089 which caused ofborg eval errors on all PRs due to
usage of aliases in couchdb and mediatomb.
This commit is contained in:
Doron Behar
2020-10-09 20:47:45 +03:00
parent a4bbb8a5af
commit 0da82de388
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/http/couchdb/2.0.0.nix
+2 -2
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 {
@@ -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_68 (python3.withPackages(ps: with ps; [ requests ]))];
patches = [ ./jsapi.patch ]; patches = [ ./jsapi.patch ];
postPatch = '' postPatch = ''
pkgs/servers/http/couchdb/3.nix
+3 -3
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
''; '';
pkgs/servers/http/couchdb/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man { stdenv, fetchurl, erlang, icu, openssl, spidermonkey_68, 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_68 curl ];
postInstall = '' postInstall = ''
substituteInPlace $out/bin/couchdb --replace getopt "${getopt}/bin/getopt" substituteInPlace $out/bin/couchdb --replace getopt "${getopt}/bin/getopt"
pkgs/servers/mediatomb/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchgit { 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 }: , pkgconfig, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1mimslr4q6mky865y6561rr64cbn4gf0qc2dhgb31hxp4rc1kmzd"; 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 ]; pkgconfig autoreconfHook ];
meta = with stdenv.lib; { meta = with stdenv.lib; {