Skip to content

Commit 6f4c2af

Browse files
authored
Merge pull request NixOS#117089 from helsinki-systems/drop/spidermonkey_60
spidermonkey_60: drop
2 parents 6259a47 + e3e8b48 commit 6f4c2af

File tree

3 files changed

+2
-85
lines changed

3 files changed

+2
-85
lines changed

pkgs/development/interpreters/spidermonkey/60.nix

Lines changed: 0 additions & 83 deletions
This file was deleted.

pkgs/top-level/aliases.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,8 @@ mapAliases ({
694694
speedtest_cli = speedtest-cli; # added 2015-02-17
695695
spice_gtk = spice-gtk; # added 2018-02-25
696696
spice_protocol = spice-protocol; # added 2018-02-25
697-
spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_60 instead."; # added 2019-10-16
697+
spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead."; # added 2019-10-16
698+
spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21
698699
spring-boot = spring-boot-cli; # added 2020-04-24
699700
sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22
700701
sqliteInteractive = sqlite-interactive; # added 2014-12-06

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11796,7 +11796,6 @@ in
1179611796
} // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
1179711797
stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
1179811798
}));
11799-
spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { };
1180011799
spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { };
1180111800
spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { };
1180211801

0 commit comments

Comments
 (0)