From e11a487567fcc5f43aa13312969c6fc995f4ade0 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:11:30 +0200 Subject: [PATCH 01/11] josm: use latest jdk --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3273cb51db..97e6f7598fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21456,7 +21456,7 @@ in joe = callPackage ../applications/editors/joe { }; - josm = callPackage ../applications/misc/josm { jre = jdk11; }; + josm = callPackage ../applications/misc/josm { }; jwm = callPackage ../applications/window-managers/jwm { }; From aabe6e23a688bbfe81685984f05706e9c945056c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:12:33 +0200 Subject: [PATCH 02/11] dbeaver: use latest jdk --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97e6f7598fa..b4ceb8a0c48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3049,9 +3049,7 @@ in davfs2 = callPackage ../tools/filesystems/davfs2 { }; - dbeaver = callPackage ../applications/misc/dbeaver { - jdk = jdk11; - }; + dbeaver = callPackage ../applications/misc/dbeaver { }; dbench = callPackage ../development/tools/misc/dbench { }; From 8ba71cef5d814042962b4e046d6a35c1595d2bbd Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:13:56 +0200 Subject: [PATCH 03/11] mediathekview: use latest jre --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4ceb8a0c48..befcbedf4c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21911,7 +21911,7 @@ in mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; - mediathekview = callPackage ../applications/video/mediathekview { jre = openjdk11; }; + mediathekview = callPackage ../applications/video/mediathekview { }; meteo = callPackage ../applications/networking/weather/meteo { }; From 01fed03489631636e90b1d376fbfc194d93622fd Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:17:02 +0200 Subject: [PATCH 04/11] closurecompiler: use latest jdk --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index befcbedf4c8..77a573e26b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8577,9 +8577,7 @@ in clean = callPackage ../development/compilers/clean { }; - closurecompiler = callPackage ../development/compilers/closure { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + closurecompiler = callPackage ../development/compilers/closure { }; cmdstan = callPackage ../development/compilers/cmdstan { }; From 9481828bd9632a3f26c8608487dbfe5cf2e22bc9 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:17:10 +0200 Subject: [PATCH 05/11] emscripten: use latest jdk --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77a573e26b4..bb858e5197d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3429,9 +3429,7 @@ in choose = callPackage ../tools/text/choose { }; - emscripten = callPackage ../development/compilers/emscripten { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + emscripten = callPackage ../development/compilers/emscripten { }; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); From 84a0da26d0a26f398d16f75045c295adf368b05f Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:19:00 +0200 Subject: [PATCH 06/11] runelite: use latest jdk --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb858e5197d..9dd438e4a11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6779,9 +6779,7 @@ in rubocop = callPackage ../development/tools/rubocop { }; - runelite = callPackage ../games/runelite { - jre = openjdk11; - }; + runelite = callPackage ../games/runelite { }; runningx = callPackage ../tools/X11/runningx { }; From 5e46e2a783229a75d4eadd57dce7d8331b71f29d Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:21:16 +0200 Subject: [PATCH 07/11] awstats: use latest jdk --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9dd438e4a11..b06ecdc188e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1251,9 +1251,7 @@ in aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { }; - awstats = callPackage ../tools/system/awstats { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + awstats = callPackage ../tools/system/awstats { }; awsweeper = callPackage ../tools/admin/awsweeper { }; From 3426068afe541afb3b8c18beb6fb3850d5381701 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:23:20 +0200 Subject: [PATCH 08/11] arduino: use latest jdk --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b06ecdc188e..7858cee135a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -743,9 +743,7 @@ in arduino-cli = callPackage ../development/arduino/arduino-cli { }; - arduino-core = callPackage ../development/arduino/arduino-core { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + arduino-core = callPackage ../development/arduino/arduino-core { }; arduino-mk = callPackage ../development/arduino/arduino-mk {}; From effd6aa53a3c85e1236e2888515b1d6f947b11d9 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:25:44 +0200 Subject: [PATCH 09/11] gpsprune: use latest jdk --- pkgs/applications/misc/gpsprune/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 63ca213c2c4..828b3ca9bf0 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk }: stdenv.mkDerivation rec { pname = "gpsprune"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk11 ]; + buildInputs = [ jdk ]; desktopItem = makeDesktopItem { name = "gpsprune"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildCommand = '' mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/gpsprune.jar - makeWrapper ${jdk11}/bin/java $out/bin/gpsprune \ + makeWrapper ${jdk}/bin/java $out/bin/gpsprune \ --add-flags "-jar $out/share/java/gpsprune.jar" mkdir -p $out/share/applications cp $desktopItem/share/applications"/"* $out/share/applications From ef4cbbabd1f7b4e3306b944926545fd60a5a9906 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:32:06 +0200 Subject: [PATCH 10/11] clojure: use latest jdk --- pkgs/development/interpreters/clojure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 53cef387ae4..39db54babe4 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, installShellFiles, jdk11, rlwrap, makeWrapper }: +{ stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }: stdenv.mkDerivation rec { pname = "clojure"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = let - binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ]; + binPath = stdenv.lib.makeBinPath [ rlwrap jdk ]; in '' mkdir -p $out/libexec From e13e02f300baa9315def56a5ae1d9547b1086ebc Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 20 Sep 2020 11:41:06 +0200 Subject: [PATCH 11/11] jedit: use latest jdk --- pkgs/applications/editors/jedit/default.nix | 8 ++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index 178494b0498..18fe236983a 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -44,12 +44,8 @@ stdenv.mkDerivation { mkdir -p $out/share/applications mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop - patch package-files/linux/jedit << EOF - 5a6,8 - > # specify the correct JAVA_HOME - > JAVA_HOME=${jdk.jre.home}/jre - > - EOF + # specify the correct JAVA_HOME + sed -i '1a JAVA_HOME=${jdk}' package-files/linux/jedit sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit mkdir -p $out/bin cp package-files/linux/jedit $out/bin/jedit diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7858cee135a..60308319291 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21432,9 +21432,7 @@ in jdupes = callPackage ../tools/misc/jdupes { }; - jedit = callPackage ../applications/editors/jedit { - jdk = jdk8; # TODO: upgrade - }; + jedit = callPackage ../applications/editors/jedit { }; jgmenu = callPackage ../applications/misc/jgmenu { };