diff options
| author | Maciej Krüger <mkg20001@gmail.com> | 2020-10-09 16:53:07 +0200 |
|---|---|---|
| committer | Maciej Krüger <mkg20001@gmail.com> | 2020-10-09 16:53:07 +0200 |
| commit | 556ad0d6a89f37c15a9f7352a8ba024bc3448f1b (patch) | |
| tree | da67fb1ecaacc57d997c69f76d4b9da15e2b36d8 | |
| parent | f174a84d33c66defc15e252422be6d6afaec2314 (diff) | |
| download | nixpkgs-556ad0d6a89f37c15a9f7352a8ba024bc3448f1b.tar nixpkgs-556ad0d6a89f37c15a9f7352a8ba024bc3448f1b.tar.gz nixpkgs-556ad0d6a89f37c15a9f7352a8ba024bc3448f1b.tar.bz2 nixpkgs-556ad0d6a89f37c15a9f7352a8ba024bc3448f1b.tar.lz nixpkgs-556ad0d6a89f37c15a9f7352a8ba024bc3448f1b.tar.xz nixpkgs-556ad0d6a89f37c15a9f7352a8ba024bc3448f1b.tar.zst nixpkgs-556ad0d6a89f37c15a9f7352a8ba024bc3448f1b.zip | |
spidermonkey: drop from all-packages, add to aliases
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5695f7d8f1e..8449322b22a 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 8d9771403a6..57085433185 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 { }; |