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

Merge remote-tracking branch 'channels/nixos-unstable' into jdk-13

Browse Source 
Conflicts:
	pkgs/development/compilers/adoptopenjdk-bin/sources.json
          -- keep newer adoptopenjdk versions from HEAD^2
This commit is contained in:
Matt McHenry
2020-03-09 12:29:43 -04:00
parent d00559ebb8 82b54d4906
commit 1b8719437b
9523 changed files with 292866 additions and 210816 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/openjdk/darwin/11.nix
+1 -1
View File
@@ -44,7 +44,7 @@ let
# Set JAVA_HOME automatically.
cat <<EOF >> $out/nix-support/setup-hook
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
'';
pkgs/development/compilers/openjdk/darwin/8.nix
+7 -4
View File
@@ -7,11 +7,14 @@ let
};
jdk = stdenv.mkDerivation {
name = "zulu1.8.0_121-8.20.0.5";
# @hlolli: Later version than 1.8.0_202 throws error when building jvmci.
# dyld: lazy symbol binding failed: Symbol not found: _JVM_BeforeHalt
# Referenced from: ../libjava.dylib Expected in: .../libjvm.dylib
name = "zulu1.8.0_202-8.36.0.1";
src = fetchurl {
url = "http://cdn.azul.com/zulu/bin/zulu8.20.0.5-jdk8.0.121-macosx_x64.zip";
sha256 = "2a58bd1d9b0cbf0b3d8d1bcdd117c407e3d5a0ec01e2f53565c9bec5cf9ea78b";
url = "https://cdn.azul.com/zulu/bin/zulu8.36.0.1-ca-jdk8.0.202-macosx_x64.zip";
sha256 = "0s92l1wlf02vjx8dvrsla2kq7qwxnmgh325b38mgqy872016jm9p";
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
};
@@ -44,7 +47,7 @@ let
# Set JAVA_HOME automatically.
cat <<EOF >> $out/nix-support/setup-hook
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
'';
pkgs/development/compilers/openjdk/darwin/default.nix
+1 -1
View File
@@ -44,7 +44,7 @@ let
# Set JAVA_HOME automatically.
cat <<EOF >> $out/nix-support/setup-hook
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
'';