commit 71dd692741a1c8d6c7d3a1da83c6c7d2be73c459 · pyrox.dev/nixpkgs

+13

pkgs/development/compilers/openjdk/24/patches/fix-java-home-jdk24.patch

···

       1
       +
       --- a/src/hotspot/os/linux/os_linux.cpp	2025-04-08 14:43:06.765198522 +0200

     

       2
       +
       +++ b/src/hotspot/os/linux/os_linux.cpp	2025-04-08 14:43:27.890301990 +0200

     

       3
       +
       @@ -2758,9 +2758,7 @@

     

       4
       +
          assert(ret, "cannot locate libjvm");

     

       5
       +
          char *rp = nullptr;

     

       6
       +
          if (ret && dli_fname[0] != '\0') {

     

       7
       +
       -    rp = os::realpath(dli_fname, buf, buflen);

     

       8
       +
       -  }

     

       9
       +
       -  if (rp == nullptr) {

     

       10
       +
       +    snprintf(buf, buflen, "%s", dli_fname);

     

       11
       +
            return;

     

       12
       +
          }

     

       13
       +

+30

pkgs/development/compilers/openjdk/24/patches/read-truststore-from-env-jdk24.patch

···

       1
       +
       --- a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java	2017-06-26 21:48:25.000000000 -0400

     

       2
       +
       +++ b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java	2017-07-05 20:45:57.491295030 -0400

     

       3
       +
       @@ -71,6 +71,7 @@

     

       4
       +
             *

     

       5
       +
             * The preference of the default trusted KeyStore is:

     

       6
       +
             *    javax.net.ssl.trustStore

     

       7
       +
       +     *    system environment variable JAVAX_NET_SSL_TRUSTSTORE

     

       8
       +
             *    jssecacerts

     

       9
       +
             *    cacerts

     

       10
       +
             */

     

       11
       +
       @@ -125,7 +126,8 @@

     

       12
       +
                static TrustStoreDescriptor run() {

     

       13
       +
                    // Get the system properties for trust store.

     

       14
       +
                    String storePropName = System.getProperty(

     

       15
       +
       -                    "javax.net.ssl.trustStore", jsseDefaultStore);

     

       16
       +
       +                    "javax.net.ssl.trustStore",

     

       17
       +
       +                    System.getenv("JAVAX_NET_SSL_TRUSTSTORE"));

     

       18
       +
                    String storePropType = System.getProperty(

     

       19
       +
                            "javax.net.ssl.trustStoreType",

     

       20
       +
                            KeyStore.getDefaultType());

     

       21
       +
       @@ -137,6 +139,9 @@

     

       22
       +
                    String temporaryName = "";

     

       23
       +
                    File temporaryFile = null;

     

       24
       +
                    long temporaryTime = 0L;

     

       25
       +
       +            if (storePropName == null) {

     

       26
       +
       +                storePropName = jsseDefaultStore;

     

       27
       +
       +            }

     

       28
       +
                    if (!"NONE".equals(storePropName)) {

     

       29
       +
                        String[] fileNames =

     

       30
       +
                                new String[] {storePropName, defaultStore};

+6

pkgs/development/compilers/openjdk/24/source.json

···

       1
       +
       {

     

       2
       +
         "hash": "sha256-ogWq6oLyZzzvxGTqEEoPMXdtfbobUyXcC5bXXxBxfuo=",

     

       3
       +
         "owner": "openjdk",

     

       4
       +
         "repo": "jdk24u",

     

       5
       +
         "rev": "refs/tags/jdk-24+36"

     

       6
       +
       }

+22 -6

pkgs/development/compilers/openjdk/generic.nix

···

       13
        
         lndir,

     

       14
        
         unzip,

     

       15
        
         ensureNewerSourcesForZipFilesHook,

     

       0
        
       
     

       16
        
       

     

       17
        
         cpio,

     

       18
        
         file,

     
···

       76
        
         temurin-bin-17,

     

       77
        
         temurin-bin-21,

     

       78
        
         temurin-bin-23,

     

       0
        
       
     

       79
        
         jdk-bootstrap ?

     

       80
        
           {

     

       81
        
             "8" = temurin-bin-8.__spliced.buildBuild or temurin-bin-8;

     
···

       83
        
             "17" = temurin-bin-17.__spliced.buildBuild or temurin-bin-17;

     

       84
        
             "21" = temurin-bin-21.__spliced.buildBuild or temurin-bin-21;

     

       85
        
             "23" = temurin-bin-23.__spliced.buildBuild or temurin-bin-23;

     

       0
        
       
     

       86
        
           }

     

       87
        
           .${featureVersion},

     

       88
        
       }:

     
