b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #183763 from LibreCybernetics/update-idea-community

Browse source 
jetbrains.jdk: openjdk11 (11.0.13-b1751.25) → openjdk17 (17.0.3-b469.37)
This commit is contained in:
Uri Baghin 2022-09-20 14:17:38 +10:00 committed by GitHub
parent 749458e780 420b83db35
commit 9a3b4264c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/development/compilers/jetbrains-jdk/default.nix
View file

@ -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,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";
};

2
pkgs/top-level/java-packages.nix
View file

@ -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;