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

Merge pull request #99172 from mkg20001/spidermonkey-38

Browse Source
This commit is contained in:
Maciej Krüger 2020-10-01 16:39:09 +02:00 committed by GitHub
commit b3f8d3b80d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/browsers/elinks/default.nix
View File

@ -4,7 +4,7 @@
enableGuile ? false, guile ? null
, enablePython ? false, python ? null
, enablePerl ? (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null
, enableSpidermonkey ? (stdenv.hostPlatform == stdenv.buildPlatform), spidermonkey ? null
, enableSpidermonkey ? (stdenv.hostPlatform == stdenv.buildPlatform), spidermonkey_38 ? null
}:
assert enableGuile -> guile != null;
@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional enableGuile guile
++ stdenv.lib.optional enablePython python
++ stdenv.lib.optional enablePerl perl
++ stdenv.lib.optional enableSpidermonkey spidermonkey
++ stdenv.lib.optional enableSpidermonkey spidermonkey_38
;
nativeBuildInputs = [ autoconf automake gettext pkgconfig ];
configureFlags = [
@ -50,9 +50,9 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optional enableGuile "--with-guile"
++ stdenv.lib.optional enablePython "--with-python"
++ stdenv.lib.optional enablePerl "--with-perl"
++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey}"
++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey_38}"
;
preConfigure = ''
patchShebangs ./autogen.sh
./autogen.sh

4
pkgs/applications/networking/pyload/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey }:
{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey_38 }:
let
beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix {
@ -30,7 +30,7 @@ in pythonPackages.buildPythonApplication rec {
in [ configParserPatch setupPyPatch ];
buildInputs = [
unrar rhino spidermonkey gocr pythonPackages.paver
unrar rhino spidermonkey_38 gocr pythonPackages.paver
];
propagatedBuildInputs = with pythonPackages; [

1
pkgs/development/interpreters/spidermonkey/38.nix
View File

@ -67,5 +67,6 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.abbradar ];
platforms = platforms.unix;
knownVulnerabilities = [ "SpiderMonkey 38 is outdated and contains known security vulnerabilities." ]; # as per https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38
};
}

4
pkgs/tools/misc/plowshare/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey }:
{ stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_38 }:
stdenv.mkDerivation rec {
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
make PREFIX="$out" install
for fn in plow{del,down,list,mod,probe,up}; do
wrapProgram "$out/bin/$fn" --prefix PATH : "${stdenv.lib.makeBinPath [ curl recode spidermonkey ]}"
wrapProgram "$out/bin/$fn" --prefix PATH : "${stdenv.lib.makeBinPath [ curl recode spidermonkey_38 ]}"
done
'';

4
pkgs/tools/text/jsawk/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, makeWrapper, spidermonkey }:
{ stdenv, fetchFromGitHub, makeWrapper, spidermonkey_38 }:
stdenv.mkDerivation {
pname = "jsawk";
@ -15,7 +15,7 @@ stdenv.mkDerivation {
mkdir -p $out/bin
cp $src/jsawk $out/bin/
wrapProgram $out/bin/jsawk \
--prefix PATH : "${spidermonkey}/bin"
--prefix PATH : "${spidermonkey_38}/bin"
'';
meta = {

1
pkgs/top-level/aliases.nix
View File

@ -659,6 +659,7 @@ mapAliases ({
youtubeDL = youtube-dl; # added 2014-10-26
zdfmediathk = mediathekview; # added 2019-01-19
gnome_user_docs = gnome-user-docs; # added 2019-11-20
spidermonkey = spidermonkey_68; # added 2020-09-30
# TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03
# branch-off