oraclejdk*: remove appendToName to have a consistent package name for repology

+4 -5
+1 -1
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
··· 66 in 67 68 let result = stdenv.mkDerivation rec { 69 - pname = if installjdk then "oraclejdk" else "oraclejre"; 70 version = "${productVersion}u${patchVersion}"; 71 72 src =
··· 66 in 67 68 let result = stdenv.mkDerivation rec { 69 + pname = if installjdk then "oraclejdk" else "oraclejre" + lib.optionalString pluginSupport "-with-plugin"; 70 version = "${productVersion}u${patchVersion}"; 71 72 src =
+3 -4
pkgs/top-level/all-packages.nix
··· 12674 jdkdistro = oraclejdk8distro; 12675 12676 oraclejdk8distro = installjdk: pluginSupport: 12677 - (if pluginSupport then appendToName "with-plugin" else x: x) 12678 - (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix { 12679 - inherit installjdk pluginSupport; 12680 - }); 12681 12682 oraclejdk11 = callPackage ../development/compilers/oraclejdk/jdk11-linux.nix { }; 12683
··· 12674 jdkdistro = oraclejdk8distro; 12675 12676 oraclejdk8distro = installjdk: pluginSupport: 12677 + (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix { 12678 + inherit installjdk pluginSupport; 12679 + }); 12680 12681 oraclejdk11 = callPackage ../development/compilers/oraclejdk/jdk11-linux.nix { }; 12682