diff options
author | Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org> | 2020-10-08 12:42:10 +0200 |
---|---|---|
committer | Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org> | 2020-10-08 12:43:01 +0200 |
commit | b1062d4dcdafdcdb36ad5939f2c3a438eb02e902 (patch) | |
tree | 3e77a082598eed57eb825a4531bc6511de41b4f6 /pkgs/top-level | |
parent | 420f89ceb267b461eed5d025b6c3c0e57703cc5c (diff) |
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
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 645d70bc3161..5695f7d8f1e3 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 c60cfea4e876..8ce4fa075fee 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 { }; |