mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
adoptopenjdk-icedtea-web: rename from icedtea_web
This is a follow up of https://github.com/NixOS/nixpkgs/pull/66422 - rename icedtea_web to adoptopenjdk-icedtea-web to reflect the new governance - add icedtea_web and icedtea8_web to aliases.nix for backwards compatibility - update the attribute name where icedtea_web is used
This commit is contained in:
parent
f20fbeedcf
commit
a6d234e9e9
5 changed files with 10 additions and 10 deletions
|
@ -3,7 +3,7 @@
|
|||
## various stuff that can be plugged in
|
||||
, flashplayer, hal-flash
|
||||
, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd
|
||||
, jrePlugin, icedtea_web
|
||||
, jrePlugin, adoptopenjdk-icedtea-web
|
||||
, bluejeans, djview4, adobe-reader
|
||||
, google_talk_plugin, fribid, gnome3/*.gnome-shell*/
|
||||
, esteidfirefoxplugin
|
||||
|
@ -55,7 +55,7 @@ let
|
|||
++ lib.optional (cfg.enableDjvu or false) (djview4)
|
||||
++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)
|
||||
++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin
|
||||
++ lib.optional icedtea icedtea_web
|
||||
++ lib.optional icedtea adoptopenjdk-icedtea-web
|
||||
++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
|
||||
++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
|
||||
++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "icedtea-web-${version}";
|
||||
pname = "adoptopenjdk-icedtea-web";
|
||||
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdoptOpenJDK";
|
||||
repo = "IcedTea-Web";
|
||||
rev = name;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq";
|
||||
};
|
||||
|
|
@ -149,6 +149,8 @@ mapAliases ({
|
|||
hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25
|
||||
htmlTidy = html-tidy; # added 2014-12-06
|
||||
iana_etc = iana-etc; # added 2017-03-08
|
||||
icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21
|
||||
icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21
|
||||
idea = jetbrains; # added 2017-04-03
|
||||
infiniband-diags = rdma-core; # added 2019-08-09
|
||||
inotifyTools = inotify-tools;
|
||||
|
|
|
@ -7275,6 +7275,10 @@ in
|
|||
adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11;
|
||||
adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11;
|
||||
|
||||
adoptopenjdk-icedtea-web = callPackage ../development/compilers/adoptopenjdk-icedtea-web {
|
||||
jdk = jdk8;
|
||||
};
|
||||
|
||||
aldor = callPackage ../development/compilers/aldor { };
|
||||
|
||||
aliceml = callPackage ../development/compilers/aliceml { };
|
||||
|
@ -7830,12 +7834,6 @@ in
|
|||
|
||||
gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { };
|
||||
|
||||
icedtea8_web = callPackage ../development/compilers/icedtea-web {
|
||||
jdk = jdk8;
|
||||
};
|
||||
|
||||
icedtea_web = icedtea8_web;
|
||||
|
||||
idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules {
|
||||
idris-no-deps = haskellPackages.idris;
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue