From b1062d4dcdafdcdb36ad5939f2c3a438eb02e902 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont (@ardumont)" Date: Thu, 8 Oct 2020 12:42:10 +0200 Subject: [PATCH] Drop spidermonkey from aliases It's already aliased in all-packages. This creates issues at least for the mediatomb build. Related to #93450#issuecomment-705408544 --- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 645d70bc316..5695f7d8f1e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -661,7 +661,6 @@ 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c60cfea4e87..8ce4fa075fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10364,7 +10364,7 @@ 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_38; + spidermonkey = spidermonkey_68; ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { };