From f8a533953219dcbd1cc27e6176638d78ff5a107f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Fri, 5 Aug 2022 09:35:25 -0500
Subject: [PATCH 1/3] =?UTF-8?q?openjdk17-bootstrap:=20adoptopenjdk16=20?=
 =?UTF-8?q?=E2=86=92=20adoptopenjdk17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/top-level/java-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index f9391267fac8044..c246040a97477f6 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -127,7 +127,7 @@ in {
         inherit openjdk15-bootstrap;
       });
 
-    openjdk17-bootstrap = mkBootstrap adoptopenjdk-16
+    openjdk17-bootstrap = mkBootstrap adoptopenjdk-17
       ../development/compilers/openjdk/16.nix
       (bootstrapArgs // {
         inherit openjdk16-bootstrap;

From 27a4de43288037d64f9d0bb737ef7350517f6a44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Fri, 1 Apr 2022 15:31:40 -0600
Subject: [PATCH 2/3] =?UTF-8?q?jetbrains.jdk:=20openjdk11=20(11.0.13-b1751?=
 =?UTF-8?q?.25)=20=E2=86=92=20openjdk17=20(17.0.3-b469.37)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

> With the IntelliJ IDEA 2022.2 EAP we are moving from JetBrains Runtime
  11 (JBR11) to JetBrains Runtime 17 (JBR17). Starting with this build,
  all IntelliJ IDEA 2022.2 updates will come with JBR17. This will have
  the following effects:
> - A significant performance improvement allowing faster and smoother
    IDE operation.
> - Better security, as JBR17 is based on the latest OpenJDK LTS.
> - Better rendering performance on macOS, as JetBrains Runtime 17
    leverages Metal API.
> - Increased accessibility on macOS, as JBR17 features integration with
    VoiceOver screen reader.
> - Usage of Vector API designed to express vector computations that
    compile at runtime to vector instructions on supported CPU
    architectures, thus achieving performance superior to equivalent
    scalar computations.

From: https://blog.jetbrains.com/idea/2022/05/intellij-idea-2022-2-eap-1/#JetBrains_Runtime
---
 .../compilers/jetbrains-jdk/default.nix       | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index b49898e9292a699..27ea63173b20cd1 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -1,16 +1,24 @@
-{ lib, openjdk11, fetchFromGitHub, jetbrains }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, jetbrains
+, openjdk17
+}:
 
-openjdk11.overrideAttrs (oldAttrs: rec {
+openjdk17.overrideAttrs (oldAttrs: rec {
   pname = "jetbrains-jdk";
-  version = "11_0_13-b1751.25";
+  version = "17.0.3-b469.37";
 
   src = fetchFromGitHub {
     owner = "JetBrains";
     repo = "JetBrainsRuntime";
     rev = "jb${version}";
-    sha256 = "sha256-TPNYZUkAoiZfp7Ci3fslKnRNGY1lnyIhXYUt6J31lwI=";
+    hash =
+     # Upstream issue: https://github.com/JetBrains/JetBrainsRuntime/issues/163
+     if stdenv.isDarwin then "sha256-ExRvjs53rIuhUx4oCgAqu1Av3CNAgmE1ZlN0srEh3XM="
+     else "sha256-O+OIDRJcIsb/vhO2+SYuYdUYWYTGkBcQ9cHTExLIFDE=";
   };
-  patches = [];
+
   meta = with lib; {
     description = "An OpenJDK fork to better support Jetbrains's products.";
     longDescription = ''
@@ -25,9 +33,10 @@ openjdk11.overrideAttrs (oldAttrs: rec {
      your own risk.
     '';
     homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime";
-    inherit (openjdk11.meta) license platforms mainProgram;
+    inherit (openjdk17.meta) license platforms mainProgram;
     maintainers = with maintainers; [ edwtjo ];
   };
+
   passthru = oldAttrs.passthru // {
     home = "${jetbrains.jdk}/lib/openjdk";
   };

From 420b83db35415a1179d7f2485f6341e236c0c939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Mon, 19 Sep 2022 19:56:33 -0500
Subject: [PATCH 3/3] jetbrains.jdk: mark as broken on darwin

Context: https://github.com/NixOS/nixpkgs/pull/183763
---
 pkgs/development/compilers/jetbrains-jdk/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 27ea63173b20cd1..8f7896aa6bfa16f 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -35,6 +35,8 @@ openjdk17.overrideAttrs (oldAttrs: rec {
     homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime";
     inherit (openjdk17.meta) license platforms mainProgram;
     maintainers = with maintainers; [ edwtjo ];
+
+    broken = stdenv.isDarwin;
   };
 
   passthru = oldAttrs.passthru // {