public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #67214 from stefano-m/master 

adoptopenjdk-icedtea-web: rename from icedtea_web
This commit is contained in:
worldofpeace 2019-08-23 16:43:52 -04:00 committed by GitHub
parent eaf95bef86 a6d234e9e9
commit 0552f4dc73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -3,7 +3,7 @@
## various stuff that can be plugged in ## various stuff that can be plugged in
, flashplayer, hal-flash , flashplayer, hal-flash
, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd , MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd
, jrePlugin, icedtea_web , jrePlugin, adoptopenjdk-icedtea-web
, bluejeans, djview4, adobe-reader , bluejeans, djview4, adobe-reader
, google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , google_talk_plugin, fribid, gnome3/*.gnome-shell*/
, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow
@ -54,7 +54,7 @@ let
++ lib.optional (cfg.enableDjvu or false) (djview4) ++ lib.optional (cfg.enableDjvu or false) (djview4)
++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)
++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin ++ 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.enableGoogleTalkPlugin or false) google_talk_plugin
++ lib.optional (cfg.enableFriBIDPlugin or false) fribid ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell

4
pkgs/development/compilers/icedtea-web/default.nix → pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }: { stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "icedtea-web-${version}"; pname = "adoptopenjdk-icedtea-web";
version = "1.8.3"; version = "1.8.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AdoptOpenJDK"; owner = "AdoptOpenJDK";
repo = "IcedTea-Web"; repo = "IcedTea-Web";
rev = name; rev = "${pname}-${version}";
sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq"; sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq";
}; };

0
pkgs/development/compilers/icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch → pkgs/development/compilers/adoptopenjdk-icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch
View File

2
pkgs/top-level/aliases.nix
View File

@ -150,6 +150,8 @@ mapAliases ({
hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25
htmlTidy = html-tidy; # added 2014-12-06 htmlTidy = html-tidy; # added 2014-12-06
iana_etc = iana-etc; # added 2017-03-08 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 idea = jetbrains; # added 2017-04-03
infiniband-diags = rdma-core; # added 2019-08-09 infiniband-diags = rdma-core; # added 2019-08-09
inotifyTools = inotify-tools; inotifyTools = inotify-tools;

10
pkgs/top-level/all-packages.nix
View File

@ -7325,6 +7325,10 @@ in
adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11; adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11;
adoptopenjdk-jre-bin = adoptopenjdk-jre-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 { }; aldor = callPackage ../development/compilers/aldor { };
aliceml = callPackage ../development/compilers/aliceml { }; aliceml = callPackage ../development/compilers/aliceml { };
@ -7880,12 +7884,6 @@ in
gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; 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 { idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules {
idris-no-deps = haskellPackages.idris; idris-no-deps = haskellPackages.idris;
}); });