Skip to content
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

Jump to bottom

graalvm-oracle: init at 22 #321026

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

graalvm-oracle: init at 22 #321026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c0003d1
graalvm-oracle: init at 21
ericdallo Oct 7, 2023
f5fb339
Update graalvm-oracle to 22
farnoy Jun 19, 2024
431d757
Move graalvm-oracle to pkgs/by-name
farnoy Jun 19, 2024
c7d75e3
Remove graalvm-oracle from all-packages
farnoy Jun 19, 2024
4e10a9a
Fix format
farnoy Aug 7, 2024
2cb3ab1
Reorganize graalvm packages and add graalvm-oracle_17
farnoy Aug 7, 2024
fdf484e
Remove the old graalvm-oracle package
farnoy Aug 7, 2024
dadac9a
Fix format
farnoy Aug 7, 2024
95c5bbb
Address PR feedback
farnoy Aug 9, 2024
b53a34d
Address review feedback
farnoy Aug 10, 2024
f6a29e8
Use stable download URLs for graalvm-oracle
farnoy Aug 11, 2024
5a3da06
nixfmt
farnoy Aug 11, 2024
2e3ddbb
Remove redundant assignment
farnoy Aug 11, 2024
ef0f803
Rewrite references to graalvmCEPackages
farnoy Aug 21, 2024
6aa74a7
Fix one more old reference to graalvm-ce
farnoy Aug 22, 2024
8076fdc
Fix some more old references to graalvm-ce
farnoy Aug 22, 2024
0d16cb3
Remove even more references to graalvmCEPackages?
farnoy Aug 22, 2024
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
4 changes: 2 additions & 2 deletions pkgs/by-name/cq/cq/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
, fetchFromGitHub
, fetchurl
, buildGraalvmNativeImage
, graalvmCEPackages
, graalvmPackages
}:

