Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: eaf95bef8673
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0552f4dc7371
Choose a head ref
  • 2 commits
  • 5 files changed
  • 2 contributors

Commits on Aug 23, 2019

  1. adoptopenjdk-icedtea-web: rename from icedtea_web 

    This is a follow up of #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
    @stefano-m
    stefano-m committed Aug 23, 2019
    1
    Copy the full SHA
    a6d234e View commit details

  2. Merge pull request #67214 from stefano-m/master 

    adoptopenjdk-icedtea-web: rename from icedtea_web
    @worldofpeace
    worldofpeace authored Aug 23, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0552f4d View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/firefox/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -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*/
, 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.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
4 changes: 2 additions & 2 deletions ...lopment/compilers/icedtea-web/default.nix → ...lers/adoptopenjdk-icedtea-web/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
};

0 ...-cargo-work-with-nix-build-on-linux.patch → ...-cargo-work-with-nix-build-on-linux.patch
View file
File renamed without changes.
2 changes: 2 additions & 0 deletions pkgs/top-level/aliases.nix
View file
Original file line number Diff line number Diff line change
@@ -150,6 +150,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;
10 changes: 4 additions & 6 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -7325,6 +7325,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 { };
@@ -7880,12 +7884,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;
});