mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 10:53:11 +00:00
temurin-bin: formatting fixes
This commit is contained in:
parent
2dea579e3e
commit
d9b2c5cff8
@ -1,11 +1,12 @@
|
||||
{ name-prefix ? "temurin"
|
||||
, brand-name ? "Eclipse Temurin"
|
||||
, sourcePerArch
|
||||
, knownVulnerabilities ? []
|
||||
, knownVulnerabilities ? [ ]
|
||||
}:
|
||||
|
||||
{ swingSupport ? true # not used for now
|
||||
, lib, stdenv
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, setJavaClassPath
|
||||
}:
|
||||
@ -17,7 +18,8 @@ let
|
||||
(arch: builtins.elem arch validCpuTypes)
|
||||
(builtins.attrNames sourcePerArch);
|
||||
result = stdenv.mkDerivation {
|
||||
pname = if sourcePerArch.packageType == "jdk"
|
||||
pname =
|
||||
if sourcePerArch.packageType == "jdk"
|
||||
then "${name-prefix}-bin"
|
||||
else "${name-prefix}-${sourcePerArch.packageType}-bin";
|
||||
version =
|
||||
@ -66,10 +68,11 @@ let
|
||||
license = licenses.gpl2Classpath;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ];
|
||||
description = "${brand-name}, prebuilt OpenJDK binary";
|
||||
platforms = builtins.map (arch: arch + "-darwin") providedCpuTypes; # some inherit jre.meta.platforms
|
||||
platforms = builtins.map (arch: arch + "-darwin") providedCpuTypes; # some inherit jre.meta.platforms
|
||||
maintainers = with maintainers; [ taku0 ];
|
||||
inherit knownVulnerabilities;
|
||||
mainProgram = "java";
|
||||
};
|
||||
};
|
||||
in result
|
||||
in
|
||||
result
|
||||
|
@ -2,15 +2,17 @@
|
||||
|
||||
let
|
||||
sources = (lib.importJSON ./sources.json).hotspot.mac;
|
||||
common = opts: callPackage (import ./jdk-darwin-base.nix opts) {};
|
||||
common = opts: callPackage (import ./jdk-darwin-base.nix opts) { };
|
||||
|
||||
EOL = [ "This JDK version has reached End of Life." ];
|
||||
in
|
||||
{
|
||||
jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; };
|
||||
jre-8 = common { sourcePerArch = sources.jre.openjdk8; };
|
||||
|
||||
jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; };
|
||||
jre-11 = common { sourcePerArch = sources.jre.openjdk11; };
|
||||
|
||||
jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; knownVulnerabilities = EOL; };
|
||||
|
||||
jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; };
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ name-prefix ? "temurin"
|
||||
, brand-name ? "Eclipse Temurin"
|
||||
, sourcePerArch
|
||||
, knownVulnerabilities ? []
|
||||
, knownVulnerabilities ? [ ]
|
||||
}:
|
||||
|
||||
{ stdenv
|
||||
@ -10,18 +10,18 @@
|
||||
, autoPatchelfHook
|
||||
, makeWrapper
|
||||
, setJavaClassPath
|
||||
# minimum dependencies
|
||||
# minimum dependencies
|
||||
, alsa-lib
|
||||
, fontconfig
|
||||
, freetype
|
||||
, libffi
|
||||
, xorg
|
||||
, zlib
|
||||
# runtime dependencies
|
||||
# runtime dependencies
|
||||
, cups
|
||||
# runtime dependencies for GTK+ Look and Feel
|
||||
# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages
|
||||
# which should be fixable, this is a no-rebuild workaround for GHC.
|
||||
# runtime dependencies for GTK+ Look and Feel
|
||||
# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages
|
||||
# which should be fixable, this is a no-rebuild workaround for GHC.
|
||||
, gtkSupport ? !stdenv.targetPlatform.isGhcjs
|
||||
, cairo
|
||||
, glib
|
||||
@ -33,7 +33,9 @@ let
|
||||
runtimeDependencies = [
|
||||
cups
|
||||
] ++ lib.optionals gtkSupport [
|
||||
cairo glib gtk3
|
||||
cairo
|
||||
glib
|
||||
gtk3
|
||||
];
|
||||
runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies;
|
||||
validCpuTypes = builtins.attrNames lib.systems.parse.cpuTypes;
|
||||
@ -41,7 +43,8 @@ let
|
||||
(arch: builtins.elem arch validCpuTypes)
|
||||
(builtins.attrNames sourcePerArch);
|
||||
result = stdenv.mkDerivation {
|
||||
pname = if sourcePerArch.packageType == "jdk"
|
||||
pname =
|
||||
if sourcePerArch.packageType == "jdk"
|
||||
then "${name-prefix}-bin"
|
||||
else "${name-prefix}-${sourcePerArch.packageType}-bin";
|
||||
|
||||
@ -123,10 +126,11 @@ let
|
||||
license = licenses.gpl2Classpath;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ];
|
||||
description = "${brand-name}, prebuilt OpenJDK binary";
|
||||
platforms = builtins.map (arch: arch + "-linux") providedCpuTypes; # some inherit jre.meta.platforms
|
||||
platforms = builtins.map (arch: arch + "-linux") providedCpuTypes; # some inherit jre.meta.platforms
|
||||
maintainers = with maintainers; [ taku0 ];
|
||||
inherit knownVulnerabilities;
|
||||
mainProgram = "java";
|
||||
};
|
||||
};
|
||||
in result
|
||||
in
|
||||
result
|
||||
|
@ -3,15 +3,17 @@
|
||||
let
|
||||
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) { };
|
||||
|
||||
EOL = [ "This JDK version has reached End of Life." ];
|
||||
in
|
||||
{
|
||||
jdk-8 = common { sourcePerArch = sources.jdk.openjdk8; };
|
||||
jre-8 = common { sourcePerArch = sources.jre.openjdk8; };
|
||||
|
||||
jdk-11 = common { sourcePerArch = sources.jdk.openjdk11; };
|
||||
jre-11 = common { sourcePerArch = sources.jre.openjdk11; };
|
||||
|
||||
jdk-16 = common { sourcePerArch = sources.jdk.openjdk16; knownVulnerabilities = EOL; };
|
||||
|
||||
jdk-17 = common { sourcePerArch = sources.jdk.openjdk17; };
|
||||
|
Loading…
Reference in New Issue
Block a user