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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2018-12-24 15:02:29 +01:00
parent d5d15828b5 dd3eea4b47
commit ef935fa101
336 changed files with 5417 additions and 2469 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
+2 -1
View File
@@ -5,5 +5,6 @@ in
jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.hotspot;
jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.hotspot;
jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.openj9;
jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9;
# openj9 jre builds are currently missing: https://github.com/AdoptOpenJDK/openjdk-build/issues/796
#jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9;
}