tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

javaPackages: cleanup unused code

authored by

Sandro Jäckel and committed by
Anderson Torres e0c22ecf 8204a95e

+2 -6
+1 -1
pkgs/development/compilers/temurin-bin/jdk-linux-base.nix
··· 40 40 providedCpuTypes = builtins.filter 41 41 (arch: builtins.elem arch validCpuTypes) 42 42 (builtins.attrNames sourcePerArch); 43 - result = stdenv.mkDerivation rec { 43 + result = stdenv.mkDerivation { 44 44 pname = if sourcePerArch.packageType == "jdk" 45 45 then "${name-prefix}-bin" 46 46 else "${name-prefix}-${sourcePerArch.packageType}-bin";
+1 -5
pkgs/top-level/java-packages.nix
··· 34 34 package = if stdenv.isLinux 35 35 then package-linux 36 36 else package-darwin; 37 - in rec { 37 + in { 38 38 inherit package-linux package-darwin; 39 39 40 40 jdk-hotspot = callPackage package.jdk-hotspot {}; ··· 66 66 headless = openjdk.override { headless = true; }; 67 67 }; 68 68 69 - openjdkDarwinMissing = version: 70 - abort "OpenJDK ${builtins.toString version} is currently not supported on Darwin by nixpkgs."; 71 - 72 69 in rec { 73 - 74 70 adoptopenjdk-8 = mkAdoptopenjdk 75 71 ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix 76 72 ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix;