chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

jetbrains.jdk*: Update Jetbrains Java Runtime packages (#426285)

Browse Source
This commit is contained in:
Fabián Heredia Montiel
2025-07-24 21:35:49 -06:00
committed by GitHub
parent 905bb2fe76 50fbd33349
commit 1ec347a366
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/compilers/jetbrains-jdk/17.nix
View File

@@ -43,32 +43,27 @@ let
in
openjdk17.overrideAttrs (oldAttrs: rec {
pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef";
javaVersion = "17.0.11";
build = "1207.24";
javaVersion = "17.0.15";
build = "1381";
# To get the new tag:
# git clone https://github.com/jetbrains/jetbrainsruntime
# cd jetbrainsruntime
# git reset --hard [revision]
# 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 ","
openjdkTag = "jbr-17.0.8+7";
# git tag --points-at [revision]
# Look for the line that starts with jbr-
openjdkTag = "jbr-17.0.15+6";
version = "${javaVersion}-b${build}";
src = fetchFromGitHub {
owner = "JetBrains";
repo = "JetBrainsRuntime";
rev = "jb${version}";
hash = "sha256-a7cJF2iCW/1GK0/GmVbaY5pYcn3YtZy5ngFkyAGRhu0=";
hash = "sha256-Ckv2SNugHK75Af+ZzI91+QodOHIa5TMcjVQYsO45mQo=";
};
env = {
BOOT_JDK = openjdk17-bootstrap.home;
# run `git log -1 --pretty=%ct` in jdk repo for new value on update
SOURCE_DATE_EPOCH = 1715809405;
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU (toString [
"-Wno-error=format-overflow"
"-Wno-error=template-id-cdtor"
"-Wno-error=calloc-transposed-args"
]);
SOURCE_DATE_EPOCH = 1745907200;
};
patches = [ ];

22
pkgs/development/compilers/jetbrains-jdk/default.nix
View File

@@ -28,6 +28,8 @@
wayland,
udev,
fontconfig,
shaderc,
vulkan-headers,
}:
assert debugBuild -> withJcef;
@@ -43,27 +45,27 @@ let
in
jdk.overrideAttrs (oldAttrs: rec {
pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef";
javaVersion = "21.0.6";
build = "895.109";
javaVersion = "21.0.7";
build = "1038.58";
# To get the new tag:
# git clone https://github.com/jetbrains/jetbrainsruntime
# cd jetbrainsruntime
# git checkout jbr-release-${javaVersion}b${build}
# 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 ","
openjdkTag = "jbr-21.0.6+7";
# git tag --points-at [revision]
# Look for the line that starts with jbr-
openjdkTag = "jbr-release-21.0.7b1038.58";
version = "${javaVersion}-b${build}";
src = fetchFromGitHub {
owner = "JetBrains";
repo = "JetBrainsRuntime";
rev = "jb${version}";
hash = "sha256-Neh0PGer4JnNaForBKRlGPLft5cae5GktreyPRNjFCk=";
hash = "sha256-sGAMrE9gAt73jgLlNW8p5Lz37gFiK4ZvMQ8giE2Ia54=";
};
env = {
BOOT_JDK = jdk.home;
# run `git log -1 --pretty=%ct` in jdk repo for new value on update
SOURCE_DATE_EPOCH = 1726275531;
SOURCE_DATE_EPOCH = 1745907200;
};
patches = [ ];
@@ -172,9 +174,15 @@ jdk.overrideAttrs (oldAttrs: rec {
autoconf
unzip
rsync
shaderc # glslc
]
++ oldAttrs.nativeBuildInputs;
buildInputs = [
vulkan-headers
]
++ oldAttrs.buildInputs or [ ];
meta = with lib; {
description = "OpenJDK fork to better support Jetbrains's products";
longDescription = ''