Merge pull request #100089 from mkg20001/spidm

spidermonkey: drop from all-packages, add to aliases
This commit is contained in:
WORLDofPEACE 2020-10-09 12:09:18 -04:00 committed by GitHub
commit 2023cbe998
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View File

@ -662,6 +662,8 @@ 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 is not ABI upwards-ompatible, so only allow this for nix-shell
spidermonkey = spidermonkey_78; # added 2020-10-09
# TODO(ekleog): add wasm alias to ocamlPackages.wasm after 19.03
# branch-off

View File

@ -10389,7 +10389,6 @@ in
spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { };
spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { };
spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { };
spidermonkey = spidermonkey_68;
ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { };
ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { };