Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

jetbrains.jdk: openjdk11 (11.0.13-b1751.25) → openjdk17 (17.0.3-b469.37) #183763

Merged
merged 3 commits into from
Sep 20, 2022
Merged

jetbrains.jdk: openjdk11 (11.0.13-b1751.25) → openjdk17 (17.0.3-b469.37) #183763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8a5339
openjdk17-bootstrap: adoptopenjdk16 → adoptopenjdk17
fabianhjr Aug 5, 2022
27a4de4
jetbrains.jdk: openjdk11 (11.0.13-b1751.25) → openjdk17 (17.0.3-b469.37)
fabianhjr Apr 1, 2022
420b83d
jetbrains.jdk: mark as broken on darwin
fabianhjr Sep 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions pkgs/development/compilers/jetbrains-jdk/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we know if this is deterministic? I can't find any reference to whether git handles case conflicts in a deterministic way or not.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have access to a macOS device, could you help with that?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, the hash of the two files that clash is the same. (It doesn't matter which of the two copies git chooses, it will hash the same)

else "sha256-O+OIDRJcIsb/vhO2+SYuYdUYWYTGkBcQ9cHTExLIFDE=";
};
patches = [];

meta = with lib; {
description = "An OpenJDK fork to better support Jetbrains's products.";
longDescription = ''
Expand All @@ -25,9 +33,12 @@ 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 ];

broken = stdenv.isDarwin;
};

passthru = oldAttrs.passthru // {
home = "${jetbrains.jdk}/lib/openjdk";
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/java-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down