Unverified Commit 7eb4e940 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #313920 from wegank/openjdk-bump-split-1 

openjdk{16,18,19,20}, openjfx{20,22}: update
parents 80ecf810 82ee7138

pkgs/development/compilers/openjdk/16.nix

+6 −5
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 
let

  version = {

    feature = "16";

    interim = "0";

    build = "36";

    interim = ".0.2-ga";

    build = "1";

  };



  # when building a headless jdk, also bootstrap it with a headless jdk
@@ -20,13 +20,14 @@ let 


  openjdk = stdenv.mkDerivation {

    pname = "openjdk" + lib.optionalString headless "-headless";

    version = "${version.feature}+${version.build}";

    version = "${version.feature}${version.interim}+${version.build}";



    src = fetchFromGitHub {

      owner = "openjdk";

      repo = "jdk${version.feature}u";

      rev = "jdk-${version.feature}+${version.build}";

      sha256 = "165nr15dqfcxzsl5z95g4iklln4rlfkgdigdma576mx8813ldi44";

      rev = "jdk-${version.feature}${version.interim}";

      # rev = "jdk-${version.feature}${version.interim}+${version.build}";

      sha256 = "sha256-/8XHNrf9joCCXMCyPncT54JhqlF+KBL7eAf8hUW/BxU=";

    };



    nativeBuildInputs = [ pkg-config autoconf unzip ];

pkgs/development/compilers/openjdk/18.nix

+5 −4
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ 
let

  version = {

    feature = "18";

    build = "36";

    interim = ".0.2.1";

    build = "1";

  };



  # when building a headless jdk, also bootstrap it with a headless jdk
@@ -19,13 +20,13 @@ let 


  openjdk = stdenv.mkDerivation {

    pname = "openjdk" + lib.optionalString headless "-headless";

    version = "${version.feature}+${version.build}";

    version = "${version.feature}${version.interim}+${version.build}";



    src = fetchFromGitHub {

      owner = "openjdk";

      repo = "jdk${version.feature}u";

      rev = "jdk-${version.feature}+${version.build}";

      sha256 = "sha256-yGPC8VA983Ml6Fv/oiEgRrcVe4oe+Q4oCHbzOmFbZq8=";

      rev = "jdk-${version.feature}${version.interim}+${version.build}";

      sha256 = "sha256-L6dsN0kqWcfemM8LBg62qtHQdymwRQoV1ndc8r+0qn8=";

    };



    nativeBuildInputs = [ pkg-config autoconf unzip ];

pkgs/development/compilers/openjdk/19.nix

+7 −5
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
let

  version = {

    feature = "19";

    interim = ".0.2";

    build = "7";

    interim = "-ga";

    build = "";

  };



  # when building a headless jdk, also bootstrap it with a headless jdk
@@ -23,13 +23,15 @@ let 


  openjdk = stdenv.mkDerivation {

    pname = "openjdk" + lib.optionalString headless "-headless";

    version = "${version.feature}${version.interim}+${version.build}";

    version = "${version.feature}${version.interim}";

    # version = "${version.feature}${version.interim}+${version.build}";



    src = fetchFromGitHub {

      owner = "openjdk";

      repo = "jdk${version.feature}u";

      rev = "jdk-${version.feature}${version.interim}+${version.build}";

      hash = "sha256-pBEHmBtIgG4Czou4C/zpBBYZEDImvXiLoA5CjOzpeyI=";

      rev = "jdk-${version.feature}${version.interim}";

      # rev = "jdk-${version.feature}${version.interim}+${version.build}";

      hash = "sha256-XbYTku/nWF+maBvYz2rJYIUBEgOmqICKjk9wufHqyj0=";

    };



    nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ];

pkgs/development/compilers/openjdk/20.nix

+3 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
let

  version = {

    feature = "20";

    interim = "";

    build = "36";

    interim = ".0.2";

    build = "9";

  };



  # when building a headless jdk, also bootstrap it with a headless jdk
@@ -29,7 +29,7 @@ let 
      owner = "openjdk";

      repo = "jdk${version.feature}u";

      rev = "jdk-${version.feature}${version.interim}+${version.build}";

      hash = "sha256-fXoSO8nq5qpUYbCtbrRr2C46XRdYX77Pxmk7GfmlZV4=";

      hash = "sha256-CZH2JwR+MrkTlLdcVYuFRB3McdrM0A+1YaSjNpjYwak=";

    };



    nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ];

pkgs/development/compilers/openjdk/openjfx/20.nix

+4 −4
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 


let

  major = "20";

  update = "";

  build = "+19";

  update = ".0.2";

  build = "-ga";

  repover = "${major}${update}${build}";

  gradle_ = (gradle_7.override {

    # note: gradle does not yet support running on 19
@@ -30,9 +30,9 @@ let 


    src = fetchFromGitHub {

      owner = "openjdk";

      repo = "jfx";

      repo = "jfx20u";

      rev = repover;

      hash = "sha256-QPPJyl6+XU+m5xqYOFtQKJNNrovqy7ngNE/e7kiEJVU=";

      hash = "sha256-3Hhz4i8fPU2yowb4roylCXzuO9HkW7ZWF9TMA3HIH9o=";

    };



    buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ];