Skip to content

graalvm-oracle: init at 21 #259639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ericdallo wants to merge 1 commit into from
Closed

graalvm-oracle: init at 21 #259639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...raalvm/community-edition/buildGraalvm.nix → ...opment/compilers/graalvm/buildGraalvm.nix
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions pkgs/development/compilers/graalvm/community-edition/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
}:

{
buildGraalvm = callPackage ./buildGraalvm.nix;

buildGraalvmProduct = callPackage ./buildGraalvmProduct.nix;

graalvm-ce = callPackage ./graalvm-ce { };
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv
, fetchurl
, graalvmCEPackages
, graalvmPackages
, useMusl ? false
}:

graalvmCEPackages.buildGraalvm {
graalvmPackages.buildGraalvm {
inherit useMusl;
src = fetchurl (import ./hashes.nix).hashes.${stdenv.system};
version = (import ./hashes.nix).version;
Expand Down
11 changes: 11 additions & 0 deletions pkgs/development/compilers/graalvm/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{ lib
, stdenv
, callPackage
, fetchurl
}:

{

buildGraalvm = callPackage ./buildGraalvm.nix;

}
14 changes: 14 additions & 0 deletions pkgs/development/compilers/graalvm/oracle/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{ lib
, stdenv
, fetchurl
, graalvmPackages
, useMusl ? false
}:

graalvmPackages.buildGraalvm {
inherit useMusl;
src = fetchurl (import ./hashes.nix).hashes.${stdenv.system};
version = (import ./hashes.nix).version;
meta.platforms = builtins.attrNames (import ./hashes.nix).hashes;
meta.license = lib.licenses.unfree;
}
21 changes: 21 additions & 0 deletions pkgs/development/compilers/graalvm/oracle/hashes.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"version" = "21";
"hashes" = {
"aarch64-linux" = {
sha256 = "eb1eaf9d1e1e01263b0acd552552686084903ae11a9a7698a144ef8c3ee02dec";
url = "https://download.oracle.com/graalvm/21/archive/graalvm-jdk-21_linux-aarch64_bin.tar.gz";
};
"x86_64-linux" = {
sha256 = "be1ab3c9b08b5747b7cd577c991d25b52157cff1c8c5f290f8556c593b57a6f4";
url = "https://download.oracle.com/graalvm/21/archive/graalvm-jdk-21_linux-x64_bin.tar.gz";
};
"x86_64-darwin" = {
sha256 = "0744ab104998f8f45d9ae582134963f5d273286dff9aff586aed24f5f8434660";
url = "https://download.oracle.com/graalvm/21/archive/graalvm-jdk-21_macos-x64_bin.tar.gz";
};
"aarch64-darwin" = {
sha256 = "c2ca434adef1e497c8a4d942ae1dbf6bbd1c8174a6fcdafc65cde0e853285300";
url = "https://download.oracle.com/graalvm/21/archive/graalvm-jdk-21_macos-aarch64_bin.tar.gz";
};
};
}
3 changes: 3 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16481,9 +16481,12 @@ with pkgs;
openjdk = jdk;
openjdk_headless = jdk_headless;

graalvmPackages =
recurseIntoAttrs (callPackage ../development/compilers/graalvm { });
graalvmCEPackages =
recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { });
graalvm-ce = graalvmCEPackages.graalvm-ce;
Comment on lines +16484 to 16488
Copy link
Contributor

@thiagokokada thiagokokada Oct 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we are going to create this graalvmPackages, I think we need to do a clean-up.

Please move all packages to be under the graalvmPackages, and make the graalvmCEPackages an alias to graalvmPackages.

Copy link
Member Author

@ericdallo ericdallo Oct 16, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought that the others may not make sense for now as they are not available for oracle?

Copy link
Contributor

@thiagokokada thiagokokada Oct 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

graalvmCEPackages was a mistake by itself because community edition is just a detail of the package, but since we didn't have a better reason to do so it was never fixed.

Since we are going to introduce graalvmPackages anyway, we can simply fix this mistake and deprecate graalvmCEPackages later.

graalvm-oracle = callPackage ../development/compilers/graalvm/oracle { };
buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image {
graalvmDrv = graalvm-ce;
}).override;
Expand Down