Skip to content

Commit 4e0c99f

Browse files
committed
treewide: update to new openjdk package structure
1 parent 1f7a6ea commit 4e0c99f

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
# $ direnv-init jdk11
135135
# $ lorri-init jdk11
136136
devShells = forEachSystem (system: listToAttrs [
137-
(mkDevShellJdk system "jdk21" { jdk = pkgs: pkgs.jdk21; })
137+
(mkDevShellJdk system "jdk21" { jdk = pkgs: pkgs.javaPackages.compiler.openjdk21; })
138138

139139
(mkDevShellPhp system "php82" { phpVersion = "82"; })
140140
]);

home/programs/idea-ultimate.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ in
3939
misc.sdks = {
4040
enable = true;
4141
links = mkMerge [
42-
{ inherit (pkgs) jdk11 python3; }
42+
{ inherit (pkgs) python3; }
4343

4444
(mkIf config.custom.programs.go.enable {
4545
go-1-15 = pkgs.go;

hosts/R2026/home-tobiashapp.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
sdks = {
2020
enable = true;
2121
links = {
22-
inherit (pkgs) jdk21;
22+
jdk21 = pkgs.javaPackages.compiler.openjdk21;
2323
};
2424
};
2525

hosts/bwpm-FP2CYXKY2V/home-tobiashapp.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@
1919
sdks = {
2020
enable = true;
2121
links = {
22-
inherit (pkgs) jdk21 python3;
22+
inherit (pkgs) python3;
2323

24+
jdk21 = pkgs.javaPackages.compiler.openjdk21;
25+
jdk25 = pkgs.javaPackages.compiler.openjdk25;
2426
# python3 = pkgs.python3.withPackages (ps: with ps; with pkgs.python3Packages; [ jupyter ipython notebook ]);
2527
};
2628
};

hosts/neon/home-tobias.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
sdks = {
2323
enable = true;
2424
links = {
25-
inherit (pkgs) jdk17 python310;
25+
inherit (pkgs) python3;
2626
};
2727
};
2828
};

0 commit comments

Comments
 (0)