···

       98
        
         atLeast17 = lib.versionAtLeast featureVersion "17";

     

       99
        
         atLeast21 = lib.versionAtLeast featureVersion "21";

     

       100
        
         atLeast23 = lib.versionAtLeast featureVersion "23";

     

       0
        
       
     

       101
        
       

     

       102
        
         tagPrefix = if atLeast11 then "jdk-" else "jdk";

     

       103
        
         version = lib.removePrefix "refs/tags/${tagPrefix}" source.src.rev;

     
···

       143
        
         patches =

     

       144
        
           [

     

       145
        
             (

     

       146
       -
               if atLeast21 then

     

       0
        
       
     

       0
        
       
     

       147
        
                 ./21/patches/fix-java-home-jdk21.patch

     

       148
        
               else if atLeast11 then

     

       149
        
                 ./11/patches/fix-java-home-jdk10.patch

     
···

       151
        
                 ./8/patches/fix-java-home-jdk8.patch

     

       152
        
             )

     

       153
        
             (

     

       154
       -
               if atLeast11 then

     

       0
        
       
     

       0
        
       
     

       155
        
                 ./11/patches/read-truststore-from-env-jdk10.patch

     

       156
        
               else

     

       157
        
                 ./8/patches/read-truststore-from-env-jdk8.patch

     
···

       254
        
           ]

     

       255
        
           ++ lib.optionals atLeast21 [

     

       256
        
             ensureNewerSourcesForZipFilesHook

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       257
        
           ];

     

       258
        
       

     

       259
        
         buildInputs =

     
···

       475
        
       

     

       476
        
         doInstallCheck = atLeast23;

     

       477
        
       

     

       478
       -
         ${if atLeast17 then "postPatch" else null} = ''

     

       479
       -
           chmod +x configure

     

       480
       -
           patchShebangs --build configure

     

       481
       -
         '';

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       482
        
       

     

       483
        
         ${if !atLeast17 then "preConfigure" else null} =

     

       484
        
           ''

···

       13
        
         lndir,

     

       14
        
         unzip,

     

       15
        
         ensureNewerSourcesForZipFilesHook,

     

       16
       +
         pandoc,

     

       17
        
       

     

       18
        
         cpio,

     

       19
        
         file,

     
···

       77
        
         temurin-bin-17,

     

       78
        
         temurin-bin-21,

     

       79
        
         temurin-bin-23,

     

       80
       +
         temurin-bin-24,

     

       81
        
         jdk-bootstrap ?

     

       82
        
           {

     

       83
        
             "8" = temurin-bin-8.__spliced.buildBuild or temurin-bin-8;

     
···

       85
        
             "17" = temurin-bin-17.__spliced.buildBuild or temurin-bin-17;

     

       86
        
             "21" = temurin-bin-21.__spliced.buildBuild or temurin-bin-21;

     

       87
        
             "23" = temurin-bin-23.__spliced.buildBuild or temurin-bin-23;

     

       88
       +
             "24" = temurin-bin-24.__spliced.buildBuild or temurin-bin-24;

     

       89
        
           }

     

       90
        
           .${featureVersion},

     

       91
        
       }:

     
···

       101
        
         atLeast17 = lib.versionAtLeast featureVersion "17";

     

       102
        
         atLeast21 = lib.versionAtLeast featureVersion "21";

     

       103
        
         atLeast23 = lib.versionAtLeast featureVersion "23";

     

       104
       +
         atLeast24 = lib.versionAtLeast featureVersion "24";

     

       105
        
       

     

       106
        
         tagPrefix = if atLeast11 then "jdk-" else "jdk";

     

       107
        
         version = lib.removePrefix "refs/tags/${tagPrefix}" source.src.rev;

     
