Skip to content

*: use latest jdk #98314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gebner merged 11 commits into from
Sep 20, 2020
Merged

*: use latest jdk #98314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e11a487
josm: use latest jdk
gebner Sep 20, 2020
aabe6e2
dbeaver: use latest jdk
gebner Sep 20, 2020
8ba71ce
mediathekview: use latest jre
gebner Sep 20, 2020
01fed03
closurecompiler: use latest jdk
gebner Sep 20, 2020
9481828
emscripten: use latest jdk
gebner Sep 20, 2020
84a0da2
runelite: use latest jdk
gebner Sep 20, 2020
5e46e2a
awstats: use latest jdk
gebner Sep 20, 2020
3426068
arduino: use latest jdk
gebner Sep 20, 2020
effd6aa
gpsprune: use latest jdk
gebner Sep 20, 2020
ef4cbba
clojure: use latest jdk
gebner Sep 20, 2020
e13e02f
jedit: use latest jdk
gebner Sep 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions pkgs/applications/editors/jedit/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/misc/gpsprune/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }:
{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk }:

stdenv.mkDerivation rec {
pname = "gpsprune";
Expand All @@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jdk11 ];
buildInputs = [ jdk ];

desktopItem = makeDesktopItem {
name = "gpsprune";
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/clojure/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, installShellFiles, jdk11, rlwrap, makeWrapper }:
{ stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }:

stdenv.mkDerivation rec {
pname = "clojure";
Expand All @@ -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
Expand Down
32 changes: 9 additions & 23 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {};

Expand Down Expand Up @@ -1251,9 +1249,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 { };

Expand Down Expand Up @@ -3049,9 +3045,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 { };

Expand Down Expand Up @@ -3431,9 +3425,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 { });

Expand Down Expand Up @@ -6783,9 +6775,7 @@ in

rubocop = callPackage ../development/tools/rubocop { };

runelite = callPackage ../games/runelite {
jre = openjdk11;
};
runelite = callPackage ../games/runelite { };

runningx = callPackage ../tools/X11/runningx { };

Expand Down Expand Up @@ -8579,9 +8569,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 { };

Expand Down Expand Up @@ -21444,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 { };

Expand All @@ -21456,7 +21442,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 { };

Expand Down Expand Up @@ -21913,7 +21899,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 { };

Expand Down