alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

{temurin,adoptopenjdk}-bin: use alpine_linux os for musl libc

Browse source
This commit is contained in:
Yureka 2022-10-10 10:57:08 +02:00
parent d968a99bc0
commit 8886c89d0e
10 changed files with 45 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
View file

@ -1,11 +1,12 @@
{ lib }: { stdenv, lib }:
let let
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
sources = lib.importJSON ./sources.json; sources = lib.importJSON ./sources.json;
in in
{ {
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jdk.hotspot; }; jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jdk.hotspot; };
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jre.hotspot; }; jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jre.hotspot; };
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jdk.openj9; }; jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jdk.openj9; };
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jre.openj9; }; jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jre.openj9; };
} }

11
pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix
View file

@ -1,11 +1,12 @@
{ lib }: { stdenv, lib }:
let let
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
sources = lib.importJSON ./sources.json; sources = lib.importJSON ./sources.json;
in in
{ {
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jre.hotspot; knownVulnerabilities = ["Support ended"]; }; jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jdk.openj9; knownVulnerabilities = ["Support ended"]; }; jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jre.openj9; knownVulnerabilities = ["Support ended"]; }; jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jre.openj9; knownVulnerabilities = ["Support ended"]; };
} }

11
pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix
View file

@ -1,11 +1,12 @@
{ lib }: { stdenv, lib }:
let let
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
sources = lib.importJSON ./sources.json; sources = lib.importJSON ./sources.json;
in in
{ {
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jre.hotspot; knownVulnerabilities = ["Support ended"]; }; jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jdk.openj9; knownVulnerabilities = ["Support ended"]; }; jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jre.openj9; knownVulnerabilities = ["Support ended"]; }; jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jre.openj9; knownVulnerabilities = ["Support ended"]; };
} }

11
pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix
View file

@ -1,11 +1,12 @@
{ lib }: { stdenv, lib }:
let let
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
sources = lib.importJSON ./sources.json; sources = lib.importJSON ./sources.json;
in in
{ {
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jdk.hotspot; }; jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.hotspot; };
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jre.hotspot; }; jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.hotspot; };
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jdk.openj9; }; jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.openj9; };
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jre.openj9; }; jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.openj9; };
} }

11
pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix
View file

@ -1,11 +1,12 @@
{ lib }: { stdenv, lib }:
let let
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
sources = lib.importJSON ./sources.json; sources = lib.importJSON ./sources.json;
in in
{ {
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jdk.hotspot; }; jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.hotspot; };
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jre.hotspot; }; jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.hotspot; };
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jdk.openj9; }; jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.openj9; };
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jre.openj9; }; jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.openj9; };
} }

7
pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix
View file

@ -1,9 +1,10 @@
{ lib }: { stdenv, lib }:
let let
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
sources = lib.importJSON ./sources.json; sources = lib.importJSON ./sources.json;
in in
{ {
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.linux.jdk.hotspot; }; jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.${variant}.jdk.hotspot; };
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.linux.jre.hotspot; }; jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.${variant}.jre.hotspot; };
} }

11
pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
View file

@ -1,11 +1,12 @@
{ lib }: { stdenv, lib }:
let let
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
sources = lib.importJSON ./sources.json; sources = lib.importJSON ./sources.json;
in in
{ {
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jdk.hotspot; }; jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jdk.hotspot; };
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jre.hotspot; }; jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jre.hotspot; };
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jdk.openj9; }; jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jdk.openj9; };
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jre.openj9; }; jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jre.openj9; };
} }

5
pkgs/development/compilers/temurin-bin/jdk-linux.nix
View file

@ -1,7 +1,8 @@
{ lib, callPackage }: { stdenv, lib, callPackage }:
let let
sources = (lib.importJSON ./sources.json).hotspot.linux; variant = if stdenv.hostPlatform.isMusl then "alpine-linux" else "linux";
sources = (lib.importJSON ./sources.json).hotspot.${variant};
common = opts: callPackage (import ./jdk-linux-base.nix opts) {}; common = opts: callPackage (import ./jdk-linux-base.nix opts) {};
in in
{ {

2
pkgs/top-level/all-packages.nix
View file

@ -13197,7 +13197,7 @@ with pkgs;
semeru-bin = semeru-bin-17; semeru-bin = semeru-bin-17;
semeru-jre-bin = semeru-jre-bin-17; semeru-jre-bin = semeru-jre-bin-17;
adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit lib; }; adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit stdenv lib; };
adoptopenjdk-bin-17-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix { inherit lib; }; adoptopenjdk-bin-17-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix { inherit lib; };
adoptopenjdk-hotspot-bin-17 = if stdenv.isLinux adoptopenjdk-hotspot-bin-17 = if stdenv.isLinux

2
pkgs/top-level/java-packages.nix
View file

@ -28,7 +28,7 @@ in {
}; };
mkAdoptopenjdk = path-linux: path-darwin: let mkAdoptopenjdk = path-linux: path-darwin: let
package-linux = import path-linux { inherit lib; }; package-linux = import path-linux { inherit stdenv lib; };
package-darwin = import path-darwin { inherit lib; }; package-darwin = import path-darwin { inherit lib; };
package = if stdenv.isLinux package = if stdenv.isLinux
then package-linux then package-linux