From a6d234e9e9916a7a2dc57bda3abef98ea043f097 Mon Sep 17 00:00:00 2001 From: Stefano Mazzucco Date: Wed, 21 Aug 2019 20:21:39 +0100 Subject: 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 --- .../networking/browsers/firefox/wrapper.nix | 4 +- .../compilers/adoptopenjdk-icedtea-web/default.nix | 64 ++++++++++++++++++++++ ...1-make-cargo-work-with-nix-build-on-linux.patch | 46 ++++++++++++++++ pkgs/development/compilers/icedtea-web/default.nix | 64 ---------------------- ...1-make-cargo-work-with-nix-build-on-linux.patch | 46 ---------------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 10 ++-- 7 files changed, 118 insertions(+), 118 deletions(-) create mode 100644 pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix create mode 100644 pkgs/development/compilers/adoptopenjdk-icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch delete mode 100644 pkgs/development/compilers/icedtea-web/default.nix delete mode 100644 pkgs/development/compilers/icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index bc1678335947..ec98dc78478b 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -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 diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix new file mode 100644 index 000000000000..a3c34bd7e8e6 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }: + +stdenv.mkDerivation rec { + pname = "adoptopenjdk-icedtea-web"; + + version = "1.8.3"; + + src = fetchFromGitHub { + owner = "AdoptOpenJDK"; + repo = "IcedTea-Web"; + rev = "${pname}-${version}"; + sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig bc ]; + buildInputs = [ cargo rustc glib xulrunner zip npapi_sdk ]; + + preConfigure = '' + configureFlagsArray+=("BIN_BASH=${bash}/bin/bash") + ''; + + patches = [ ./patches/0001-make-cargo-work-with-nix-build-on-linux.patch ]; + + doCheck = true; + preCheck = '' + # Needed for the below rust-launcher tests to pass + # dirs_paths_helper::tests::check_config_files_paths + # dirs_paths_helper::tests::check_legacy_config_files_paths + + mkdir -p $HOME/.icedtea + touch $HOME/.icedtea/deployment.properties + + mkdir -p $XDG_CONFIG_HOME/icedtea-web + touch $XDG_CONFIG_HOME/icedtea-web/deployment.properties + ''; + + HOME = "/build"; + XDG_CONFIG_HOME = "/build"; + + configureFlags = [ + "--with-itw-libs=DISTRIBUTION" + "--with-jdk-home=${jdk.home}" + "--disable-docs" + ]; + + mozillaPlugin = "/lib"; + + postInstall = '' + mkdir -p $out/share/applications + cp javaws.desktop itweb-settings.desktop policyeditor.desktop $out/share/applications + ''; + + meta = { + description = "Java web browser plugin and an implementation of Java Web Start"; + longDescription = '' + A Free Software web browser plugin running applets written in the Java + programming language and an implementation of Java Web Start, originally + based on the NetX project. + ''; + homepage = https://github.com/adoptopenjdk/icedtea-web; + maintainers = with stdenv.lib.maintainers; [ wizeman ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch b/pkgs/development/compilers/adoptopenjdk-icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch new file mode 100644 index 000000000000..85cad6cf4678 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch @@ -0,0 +1,46 @@ +Subject: [PATCH] make cargo work with nix-build on linux + +--- + .cargo/config | 2 ++ + rust-launcher/Cargo.lock | 4 ++++ + rust-launcher/Cargo.toml | 7 ++++--- + 3 files changed, 10 insertions(+), 3 deletions(-) + create mode 100644 .cargo/config + create mode 100644 rust-launcher/Cargo.lock + +diff --git a/.cargo/config b/.cargo/config +new file mode 100644 +index 0000000..03ec4a2 +--- /dev/null ++++ b/.cargo/config +@@ -0,0 +1,2 @@ ++[net] ++offline=true +diff --git a/rust-launcher/Cargo.lock b/rust-launcher/Cargo.lock +new file mode 100644 +index 0000000..6055cc0 +--- /dev/null ++++ b/rust-launcher/Cargo.lock +@@ -0,0 +1,4 @@ ++[[package]] ++name = "launcher" ++version = "1.8.0" ++ +diff --git a/rust-launcher/Cargo.toml b/rust-launcher/Cargo.toml +index 61ee308..5e6e91b 100644 +--- a/rust-launcher/Cargo.toml ++++ b/rust-launcher/Cargo.toml +@@ -3,6 +3,7 @@ name = "launcher" + version = "1.8.0" + authors = ["https://icedtea.classpath.org/wiki/IcedTea-Web"] + +-[dependencies] +-[target.'cfg(windows)'.dependencies] +-dunce = "0.1.1" ++[workspace] ++# We need this too or cargo will fail. Some files seem to be copied around and ++# cargo thinks we are in a workspace, so let's exclude everything. ++exclude = ["*"] +-- +2.19.2 + diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix deleted file mode 100644 index 73dd90ab4a1f..000000000000 --- a/pkgs/development/compilers/icedtea-web/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }: - -stdenv.mkDerivation rec { - name = "icedtea-web-${version}"; - - version = "1.8.3"; - - src = fetchFromGitHub { - owner = "AdoptOpenJDK"; - repo = "IcedTea-Web"; - rev = name; - sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq"; - }; - - nativeBuildInputs = [ autoreconfHook pkgconfig bc ]; - buildInputs = [ cargo rustc glib xulrunner zip npapi_sdk ]; - - preConfigure = '' - configureFlagsArray+=("BIN_BASH=${bash}/bin/bash") - ''; - - patches = [ ./patches/0001-make-cargo-work-with-nix-build-on-linux.patch ]; - - doCheck = true; - preCheck = '' - # Needed for the below rust-launcher tests to pass - # dirs_paths_helper::tests::check_config_files_paths - # dirs_paths_helper::tests::check_legacy_config_files_paths - - mkdir -p $HOME/.icedtea - touch $HOME/.icedtea/deployment.properties - - mkdir -p $XDG_CONFIG_HOME/icedtea-web - touch $XDG_CONFIG_HOME/icedtea-web/deployment.properties - ''; - - HOME = "/build"; - XDG_CONFIG_HOME = "/build"; - - configureFlags = [ - "--with-itw-libs=DISTRIBUTION" - "--with-jdk-home=${jdk.home}" - "--disable-docs" - ]; - - mozillaPlugin = "/lib"; - - postInstall = '' - mkdir -p $out/share/applications - cp javaws.desktop itweb-settings.desktop policyeditor.desktop $out/share/applications - ''; - - meta = { - description = "Java web browser plugin and an implementation of Java Web Start"; - longDescription = '' - A Free Software web browser plugin running applets written in the Java - programming language and an implementation of Java Web Start, originally - based on the NetX project. - ''; - homepage = https://github.com/adoptopenjdk/icedtea-web; - maintainers = with stdenv.lib.maintainers; [ wizeman ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/compilers/icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch b/pkgs/development/compilers/icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch deleted file mode 100644 index 85cad6cf4678..000000000000 --- a/pkgs/development/compilers/icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch +++ /dev/null @@ -1,46 +0,0 @@ -Subject: [PATCH] make cargo work with nix-build on linux - ---- - .cargo/config | 2 ++ - rust-launcher/Cargo.lock | 4 ++++ - rust-launcher/Cargo.toml | 7 ++++--- - 3 files changed, 10 insertions(+), 3 deletions(-) - create mode 100644 .cargo/config - create mode 100644 rust-launcher/Cargo.lock - -diff --git a/.cargo/config b/.cargo/config -new file mode 100644 -index 0000000..03ec4a2 ---- /dev/null -+++ b/.cargo/config -@@ -0,0 +1,2 @@ -+[net] -+offline=true -diff --git a/rust-launcher/Cargo.lock b/rust-launcher/Cargo.lock -new file mode 100644 -index 0000000..6055cc0 ---- /dev/null -+++ b/rust-launcher/Cargo.lock -@@ -0,0 +1,4 @@ -+[[package]] -+name = "launcher" -+version = "1.8.0" -+ -diff --git a/rust-launcher/Cargo.toml b/rust-launcher/Cargo.toml -index 61ee308..5e6e91b 100644 ---- a/rust-launcher/Cargo.toml -+++ b/rust-launcher/Cargo.toml -@@ -3,6 +3,7 @@ name = "launcher" - version = "1.8.0" - authors = ["https://icedtea.classpath.org/wiki/IcedTea-Web"] - --[dependencies] --[target.'cfg(windows)'.dependencies] --dunce = "0.1.1" -+[workspace] -+# We need this too or cargo will fail. Some files seem to be copied around and -+# cargo thinks we are in a workspace, so let's exclude everything. -+exclude = ["*"] --- -2.19.2 - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f3dbd2efd55b..8468bc193f56 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d270d8e2d0a..4a5fe77011ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }); -- cgit 1.4.1