Unverified Commit 1ec347a3 authored by Fabián Heredia Montiel's avatar Fabián Heredia Montiel Committed by GitHub
Browse files

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

parents 905bb2fe 50fbd333

pkgs/development/compilers/jetbrains-jdk/17.nix

+7 −12
Original line number Diff line number Diff line
@@ -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 = [ ];

pkgs/development/compilers/jetbrains-jdk/default.nix

+15 −7
Original line number Diff line number Diff line
@@ -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 = ''