pyrox.dev
jetbrains.jdk*: Update Jetbrains Java Runtime packages (#426285)
authored by Fabián Heredia Montiel and committed by GitHub 1ec347a3 905bb2fe
+7
-12
pkgs/development/compilers/jetbrains-jdk/17.nix
+7
-12
pkgs/development/compilers/jetbrains-jdk/17.nix
···
43
43
in
44
44
openjdk17.overrideAttrs (oldAttrs: rec {
45
45
pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef";
46
-
javaVersion = "17.0.11";
47
-
build = "1207.24";
46
+
javaVersion = "17.0.15";
47
+
build = "1381";
48
48
# To get the new tag:
49
49
# git clone https://github.com/jetbrains/jetbrainsruntime
50
50
# cd jetbrainsruntime
51
-
# git reset --hard [revision]
52
-
# git log --simplify-by-decoration --decorate=short --pretty=short | grep "jbr-" --color=never | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1 | tr -d ","
53
-
openjdkTag = "jbr-17.0.8+7";
51
+
# git tag --points-at [revision]
52
+
# Look for the line that starts with jbr-
53
+
openjdkTag = "jbr-17.0.15+6";
54
54
version = "${javaVersion}-b${build}";
55
55
56
56
src = fetchFromGitHub {
57
57
owner = "JetBrains";
58
58
repo = "JetBrainsRuntime";
59
59
rev = "jb${version}";
60
-
hash = "sha256-a7cJF2iCW/1GK0/GmVbaY5pYcn3YtZy5ngFkyAGRhu0=";
60
+
hash = "sha256-Ckv2SNugHK75Af+ZzI91+QodOHIa5TMcjVQYsO45mQo=";
61
61
};
62
62
63
63
env = {
64
64
BOOT_JDK = openjdk17-bootstrap.home;
65
65
# run `git log -1 --pretty=%ct` in jdk repo for new value on update
66
-
SOURCE_DATE_EPOCH = 1715809405;
67
-
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU (toString [
68
-
"-Wno-error=format-overflow"
69
-
"-Wno-error=template-id-cdtor"
70
-
"-Wno-error=calloc-transposed-args"
71
-
]);
66
+
SOURCE_DATE_EPOCH = 1745907200;
72
67
};
73
68
74
69
patches = [ ];
+15
-7
pkgs/development/compilers/jetbrains-jdk/default.nix
+15
-7
pkgs/development/compilers/jetbrains-jdk/default.nix
···
28
28
wayland,
29
29
udev,
30
30
fontconfig,
31
+
shaderc,
32
+
vulkan-headers,
31
33
}:
32
34
33
35
assert debugBuild -> withJcef;
···
43
45
in
44
46
jdk.overrideAttrs (oldAttrs: rec {
45
47
pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef";
46
-
javaVersion = "21.0.6";
47
-
build = "895.109";
48
+
javaVersion = "21.0.7";
49
+
build = "1038.58";
48
50
# To get the new tag:
49
51
# git clone https://github.com/jetbrains/jetbrainsruntime
50
52
# cd jetbrainsruntime
51
-
# git checkout jbr-release-${javaVersion}b${build}
52
-
# git log --simplify-by-decoration --decorate=short --pretty=short | grep "jbr-" --color=never | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1 | tr -d ","
53
-
openjdkTag = "jbr-21.0.6+7";
53
+
# git tag --points-at [revision]
54
+
# Look for the line that starts with jbr-
55
+
openjdkTag = "jbr-release-21.0.7b1038.58";
54
56
version = "${javaVersion}-b${build}";
55
57
56
58
src = fetchFromGitHub {
57
59
owner = "JetBrains";
58
60
repo = "JetBrainsRuntime";
59
61
rev = "jb${version}";
60
-
hash = "sha256-Neh0PGer4JnNaForBKRlGPLft5cae5GktreyPRNjFCk=";
62
+
hash = "sha256-sGAMrE9gAt73jgLlNW8p5Lz37gFiK4ZvMQ8giE2Ia54=";
61
63
};
62
64
63
65
env = {
64
66
BOOT_JDK = jdk.home;
65
67
# run `git log -1 --pretty=%ct` in jdk repo for new value on update
66
-
SOURCE_DATE_EPOCH = 1726275531;
68
+
SOURCE_DATE_EPOCH = 1745907200;
67
69
};
68
70
69
71
patches = [ ];
···
172
174
autoconf
173
175
unzip
174
176
rsync
177
+
shaderc # glslc
175
178
]
176
179
++ oldAttrs.nativeBuildInputs;
180
+
181
+
buildInputs = [
182
+
vulkan-headers
183
+
]
184
+
++ oldAttrs.buildInputs or [ ];
177
185
178
186
meta = with lib; {
179
187
description = "OpenJDK fork to better support Jetbrains's products";