git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #67214 from stefano-m/master

adoptopenjdk-icedtea-web: rename from icedtea_web

commit0552f4dc737123f5f458c64eccee0e11cfeb9b99 authorworldofpeace <worldofpeace@protonmail.ch> dateFri 23 Aug 2019, 16:43 (7 years ago) parenteaf95bea6d234e
5 files changed+10−10
pkgs/applications/networking/browsers/firefox/wrapper.nix+2−2 pkgs/development/compilers/icedtea-web/default.nix → pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix+2−2 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 pkgs/top-level/aliases.nix+2 pkgs/top-level/all-packages.nix+4−6
pkgs/applications/networking/browsers/firefox/wrapper.nix+2−2
@@ -3,7 +3,7 @@
33## various stuff that can be plugged in
44, flashplayer, hal-flash
55, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd
6−, jrePlugin, icedtea_web
6+, jrePlugin, adoptopenjdk-icedtea-web
77, bluejeans, djview4, adobe-reader
88, google_talk_plugin, fribid, gnome3/*.gnome-shell*/
99, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow
@@ -54,7 +54,7 @@ let
5454 ++ lib.optional (cfg.enableDjvu or false) (djview4)
5555 ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)
5656 ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin
57− ++ lib.optional icedtea icedtea_web
57+ ++ lib.optional icedtea adoptopenjdk-icedtea-web
5858 ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
5959 ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
6060 ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell
pkgs/development/compilers/icedtea-web/default.nix → pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nixrenamed+2−2
@@ -1,14 +1,14 @@
11{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }:
22
33stdenv.mkDerivation rec {
4− name = "icedtea-web-${version}";
4+ pname = "adoptopenjdk-icedtea-web";
55
66 version = "1.8.3";
77
88 src = fetchFromGitHub {
99 owner = "AdoptOpenJDK";
1010 repo = "IcedTea-Web";
11− rev = name;
11+ rev = "${pname}-${version}";
1212 sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq";
1313 };
1414
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.patchrenamed

The content is the same.

pkgs/top-level/aliases.nix+2
@@ -150,6 +150,8 @@ mapAliases ({
150150 hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25
151151 htmlTidy = html-tidy; # added 2014-12-06
152152 iana_etc = iana-etc; # added 2017-03-08
153+ icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21
154+ icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21
153155 idea = jetbrains; # added 2017-04-03
154156 infiniband-diags = rdma-core; # added 2019-08-09
155157 inotifyTools = inotify-tools;
pkgs/top-level/all-packages.nix+4−6
@@ -7325,6 +7325,10 @@ in
73257325 adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11;
73267326 adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11;
73277327
7328+ adoptopenjdk-icedtea-web = callPackage ../development/compilers/adoptopenjdk-icedtea-web {
7329+ jdk = jdk8;
7330+ };
7331+
73287332 aldor = callPackage ../development/compilers/aldor { };
73297333
73307334 aliceml = callPackage ../development/compilers/aliceml { };
@@ -7880,12 +7884,6 @@ in
78807884
78817885 gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { };
78827886
7883− icedtea8_web = callPackage ../development/compilers/icedtea-web {
7884− jdk = jdk8;
7885− };
7886−
7887− icedtea_web = icedtea8_web;
7888−
78897887 idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules {
78907888 idris-no-deps = haskellPackages.idris;
78917889 });