buildGraalvmNativeImage rec {
Expand All @@ -23,7 +23,7 @@ buildGraalvmNativeImage rec {
hash = "sha256-yjAC2obipdmh+JlHzVUTMtTXN2VKe4WKkyJyu2Q93c8=";
};

graalvmDrv = graalvmCEPackages.graalvm-ce;
graalvmDrv = graalvmPackages.graalvm-ce;

executable = "cq";

Expand Down
0 ...raalvm/community-edition/buildGraalvm.nix → ...opment/compilers/graalvm/buildGraalvm.nix
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{ stdenv
, fetchurl
, graalvmCEPackages
, graalvmPackages
}:

graalvmCEPackages.buildGraalvmProduct {
graalvmPackages.buildGraalvmProduct {
src = fetchurl (import ./hashes.nix).hashes.${stdenv.system};
version = (import ./hashes.nix).version;

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

graalvmCEPackages.buildGraalvmProduct {
graalvmPackages.buildGraalvmProduct {
src = fetchurl (import ./hashes.nix).hashes.${stdenv.system};
version = (import ./hashes.nix).version;

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

graalvmCEPackages.buildGraalvmProduct {
graalvmPackages.buildGraalvmProduct {
src = fetchurl (import ./hashes.nix).hashes.${stdenv.system};
version = (import ./hashes.nix).version;

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
4 changes: 2 additions & 2 deletions pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ lib
, stdenv
, fetchurl
, graalvmCEPackages
, graalvmPackages
, libyaml
, openssl
}:

graalvmCEPackages.buildGraalvmProduct {
graalvmPackages.buildGraalvmProduct {
src = fetchurl (import ./hashes.nix).hashes.${stdenv.system};
version = (import ./hashes.nix).version;

Expand Down
13 changes: 13 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,13 @@
{ callPackage }:

let
cePackages = callPackage ./community-edition { };
in
cePackages
// rec {
buildGraalvm = callPackage ./buildGraalvm.nix;

graalvm-oracle_22 = callPackage ./graalvm-oracle { version = "22"; };
graalvm-oracle_17 = callPackage ./graalvm-oracle { version = "17"; };
graalvm-oracle = graalvm-oracle_22;
}
16 changes: 16 additions & 0 deletions pkgs/development/compilers/graalvm/graalvm-oracle/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
lib,
stdenv,
fetchurl,
graalvmPackages,
useMusl ? false,
version ? "22",
}:

graalvmPackages.buildGraalvm {
inherit useMusl version;
src = fetchurl (import ./hashes.nix).${version}.${stdenv.system};
meta.platforms = builtins.attrNames (import ./hashes.nix).${version};
meta.license = lib.licenses.unfree;
pname = "graalvm-oracle";
}
38 changes: 38 additions & 0 deletions pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"22" = {
"aarch64-linux" = {
hash = "sha256-E0Fm6mFB7o39pu7JVWOoXT9BdPWiSXBx2hPvlruD5ls=";
url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.1_linux-aarch64_bin.tar.gz";
};
"x86_64-linux" = {
hash = "sha256-1YPNsBygI6N+7UXZ0YS2i3qNf1C1jd4TaQQfKUw09KM=";
url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.1_linux-x64_bin.tar.gz";
};
"x86_64-darwin" = {
hash = "sha256-waR39L44Ew8wznRc67tYD3HGFZ2UUD4+ELerWnxNpms=";
url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.1_macos-x64_bin.tar.gz";
};
"aarch64-darwin" = {
hash = "sha256-dzUVPih81jopuxAx8sAYdwonNOXHyyirUUOhvStK1F8=";
url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.1_macos-aarch64_bin.tar.gz";
};
};
"17" = {
"aarch64-linux" = {
hash = "sha256-0J/XaXGzNyBgxrW1HgUvtBCPPRfAvzwOx67p/QcY4u0=";
url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.11_linux-aarch64_bin.tar.gz";
};
"x86_64-linux" = {
hash = "sha256-t0GHR7MGSZDSAGeX7bsI1ziugaP4euRcJq+covDBUYw=";
url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.11_linux-x64_bin.tar.gz";
};
"x86_64-darwin" = {
hash = "sha256-q9b6I5hSVt67gkYzUtsJDSi4bPEkzpkoeC5ZyxfqJRc=";
url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.11_macos-x64_bin.tar.gz";
};
"aarch64-darwin" = {
hash = "sha256-o4BGCfnD25AVYwG1Ol+2eDVCgiB+mk4I1JBIjyETK6s=";
url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.11_macos-aarch64_bin.tar.gz";
};
};
}
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/babashka/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib
, buildGraalvmNativeImage
, graalvmCEPackages
, graalvmPackages
, fetchurl
, writeScript
, installShellFiles
Expand All @@ -16,7 +16,7 @@ let
sha256 = "sha256-xF0u2VO0xdNvRElhUb7atpvy2Y5T9/V1b92ffaOMga8=";
};

graalvmDrv = graalvmCEPackages.graalvm-ce;
graalvmDrv = graalvmPackages.graalvm-ce;

executable = "bb";

Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/tools/clj-kondo/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, buildGraalvmNativeImage, graalvmCEPackages, removeReferencesTo, fetchurl
{ lib, buildGraalvmNativeImage, graalvmPackages, removeReferencesTo, fetchurl
}:

buildGraalvmNativeImage rec {
Expand All @@ -11,7 +11,7 @@ buildGraalvmNativeImage rec {
sha256 = "sha256-vqdTfsIRPi2VlJLcbesRSqa/KFgqbk13vJBbEYd3heM=";
};

graalvmDrv = graalvmCEPackages.graalvm-ce;
graalvmDrv = graalvmPackages.graalvm-ce;

nativeBuildInputs = [ removeReferencesTo ];

Expand Down
2 changes: 2 additions & 0 deletions pkgs/top-level/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,8 @@ mapAliases ({
graalvm11-ce = throw "graalvm11-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26
graalvm17-ce = throw "graalvm17-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26
graalvm19-ce = throw "graalvm19-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26
graalvmCEPackages = graalvmPackages; # Added 2024-08-10
graalvm-ce = graalvmPackages.graalvm-ce; # Added 2024-08-10
grab-site = throw "grab-site has been removed because it's unmaintained and broken"; # Added 2023-11-12
gradle_4 = throw "gradle_4 has been removed because it's no longer being updated"; # Added 2023-01-17
gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17
Expand Down
9 changes: 4 additions & 5 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8286,7 +8286,7 @@ with pkgs;
};
dapl-native = callPackage ../development/interpreters/dzaima-apl {
buildNativeImage = true;
jdk = graalvm-ce;
jdk = graalvmPackages.graalvm-ce;
};

gnucap-full = gnucap.withPlugins(p: [ p.verilog ]);
Expand Down Expand Up @@ -15879,10 +15879,9 @@ with pkgs;
openjdk = jdk;
openjdk_headless = jdk_headless;

graalvmCEPackages = callPackage ../development/compilers/graalvm/community-edition { };
graalvm-ce = graalvmCEPackages.graalvm-ce;
graalvmPackages = recurseIntoAttrs (callPackage ../development/compilers/graalvm { });
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't like the usage of recurseIntoAttrs here, we probably need to introduce a scope inside graalvmPackages to ensure that all packages are build with the same scope.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm not familiar with scopes and not sure what this means. I tried just removing recurseIntoAttrs and things seem to work all the same, so it seems it can be safely dropped?

Is the fact that pkgs/development/compilers/graalvm/graalvm-oracle/default.nix uses graalvmPackages.buildGraalvm (from the parent "scope"?) problematic?

buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image {
graalvmDrv = graalvm-ce;
graalvmDrv = graalvmPackages.graalvm-ce;
}).override;

openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt {
Expand Down Expand Up @@ -16837,7 +16836,7 @@ with pkgs;

dbqn-native = dbqn.override {
buildNativeImage = true;
jdk = graalvm-ce;
jdk = graalvmPackages.graalvm-ce;
};

chibi = callPackage ../development/interpreters/chibi { };
Expand Down