commit 1a86e6aba92976456918c650e8d1f5600c7e8b18 · pyrox.dev/nixpkgs

+25

pkgs/development/compilers/openjdk/25/patches/make-4.4.1.patch

···

       1
       1
       +
       diff --git a/make/PreInit.gmk b/make/PreInit.gmk

     

       2
       2
       +
       index 3df44308dd..490d7c24e9 100644

     

       3
       3
       +
       --- a/make/PreInit.gmk

     

       4
       4
       +
       +++ b/make/PreInit.gmk

     

       5
       5
       +
       @@ -60,13 +60,19 @@

     

       6
       6
       +
        # Extract non-global targets that require a spec file.

     

       7
       7
       +
        CALLED_SPEC_TARGETS := $(filter-out $(ALL_GLOBAL_TARGETS), $(CALLED_TARGETS))

     

       8
       8
       +
        

     

       9
       9
       +
       +# GNU make-4.4 (and later) include not just single-letter form of the

     

       10
       10
       +
       +# options MAKEFILES but also long for and even some of the arguments.

     

       11
       11
       +
       +# Skip long form and use only short form:

     

       12
       12
       +
       +#     MAKEFLAGS=' --debug=basic -- LOG=trace ...'

     

       13
       13
       +
       +MAKEFLAGS_SINGLE_LETTER := $(firstword -$(MAKEFLAGS))

     

       14
       14
       +
       +

     

       15
       15
       +
        # If we have only global targets, or if we are called with -qp (assuming an

     

       16
       16
       +
        # external part, e.g. bash completion, is trying to understand our targets),

     

       17
       17
       +
        # we will skip SPEC location and the sanity checks.

     

       18
       18
       +
        ifeq ($(CALLED_SPEC_TARGETS), )

     

       19
       19
       +
          SKIP_SPEC := true

     

       20
       20
       +
        endif

     

       21
       21
       +
       -ifeq ($(findstring p, $(MAKEFLAGS))$(findstring q, $(MAKEFLAGS)), pq)

     

       22
       22
       +
       +ifeq ($(findstring p, $(MAKEFLAGS_SINGLE_LETTER))$(findstring q, $(MAKEFLAGS_SINGLE_LETTER)), pq)

     

       23
       23
       +
          SKIP_SPEC := true

     

       24
       24
       +
        endif

     

       25
       25
       +

+6

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

···

       1
       1
       +
       {

     

       2
       2
       +
         "hash": "sha256-5kQ7xPyWGk/weVYVVNEFPUF1HspfisqcPHA+DM6Q35c=",

     

       3
       3
       +
         "owner": "openjdk",

     

       4
       4
       +
         "repo": "jdk25u",

     

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

     

       6
       6
       +
       }

+7 -1

pkgs/development/compilers/openjdk/generic.nix

···

       80
       80
        
         temurin-bin-21,

     

       81
       81
        
         temurin-bin-23,

     

       82
       82
        
         temurin-bin-24,

     

       83
       83
       +
         temurin-bin-25,

     

       83
       84
        
         jdk-bootstrap ?

     

       84
       85
        
           {

     

       85
       86
        
             "8" = temurin-bin-8.__spliced.buildBuild or temurin-bin-8;

     
···

       88
       89
        
             "21" = temurin-bin-21.__spliced.buildBuild or temurin-bin-21;

     

       89
       90
        
             "23" = temurin-bin-23.__spliced.buildBuild or temurin-bin-23;

     

       90
       91
        
             "24" = temurin-bin-24.__spliced.buildBuild or temurin-bin-24;

     

       92
       92
       +
             "25" = temurin-bin-25.__spliced.buildBuild or temurin-bin-25;

     

       91
       93
        
           }

     

       92
       94
        
           .${featureVersion},

     

       93
       95
        
       }:

     
···

       104
       106
        
         atLeast21 = lib.versionAtLeast featureVersion "21";

     

       105
       107
        
         atLeast23 = lib.versionAtLeast featureVersion "23";

     

       106
       108
        
         atLeast24 = lib.versionAtLeast featureVersion "24";

     

       109
       109
       +
         atLeast25 = lib.versionAtLeast featureVersion "25";

     

       107
       110
        
       

     

       108
       111
        
         tagPrefix = if atLeast11 then "jdk-" else "jdk";

     

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

     
···

       217
       220
        
             sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo=";

     

       218
       221
        
           })

     

       219
       222
        
         ]

     

       220
       220
       -
         ++ lib.optionals atLeast11 [

     

       223
       223
       +
         ++ lib.optionals (atLeast11 && !atLeast25) [

     

       221
       224
        
           # Fix build for gnumake-4.4.1:

     

       222
       225
        
           #   https://github.com/openjdk/jdk/pull/12992

     

       223
       226
        
           (fetchpatch {

     
···

       225
       228
        
             url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";

     

       226
       229
        
             hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";

     

       227
       230
        
           })

     

       231
       231
       +
         ]

     

       232
       232
       +
         ++ lib.optionals atLeast25 [

     

       233
       233
       +
           ./25/patches/make-4.4.1.patch

     

       228
       234
        
         ]

     

       229
       235
        
         ++ lib.optionals (!headless && enableGtk) [

     

       230
       236
        
           (

+9

pkgs/top-level/all-packages.nix

···

       5290
       5290
        
         jdk24 = openjdk24;

     

       5291
       5291
        
         jdk24_headless = openjdk24_headless;

     

       5292
       5292
        
       

     

       5293
       5293
       +
         openjdk25 = javaPackages.compiler.openjdk25;

     

       5294
       5294
       +
         openjdk25_headless = javaPackages.compiler.openjdk25.headless;

     

       5295
       5295
       +
         jdk25 = openjdk25;

     

       5296
       5296
       +
         jdk25_headless = openjdk25_headless;

     

       5297
       5297
       +
       

     

       5293
       5298
        
         # default JDK

     

       5294
       5299
        
         jdk = jdk21;

     

       5295
       5300
        
         jdk_headless = jdk21_headless;

     
···

       5315
       5320
        
         jre21_minimal = callPackage ../development/compilers/openjdk/jre.nix {

     

       5316
       5321
        
           jdk = jdk21;

     

       5317
       5322
        
           jdkOnBuild = buildPackages.jdk21;

     

       5323
       5323
       +
         };

     

       5324
       5324
       +
         jre25_minimal = callPackage ../development/compilers/openjdk/jre.nix {

     

       5325
       5325
       +
           jdk = jdk25;

     

       5326
       5326
       +
           jdkOnBuild = buildPackages.jdk25;

     

       5318
       5327
        
         };

     

       5319
       5328
        
         jre_minimal = callPackage ../development/compilers/openjdk/jre.nix {

     

       5320
       5329
        
           jdkOnBuild = buildPackages.jdk;

+1

pkgs/top-level/java-packages.nix

···

       50
       50
        
             openjdk21 = mkOpenjdk "21";

     

       51
       51
        
             openjdk23 = mkOpenjdk "23";

     

       52
       52
        
             openjdk24 = mkOpenjdk "24";

     

       53
       53
       +
             openjdk25 = mkOpenjdk "25";

     

       53
       54
        
       

     

       54
       55
        
             # Legacy aliases

     

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