From 556ad0d6a89f37c15a9f7352a8ba024bc3448f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 9 Oct 2020 16:53:07 +0200 Subject: [PATCH] spidermonkey: drop from all-packages, add to aliases --- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5695f7d8f1e3..8449322b22af 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -661,6 +661,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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d9771403a6a..570854331853 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10387,7 +10387,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 { };