JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #101438 from nora-puchreiner/patch-1

Browse Source 
graalvm8-ee, graalvm11-ee: 20.0.0 -> 20.2.1
This commit is contained in:
WORLDofPEACE 2020-10-31 04:01:19 -04:00 committed by GitHub
commit 7bee257d88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/development/compilers/graalvm/enterprise-edition.nix
View File

@ -1,44 +1,51 @@
{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg_3, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }: { stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }:
let let
common = javaVersion: common = javaVersion:
let let
graalvmXXX-ee = stdenv.mkDerivation rec { graalvmXXX-ee = stdenv.mkDerivation rec {
pname = "graalvm${javaVersion}-ee"; pname = "graalvm${javaVersion}-ee";
version = "20.0.0"; version = "20.2.1";
srcs = [ srcs = [
(requireFile { (requireFile {
name = "graalvm-ee-java${javaVersion}-linux-amd64-${version}.tar.gz"; name = "graalvm-ee-java${javaVersion}-linux-amd64-${version}.tar.gz";
sha256 = { "8" = "2df9b31b96f7a24b6a2fe3ecea0b5e819d5d058fde6320016dba1787ce59e99e"; sha256 = { "8" = "e0bb182146283a43824dd2c2ceeb89b6ff7a93f9a85da889f8663ce1c2bd3002";
"11" = "b704fd27b5993584a1ad659b41f42ff0ae8893c066b64a6f6a1719fbee382536"; "11" = "e5d92d361e7859fe5f88c92d7bb466e285e07f1e4e2d9944948f85fa0e3aee2b";
}.${javaVersion}; }.${javaVersion};
url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
}) })
(requireFile { (requireFile {
name = "native-image-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; name = "native-image-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
sha256 = { "8" = "a9f3f86d880d133bd24ad3b1d95129a96e80ea1d8fbc865d09e9410b921e6897"; sha256 = { "8" = "37ac6a62f68adad513057a60513ba75749adf98cc73999b3918afe159900428d";
"11" = "57086123a95f1e9d4e67b92f830bad9325431908c69a40ef10f28ed586d8bd35"; "11" = "f62df715ad529f8b84854644ac99e0a9a349232c7f03985d20a2a8be20edaa44";
}.${javaVersion};
url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
})
(requireFile {
name = "llvm-toolchain-installable-java${javaVersion}-linux-amd64-${version}.jar";
sha256 = { "8" = "da98a8c17b0c724b41d1596b57e282a1ecfcbf9140404dfb04b0d4d9fb159d8a";
"11" = "fc442c396e92f59d034a69175104cb3565c3d128426bd939cc94c6ceccbb720f";
}.${javaVersion}; }.${javaVersion};
url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
}) })
(requireFile { (requireFile {
name = "ruby-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; name = "ruby-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
sha256 = { "8" = "28b2910736f41070c84b97f1b1a3c5fa43ebdcd926ec92c8f145550b5b975b3c"; sha256 = { "8" = "44f6887249f2eb54cba98dd4d9de019da5463d92982e03bf655fffe4bb520daf";
"11" = "27ff1befa67fe5cc9eb0216b6b1105876f44d13eff6137f36f29f13377ea687b"; "11" = "941f3752ccb097958f49250586f04c305092ded3ea4c1b7d9a0f7632e47fa335";
}.${javaVersion}; }.${javaVersion};
url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
}) })
(requireFile { (requireFile {
name = "python-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; name = "python-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
sha256 = { "8" = "9c83bcd71e316805c2914c9002ce348ae44829606adc2375d9188b1eaaaf82f9"; sha256 = { "8" = "5c3993c701bd09c6064dcf4a6d9c7489620d0654b03c74682398c788c0211c09";
"11" = "5ca51478bcb5ea5bd9be35856dd7fb2ef03b888cd1b7284a8c15531979025fb4"; "11" = "de3ebf35ce47dc399d7976cbd09fde0e85f2c10f85bc3fe8f32bb9e2b500ab70";
}.${javaVersion}; }.${javaVersion};
url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
}) })
(requireFile { (requireFile {
name = "wasm-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; name = "wasm-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
sha256 = { "8" = "e8bd14d3f9bf652104e4346e0899a0351afaecae030a9c0ce0f91b1f93d9e660"; sha256 = { "8" = "c0a334b271fd32c098bb3c42eada7eafb9f536becaa756097eebe4682915b067";
"11" = "d24eeb84625bb7a5e330b897fd6dde7fc579a687997b64625199c33fa83c40b4"; "11" = "9e801071992a0ff976bc40b640a8b9368fd8ea890ba986543658fcbaa3a7fd68";
}.${javaVersion}; }.${javaVersion};
url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
}) })
@ -47,7 +54,7 @@ let
unpackPhase = '' unpackPhase = ''
unpack_jar() { unpack_jar() {
jar=$1 jar=$1
unzip $jar -d $out unzip -o $jar -d $out
perl -ne 'use File::Path qw(make_path); perl -ne 'use File::Path qw(make_path);
use File::Basename qw(dirname); use File::Basename qw(dirname);
if (/^(.+) = (.+)$/) { if (/^(.+) = (.+)$/) {
@ -70,6 +77,7 @@ let
unpack_jar ''${arr[2]} unpack_jar ''${arr[2]}
unpack_jar ''${arr[3]} unpack_jar ''${arr[3]}
unpack_jar ''${arr[4]} unpack_jar ''${arr[4]}
unpack_jar ''${arr[5]}
''; '';
installPhase = { installPhase = {
@ -117,7 +125,7 @@ let
}.${javaVersion} }.${javaVersion}
}:${ }:${
stdenv.lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender stdenv.lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender
glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg_3 libGL ]}" glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}"
for f in $(find $out -type f -perm -0100); do for f in $(find $out -type f -perm -0100); do
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true