spidermonkey: remove spidermonkey_38 -> spidermonkey alias

This removes the spidermonkey alias and renames it in the packages still
using it

Not sure if we need it in aliases.nix since just about nothing depends
on it anymore

Additionally considering removal should be a good choice, it's at least
insecure so it should get tagged as such
This commit is contained in:
Maciej Krüger 2020-09-30 16:00:56 +02:00
parent 7779eb31c5
commit 946369adbd
No known key found for this signature in database
GPG Key ID: 0D948CE19CF49C5F
5 changed files with 12 additions and 11 deletions

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

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; [

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
'';

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 = {

View File

@ -658,6 +658,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