···

       147
        
         patches =

     

       148
        
           [

     

       149
        
             (

     

       150
       +
               if atLeast24 then

     

       151
       +
                 ./24/patches/fix-java-home-jdk24.patch

     

       152
       +
               else if atLeast21 then

     

       153
        
                 ./21/patches/fix-java-home-jdk21.patch

     

       154
        
               else if atLeast11 then

     

       155
        
                 ./11/patches/fix-java-home-jdk10.patch

     
···

       157
        
                 ./8/patches/fix-java-home-jdk8.patch

     

       158
        
             )

     

       159
        
             (

     

       160
       +
               if atLeast24 then

     

       161
       +
                 ./24/patches/read-truststore-from-env-jdk24.patch

     

       162
       +
               else if atLeast11 then

     

       163
        
                 ./11/patches/read-truststore-from-env-jdk10.patch

     

       164
        
               else

     

       165
        
                 ./8/patches/read-truststore-from-env-jdk8.patch

     
···

       262
        
           ]

     

       263
        
           ++ lib.optionals atLeast21 [

     

       264
        
             ensureNewerSourcesForZipFilesHook

     

       265
       +
           ]

     

       266
       +
           ++ lib.optionals atLeast24 [

     

       267
       +
             pandoc

     

       268
        
           ];

     

       269
        
       

     

       270
        
         buildInputs =

     
···

       486
        
       

     

       487
        
         doInstallCheck = atLeast23;

     

       488
        
       

     

       489
       +
         ${if atLeast17 then "postPatch" else null} =

     

       490
       +
           ''

     

       491
       +
             chmod +x configure

     

       492
       +
             patchShebangs --build configure

     

       493
       +
           ''

     

       494
       +
           + lib.optionalString atLeast24 ''

     

       495
       +
             chmod +x make/scripts/*.{template,sh,pl}

     

       496
       +
             patchShebangs --build make/scripts

     

       497
       +
           '';

     

       498
        
       

     

       499
        
         ${if !atLeast17 then "preConfigure" else null} =

     

       500
        
           ''

+5

pkgs/top-level/all-packages.nix

···

       6061
        
         jdk23 = openjdk23;

     

       6062
        
         jdk23_headless = openjdk23_headless;

     

       6063
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       6064
        
         # default JDK

     

       6065
        
         jdk = jdk21;

     

       6066
        
         jdk_headless = jdk21_headless;

···

       6061
        
         jdk23 = openjdk23;

     

       6062
        
         jdk23_headless = openjdk23_headless;

     

       6063
        
       

     

       6064
       +
         openjdk24 = javaPackages.compiler.openjdk24;

     

       6065
       +
         openjdk24_headless = javaPackages.compiler.openjdk24.headless;

     

       6066
       +
         jdk24 = openjdk24;

     

       6067
       +
         jdk24_headless = openjdk24_headless;

     

       6068
       +
       

     

       6069
        
         # default JDK

     

       6070
        
         jdk = jdk21;

     

       6071
        
         jdk_headless = jdk21_headless;

+1

pkgs/top-level/java-packages.nix

···

       49
        
             openjdk17 = mkOpenjdk "17";

     

       50
        
             openjdk21 = mkOpenjdk "21";

     

       51
        
             openjdk23 = mkOpenjdk "23";

     

       0
        
       
     

       52
        
       

     

       53
        
             # Legacy aliases

     

       54
        
             openjdk8-bootstrap = temurin-bin.jdk-8;

···

       49
        
             openjdk17 = mkOpenjdk "17";

     

       50
        
             openjdk21 = mkOpenjdk "21";

     

       51
        
             openjdk23 = mkOpenjdk "23";

     

       52
       +
             openjdk24 = mkOpenjdk "24";

     

       53
        
       

     

       54
        
             # Legacy aliases

     

       55
        
             openjdk8-bootstrap = temurin-bin.jdk-8;