lol

graalvm-oracle: init at 22 (#321026)

authored by

Thiago Kenji Okada and committed by
GitHub
3a33ce7b 18580085

+100 -43
+2 -2
pkgs/by-name/cl/clj-kondo/package.nix
··· 1 1 { 2 2 lib, 3 3 buildGraalvmNativeImage, 4 - graalvmCEPackages, 4 + graalvmPackages, 5 5 fetchurl, 6 6 }: 7 7 ··· 14 14 sha256 = "sha256-/pzRKx6fqcbVwp+Eif3a1mh/awmwhhLVtFldRYibp/g="; 15 15 }; 16 16 17 - graalvmDrv = graalvmCEPackages.graalvm-ce; 17 + graalvmDrv = graalvmPackages.graalvm-ce; 18 18 19 19 extraNativeImageBuildArgs = [ 20 20 "-H:+ReportExceptionStackTraces"
+2 -2
pkgs/by-name/cq/cq/package.nix
··· 3 3 fetchFromGitHub, 4 4 fetchurl, 5 5 buildGraalvmNativeImage, 6 - graalvmCEPackages, 6 + graalvmPackages, 7 7 }: 8 8 9 9 buildGraalvmNativeImage rec { ··· 24 24 hash = "sha256-yjAC2obipdmh+JlHzVUTMtTXN2VKe4WKkyJyu2Q93c8="; 25 25 }; 26 26 27 - graalvmDrv = graalvmCEPackages.graalvm-ce; 27 + graalvmDrv = graalvmPackages.graalvm-ce; 28 28 29 29 executable = "cq"; 30 30
-22
pkgs/development/compilers/graalvm/community-edition/default.nix
··· 1 - { 2 - lib, 3 - pkgs, 4 - }: 5 - 6 - lib.makeScope pkgs.newScope (self: { 7 - buildGraalvm = self.callPackage ./buildGraalvm.nix; 8 - 9 - buildGraalvmProduct = self.callPackage ./buildGraalvmProduct.nix; 10 - 11 - graalvm-ce = self.callPackage ./graalvm-ce { }; 12 - 13 - graalvm-ce-musl = self.callPackage ./graalvm-ce { useMusl = true; }; 14 - 15 - graaljs = self.callPackage ./graaljs { }; 16 - 17 - graalnodejs = self.callPackage ./graalnodejs { }; 18 - 19 - graalpy = self.callPackage ./graalpy { }; 20 - 21 - truffleruby = self.callPackage ./truffleruby { }; 22 - })
+2 -2
pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix
··· 1 1 { 2 2 stdenv, 3 3 fetchurl, 4 - graalvmCEPackages, 4 + graalvmPackages, 5 5 }: 6 6 7 - graalvmCEPackages.buildGraalvmProduct { 7 + graalvmPackages.buildGraalvmProduct { 8 8 src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; 9 9 version = (import ./hashes.nix).version; 10 10
+2 -2
pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix
··· 1 1 { 2 2 stdenv, 3 3 fetchurl, 4 - graalvmCEPackages, 4 + graalvmPackages, 5 5 }: 6 6 7 - graalvmCEPackages.buildGraalvmProduct { 7 + graalvmPackages.buildGraalvmProduct { 8 8 src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; 9 9 version = (import ./hashes.nix).version; 10 10
+2 -2
pkgs/development/compilers/graalvm/community-edition/graalpy/default.nix
··· 1 1 { 2 2 stdenv, 3 3 fetchurl, 4 - graalvmCEPackages, 4 + graalvmPackages, 5 5 }: 6 6 7 - graalvmCEPackages.buildGraalvmProduct { 7 + graalvmPackages.buildGraalvmProduct { 8 8 src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; 9 9 version = (import ./hashes.nix).version; 10 10
+2 -2
pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix
··· 1 1 { 2 2 stdenv, 3 3 fetchurl, 4 - graalvmCEPackages, 4 + graalvmPackages, 5 5 useMusl ? false, 6 6 }: 7 7 8 - graalvmCEPackages.buildGraalvm { 8 + graalvmPackages.buildGraalvm { 9 9 inherit useMusl; 10 10 src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; 11 11 version = (import ./hashes.nix).version;
+2 -2
pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchurl, 5 - graalvmCEPackages, 5 + graalvmPackages, 6 6 libyaml, 7 7 openssl, 8 8 }: 9 9 10 - graalvmCEPackages.buildGraalvmProduct { 10 + graalvmPackages.buildGraalvmProduct { 11 11 src = fetchurl (import ./hashes.nix).hashes.${stdenv.system}; 12 12 version = (import ./hashes.nix).version; 13 13
+23
pkgs/development/compilers/graalvm/default.nix
··· 1 + { lib, pkgs }: 2 + 3 + lib.makeScope pkgs.newScope (self: { 4 + buildGraalvm = self.callPackage ./community-edition/buildGraalvm.nix; 5 + 6 + buildGraalvmProduct = self.callPackage ./community-edition/buildGraalvmProduct.nix; 7 + 8 + graalvm-ce = self.callPackage ./community-edition/graalvm-ce { }; 9 + 10 + graalvm-ce-musl = self.callPackage ./community-edition/graalvm-ce { useMusl = true; }; 11 + 12 + graaljs = self.callPackage ./community-edition/graaljs { }; 13 + 14 + graalnodejs = self.callPackage ./community-edition/graalnodejs { }; 15 + 16 + graalpy = self.callPackage ./community-edition/graalpy { }; 17 + 18 + truffleruby = self.callPackage ./community-edition/truffleruby { }; 19 + 20 + graalvm-oracle_22 = self.callPackage ./graalvm-oracle { version = "22"; }; 21 + graalvm-oracle_17 = self.callPackage ./graalvm-oracle { version = "17"; }; 22 + graalvm-oracle = self.graalvm-oracle_22; 23 + })
+16
pkgs/development/compilers/graalvm/graalvm-oracle/default.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + graalvmPackages, 6 + useMusl ? false, 7 + version ? "22", 8 + }: 9 + 10 + graalvmPackages.buildGraalvm { 11 + inherit useMusl version; 12 + src = fetchurl (import ./hashes.nix).${version}.${stdenv.system}; 13 + meta.platforms = builtins.attrNames (import ./hashes.nix).${version}; 14 + meta.license = lib.licenses.unfree; 15 + pname = "graalvm-oracle"; 16 + }
+38
pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
··· 1 + { 2 + "22" = { 3 + "aarch64-linux" = { 4 + hash = "sha256-E0Fm6mFB7o39pu7JVWOoXT9BdPWiSXBx2hPvlruD5ls="; 5 + url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.1_linux-aarch64_bin.tar.gz"; 6 + }; 7 + "x86_64-linux" = { 8 + hash = "sha256-1YPNsBygI6N+7UXZ0YS2i3qNf1C1jd4TaQQfKUw09KM="; 9 + url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.1_linux-x64_bin.tar.gz"; 10 + }; 11 + "x86_64-darwin" = { 12 + hash = "sha256-waR39L44Ew8wznRc67tYD3HGFZ2UUD4+ELerWnxNpms="; 13 + url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.1_macos-x64_bin.tar.gz"; 14 + }; 15 + "aarch64-darwin" = { 16 + hash = "sha256-dzUVPih81jopuxAx8sAYdwonNOXHyyirUUOhvStK1F8="; 17 + url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.1_macos-aarch64_bin.tar.gz"; 18 + }; 19 + }; 20 + "17" = { 21 + "aarch64-linux" = { 22 + hash = "sha256-0J/XaXGzNyBgxrW1HgUvtBCPPRfAvzwOx67p/QcY4u0="; 23 + url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.11_linux-aarch64_bin.tar.gz"; 24 + }; 25 + "x86_64-linux" = { 26 + hash = "sha256-t0GHR7MGSZDSAGeX7bsI1ziugaP4euRcJq+covDBUYw="; 27 + url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.11_linux-x64_bin.tar.gz"; 28 + }; 29 + "x86_64-darwin" = { 30 + hash = "sha256-q9b6I5hSVt67gkYzUtsJDSi4bPEkzpkoeC5ZyxfqJRc="; 31 + url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.11_macos-x64_bin.tar.gz"; 32 + }; 33 + "aarch64-darwin" = { 34 + hash = "sha256-o4BGCfnD25AVYwG1Ol+2eDVCgiB+mk4I1JBIjyETK6s="; 35 + url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.11_macos-aarch64_bin.tar.gz"; 36 + }; 37 + }; 38 + }
+2 -2
pkgs/development/interpreters/babashka/default.nix
··· 1 1 { lib 2 2 , buildGraalvmNativeImage 3 - , graalvmCEPackages 3 + , graalvmPackages 4 4 , fetchurl 5 5 , writeScript 6 6 , installShellFiles ··· 16 16 sha256 = "sha256-1bZaWg1AtStF1uuoY8Z0V4s0fMSchSTR/pTSWdEzcuw="; 17 17 }; 18 18 19 - graalvmDrv = graalvmCEPackages.graalvm-ce; 19 + graalvmDrv = graalvmPackages.graalvm-ce; 20 20 21 21 executable = "bb"; 22 22
+3
pkgs/top-level/aliases.nix
··· 509 509 gprbuild-boot = gnatPackages.gprbuild-boot; # Added 2024-02-25; 510 510 511 511 gqview = throw "'gqview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gthumb' instead"; 512 + graalvmCEPackages = graalvmPackages; # Added 2024-08-10 513 + graalvm-ce = graalvmPackages.graalvm-ce; # Added 2024-08-10 514 + graalvm-oracle = graalvmPackages.graalvm-oracle; # Added 2024-12-17 512 515 grafana_reporter = grafana-reporter; # Added 2024-06-09 513 516 grapefruit = throw "'grapefruit' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23 514 517 graylog-3_3 = throw "graylog 3.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 3.x to latest series."; # Added 2023-10-09
+4 -5
pkgs/top-level/all-packages.nix
··· 3524 3524 }; 3525 3525 dapl-native = callPackage ../development/interpreters/dzaima-apl { 3526 3526 buildNativeImage = true; 3527 - jdk = graalvm-ce; 3527 + jdk = graalvmPackages.graalvm-ce; 3528 3528 }; 3529 3529 3530 3530 gnucap-full = gnucap.withPlugins(p: [ p.verilog ]); ··· 6521 6521 openjdk = jdk; 6522 6522 openjdk_headless = jdk_headless; 6523 6523 6524 - graalvmCEPackages = recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { }); 6525 - graalvm-ce = graalvmCEPackages.graalvm-ce; 6524 + graalvmPackages = recurseIntoAttrs (callPackage ../development/compilers/graalvm { }); 6526 6525 buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image { 6527 - graalvmDrv = graalvm-ce; 6526 + graalvmDrv = graalvmPackages.graalvm-ce; 6528 6527 }).override; 6529 6528 6530 6529 openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { ··· 7158 7157 7159 7158 dbqn-native = dbqn.override { 7160 7159 buildNativeImage = true; 7161 - jdk = graalvm-ce; 7160 + jdk = graalvmPackages.graalvm-ce; 7162 7161 }; 7163 7162 7164 7163 cliscord = callPackage ../misc/cliscord {