mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-08 13:39:20 +03:00
Merge pull request #183763 from LibreCybernetics/update-idea-community
jetbrains.jdk: openjdk11 (11.0.13-b1751.25) → openjdk17 (17.0.3-b469.37)
This commit is contained in:
commit
9a3b4264c2
@ -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";
|
||||
};
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user