git.iko.soy/typeable/nixpkgs
on master help sign in
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

commita6d234e9e9916a7a2dc57bda3abef98ea043f097 authorStefano Mazzucco <stefano@curso.re> dateWed 21 Aug 2019, 20:21 (7 years ago) parentf20fbee
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, esteidfirefoxplugin
@@ -55,7 +55,7 @@ let
5555 ++ lib.optional (cfg.enableDjvu or false) (djview4)
5656 ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)
5757 ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin
58− ++ lib.optional icedtea icedtea_web
58+ ++ lib.optional icedtea adoptopenjdk-icedtea-web
5959 ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
6060 ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
6161 ++ 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
@@ -149,6 +149,8 @@ mapAliases ({
149149 hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25
150150 htmlTidy = html-tidy; # added 2014-12-06
151151 iana_etc = iana-etc; # added 2017-03-08
152+ icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21
153+ icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21
152154 idea = jetbrains; # added 2017-04-03
153155 infiniband-diags = rdma-core; # added 2019-08-09
154156 inotifyTools = inotify-tools;
pkgs/top-level/all-packages.nix+4−6
@@ -7275,6 +7275,10 @@ in
72757275 adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11;
72767276 adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11;
72777277
7278+ adoptopenjdk-icedtea-web = callPackage ../development/compilers/adoptopenjdk-icedtea-web {
7279+ jdk = jdk8;
7280+ };
7281+
72787282 aldor = callPackage ../development/compilers/aldor { };
72797283
72807284 aliceml = callPackage ../development/compilers/aliceml { };
@@ -7830,12 +7834,6 @@ in
78307834
78317835 gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { };
78327836
7833− icedtea8_web = callPackage ../development/compilers/icedtea-web {
7834− jdk = jdk8;
7835− };
7836−
7837− icedtea_web = icedtea8_web;
7838−
78397837 idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules {
78407838 idris-no-deps = haskellPackages.idris;
78417839 });