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

Merge pull request #216532 from thiagokokada/add-nodejs-to-graalvm-ce

graalvmCEPackages.nodejs-installable-svm: init at 22.3.1
parents 3cbd6d52 cc7ec82f
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -120,8 +120,7 @@ let
    '' + concatProducts "postInstall";

    preFixup = lib.optionalString (stdenv.isLinux) ''
      # Find all executables in any directory that contains '/bin/'
      for bin in $(find "$out" -executable -type f -wholename '*/bin/*'); do
      for bin in $(find "$out/bin" -executable -type f); do
        wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"
      done
    '' + concatProducts "preFixup";
+11 −0
Original line number Diff line number Diff line
@@ -74,6 +74,17 @@ stdenv.mkDerivation ({
    runHook postUnpack
  '';

  # Allow autoPatchelf to automatically fix lib references between products
  fixupPhase = ''
    runHook preFixup

    mkdir -p $out/lib
    shopt -s globstar
    ln -s $out/languages/**/lib/*.so $out/lib

    runHook postFixup
  '';

  dontInstall = true;
  dontBuild = true;
  dontStrip = true;
+34 −4
Original line number Diff line number Diff line
@@ -22,20 +22,28 @@ in
rec {
  inherit buildGraalvm buildGraalvmProduct;

  graalvm11-ce = buildGraalvm rec {
  ### Java 11 ###

  # Mostly available for build purposes, not to be exposed at the top level
  graalvm11-ce-bare = buildGraalvm rec {
    version = "22.3.1";
    javaVersion = "11";
    src = fetchurl (source "graalvm-ce" javaVersion);
    meta.platforms = builtins.attrNames javaPlatform;
    products = [ ];
  };

  graalvm11-ce = graalvm11-ce-bare.override {
    products = [ native-image-installable-svm-java11 ];
  };

  # Mostly available for testing, not to be exposed at the top level
  graalvm11-ce-full = graalvm11-ce.override {
  graalvm11-ce-full = graalvm11-ce-bare.override {
    products = [
      js-installable-svm-java11
      llvm-installable-svm-java11
      native-image-installable-svm-java11
      nodejs-installable-svm-java11
      python-installable-svm-java11
      ruby-installable-svm-java11
      wasm-installable-svm-java11
@@ -60,6 +68,13 @@ rec {
    src = fetchurl (source "native-image-installable-svm" javaVersion);
  };

  nodejs-installable-svm-java11 = callPackage ./nodejs-installable-svm.nix rec {
    javaVersion = "11";
    version = "22.3.1";
    src = fetchurl (source "nodejs-installable-svm" javaVersion);
    graalvm-ce = graalvm11-ce-bare;
  };

  python-installable-svm-java11 = callPackage ./python-installable-svm.nix rec {
    javaVersion = "11";
    version = "22.3.1";
@@ -79,20 +94,28 @@ rec {
    src = fetchurl (source "wasm-installable-svm" javaVersion);
  };

  graalvm17-ce = buildGraalvm rec {
  ### Java 17 ###

  # Mostly available for build purposes, not to be exposed at the top level
  graalvm17-ce-bare = buildGraalvm rec {
    version = "22.3.1";
    javaVersion = "17";
    src = fetchurl (source "graalvm-ce" javaVersion);
    meta.platforms = builtins.attrNames javaPlatform;
    products = [ ];
  };

  graalvm17-ce = graalvm17-ce-bare.override {
    products = [ native-image-installable-svm-java17 ];
  };

  # Mostly available for testing, not to be exposed at the top level
  graalvm17-ce-full = graalvm17-ce.override {
  graalvm17-ce-full = graalvm17-ce-bare.override {
    products = [
      js-installable-svm-java17
      llvm-installable-svm-java17
      native-image-installable-svm-java17
      nodejs-installable-svm-java17
      python-installable-svm-java17
      ruby-installable-svm-java17
      wasm-installable-svm-java17
@@ -117,6 +140,13 @@ rec {
    src = fetchurl (source "native-image-installable-svm" javaVersion);
  };

  nodejs-installable-svm-java17 = callPackage ./nodejs-installable-svm.nix rec {
    javaVersion = "17";
    version = "22.3.1";
    src = fetchurl (source "nodejs-installable-svm" javaVersion);
    graalvm-ce = graalvm17-ce-bare;
  };

  python-installable-svm-java17 = callPackage ./python-installable-svm.nix rec {
    javaVersion = "17";
    version = "22.3.1";
+34 −0
Original line number Diff line number Diff line
@@ -34,6 +34,40 @@
      url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/llvm-installable-svm-java17-darwin-amd64-22.3.1.jar";
    };
  };
  "nodejs-installable-svm" = {
    "11-linux-aarch64" = {
      sha256 = "0slzvbmxwa4a6m9c0hbdp8ryh9crfq7mv6y2j4hik5m457jq98cp";
      url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-linux-aarch64-22.3.1.jar";
    };
    "17-linux-aarch64" = {
      sha256 = "1ldivy5hmq2mxmzh40hglzngylahnzyqh9rav73nicl5mz8hk4l2";
      url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-linux-aarch64-22.3.1.jar";
    };
    "11-linux-amd64" = {
      sha256 = "1p1y52b4lky2fbkml5vqy7dn9vqzj19jq5f3c90mgsfk4c7xhi66";
      url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-linux-amd64-22.3.1.jar";
    };
    "17-linux-amd64" = {
      sha256 = "0j1gkpszklzm069bccm6wgq8iq0k41bcrca0kf8pbl2y11hwywpc";
      url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-linux-amd64-22.3.1.jar";
    };
    "11-darwin-aarch64" = {
      sha256 = "1fbqc3a7i91as1sbwg2yr1zx0wz4jsaxcz9pfqy8a0z88m8vivbs";
      url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-darwin-aarch64-22.3.1.jar";
    };
    "17-darwin-aarch64" = {
      sha256 = "1swzkp0imcv30fxfwblgad57fvpsvhfpv93s8zj1lwrbarggl2y3";
      url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-darwin-aarch64-22.3.1.jar";
    };
    "11-darwin-amd64" = {
      sha256 = "0n3hm8dd0ya86hxbxv07sfp22y02vhhzahkxk2j2162n9hcdmkwk";
      url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java11-darwin-amd64-22.3.1.jar";
    };
    "17-darwin-amd64" = {
      sha256 = "0xkjqcch22bm32mczj6xs8rzsl2n6vy9hmzwfy9a71w1kpkbjn3a";
      url = "https://github.com/graalvm/graaljs/releases/download/vm-22.3.1/nodejs-installable-svm-java17-darwin-amd64-22.3.1.jar";
    };
  };
  "wasm-installable-svm" = {
    "11-linux-aarch64" = {
      sha256 = "1d67jm41psypkhpy77cb2l00smhni3pgkybwx79z7dzcyid7p2l1";
+0 −1
Original line number Diff line number Diff line
{ lib
, stdenv
, graalvm-ce
, graalvmCEPackages
, javaVersion
, src
Loading