pyrox.dev / nixpkgs
lol
fork atom

Move jdk -> oraclejdk

Eelco Dolstra 94db68d2 c39bee0c

+3 -3
unified split
pkgs/development/compilers/jdk/dlj-bundle-builder.sh pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh
pkgs/development/compilers/jdk/jdk-linux-base.nix pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
pkgs/development/compilers/jdk/jdk6-construct.sh pkgs/development/compilers/oraclejdk/jdk6-construct.sh
pkgs/development/compilers/jdk/jdk6-linux.nix pkgs/development/compilers/oraclejdk/jdk6-linux.nix
pkgs/development/compilers/jdk/jdk7-linux.nix pkgs/development/compilers/oraclejdk/jdk7-linux.nix
pkgs/development/compilers/jdk/jdk8-linux.nix pkgs/development/compilers/oraclejdk/jdk8-linux.nix
+3 -3
pkgs/top-level/all-packages.nix
··· 3067 jdkdistro = installjdk: pluginSupport: 3068 assert supportsJDK; 3069 (if pluginSupport then appendToName "with-plugin" else x: x) 3070 - (callPackage ../development/compilers/jdk/jdk6-linux.nix { }); 3071 3072 oraclejdk7distro = installjdk: pluginSupport: 3073 assert supportsJDK; 3074 (if pluginSupport then appendToName "with-plugin" else x: x) 3075 - (callPackage ../development/compilers/jdk/jdk7-linux.nix { inherit installjdk; }); 3076 3077 oraclejdk8distro = installjdk: pluginSupport: 3078 assert supportsJDK; 3079 (if pluginSupport then appendToName "with-plugin" else x: x) 3080 - (callPackage ../development/compilers/jdk/jdk8-linux.nix { inherit installjdk; }); 3081 3082 jikes = callPackage ../development/compilers/jikes { }; 3083
··· 3067 jdkdistro = installjdk: pluginSupport: 3068 assert supportsJDK; 3069 (if pluginSupport then appendToName "with-plugin" else x: x) 3070 + (callPackage ../development/compilers/oraclejdk/jdk6-linux.nix { }); 3071 3072 oraclejdk7distro = installjdk: pluginSupport: 3073 assert supportsJDK; 3074 (if pluginSupport then appendToName "with-plugin" else x: x) 3075 + (callPackage ../development/compilers/oraclejdk/jdk7-linux.nix { inherit installjdk; }); 3076 3077 oraclejdk8distro = installjdk: pluginSupport: 3078 assert supportsJDK; 3079 (if pluginSupport then appendToName "with-plugin" else x: x) 3080 + (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix { inherit installjdk; }); 3081 3082 jikes = callPackage ../development/compilers/jikes { }; 3083