Matt McHenry 1b8719437b Merge remote-tracking branch 'channels/nixos-unstable' into jdk-13 ... Conflicts: pkgs/development/compilers/adoptopenjdk-bin/sources.json -- keep newer adoptopenjdk versions from HEAD^2		2020-03-09 12:29:43 -04:00
..
generate-sources.py	adoptopenjdk-bin: add OpenJDK 13	2019-10-11 23:23:25 -04:00
jdk-darwin-base.nix	Merge pull request #70176 from taku0/adoptopenjdk-bin-11.0.4	2019-11-24 10:19:00 +01:00
jdk-linux-base.nix	Merge remote-tracking branch 'channels/nixos-unstable' into jdk-13	2020-03-09 12:29:43 -04:00
jdk8-darwin.nix	adoptopenjdk-bin: add OpenJDK 8	2019-08-19 18:54:47 -04:00
jdk8-linux.nix	adoptopenjdk-bin: add OpenJDK 8	2019-08-19 18:54:47 -04:00
jdk11-darwin.nix
jdk11-linux.nix
jdk13-darwin.nix	adoptopenjdk-bin: add OpenJDK 13	2019-10-11 23:23:25 -04:00
jdk13-linux.nix	adoptopenjdk-bin: add OpenJDK 13	2019-10-11 23:23:25 -04:00
sources.json	Merge remote-tracking branch 'channels/nixos-unstable' into jdk-13	2020-03-09 12:29:43 -04:00