Unverified Commit be6ca51c authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

Merge pull request #327385 from thiagokokada/graalvm-bump 

graalvm-ce: 22.0.0 -> 22.0.1;  graalvmCEPackages.{graaljs,graalnodejs}: 23.1.0 -> 24.0.1
parents 56d6da92 2ba084c7

pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix

+1 −5
Original line number Diff line number Diff line
@@ -171,15 +171,11 @@ let 
      $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces -march=compatibility $extraNativeImageArgs HelloWorld

      ./helloworld | fgrep 'Hello World'



      ${# --static is only available in Linux

      ${# -H:+StaticExecutableWithDynamicLibC is only available in Linux

      lib.optionalString (stdenv.isLinux && !useMusl) ''

        echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC"

        $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:+StaticExecutableWithDynamicLibC -march=compatibility $extraNativeImageArgs HelloWorld

        ./helloworld | fgrep 'Hello World'



        echo "Ahead-Of-Time compilation with --static"

        $out/bin/native-image $extraNativeImageArgs -march=compatibility --static HelloWorld

        ./helloworld | fgrep 'Hello World'

      ''}



      ${# --static is only available in Linux

pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ graalvmCEPackages.buildGraalvmProduct { 
  src = fetchurl (import ./hashes.nix).hashes.${stdenv.system};

  version = (import ./hashes.nix).version;



  product = "js-installable-svm";

  product = "graaljs";



  doInstallCheck = true;

  installCheckPhase = ''

pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix

+9 −9
Original line number Diff line number Diff line 
# Generated by update.sh script

{

  "version" = "23.1.0";

  "version" = "24.0.1";

  "hashes" = {

    "aarch64-linux" = {

      sha256 = "09q88nsbz0lrl866x3hqxm3hb5wpn4x5rp6pk69x1v6xzl58wzq2";

      url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-linux-aarch64.tar.gz";

      sha256 = "11mz4qrp96iiblc25yssmczjwc44qf5z6q3c40dvmqyzz7rb7dm7";

      url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graaljs-community-24.0.1-linux-aarch64.tar.gz";

    };

    "x86_64-linux" = {

      sha256 = "0zlk0gpxwjkh4wxsc310kl80ipgk5si1lmyx0q2hqsw9lm98n41g";

      url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-linux-amd64.tar.gz";

      sha256 = "0ljmgaw5l617k1z26jlfj7pk87jkrgmai999vjbcvj1z7l26am2g";

      url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graaljs-community-24.0.1-linux-amd64.tar.gz";

    };

    "x86_64-darwin" = {

      sha256 = "1y5mc92yync85ywcahvq8x9jlla0rzjd4g7cm6q7p21wvfwp4d5q";

      url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-macos-amd64.tar.gz";

      sha256 = "1h629gzdaay2rr5vgxir4kybarl19rcmvbsgrfri007rkchyxr5g";

      url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graaljs-community-24.0.1-macos-amd64.tar.gz";

    };

    "aarch64-darwin" = {

      sha256 = "0ph3c6jgbvm3cliyqlccd2l292a7p0051l3sv7yf3318r6zrrk7m";

      url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graaljs-community-23.1.0-macos-aarch64.tar.gz";

      sha256 = "11sjplallyhf0vp6b53rhj5cv0zb6haii4aaan5xahplw9gavv8g";

      url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graaljs-community-24.0.1-macos-aarch64.tar.gz";

    };

  };

}

pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ graalvmCEPackages.buildGraalvmProduct { 
  src = fetchurl (import ./hashes.nix).hashes.${stdenv.system};

  version = (import ./hashes.nix).version;



  product = "nodejs-installable-svm";

  product = "graalnodejs";



  doInstallCheck = true;

  installCheckPhase = ''

pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix

+9 −9
Original line number Diff line number Diff line 
# Generated by update.sh script

{

  "version" = "23.1.0";

  "version" = "24.0.1";

  "hashes" = {

    "aarch64-linux" = {

      sha256 = "056x616pp0b25wsryzrfrfnjaxr3444fc3hmv8jspl4pjxjrais2";

      url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-linux-aarch64.tar.gz";

      sha256 = "01hldmg7wfxkw0sdcnx4hg8aww8f73cdnkallx2ljm53h77n4hcb";

      url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graalnodejs-community-24.0.1-linux-aarch64.tar.gz";

    };

    "x86_64-linux" = {

      sha256 = "1si2ifwihszv06sqd25mswibiqbxhxgj6yw829f8zrdhs0sra2nz";

      url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-linux-amd64.tar.gz";

      sha256 = "0x2a9d4kp4s0sm0cj3al8xkixcicagsknfpclfj07vb46p4h09j5";

      url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graalnodejs-community-24.0.1-linux-amd64.tar.gz";

    };

    "x86_64-darwin" = {

      sha256 = "1ffkdavrs92h3f5yil15v3i7r9aggkpfqd13gl5ipqlrk6pykhr7";

      url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-macos-amd64.tar.gz";

      sha256 = "1k5hpkvhx8wkjps2qlxicif81m2dp75w4yflarppfcvaz4qx5y45";

      url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graalnodejs-community-24.0.1-macos-amd64.tar.gz";

    };

    "aarch64-darwin" = {

      sha256 = "1g6pql0pdxhxwpjqyfkaq07dar8sx2wipsyrjc7hmz3z7pjxcf5i";

      url = "https://github.com/oracle/graaljs/releases/download/graal-23.1.0/graalnodejs-community-23.1.0-macos-aarch64.tar.gz";

      sha256 = "1npzqmwhjjq1kazd52a2vi7pdwmr22acg8qf6b8r0z3y7psax1s0";

      url = "https://github.com/oracle/graaljs/releases/download/graal-24.0.1/graalnodejs-community-24.0.1-macos-aarch64.tar.gz";

    };

  };

}