zulu{23,24}: drop (#461707)
This commit is contained in:
@@ -7,7 +7,7 @@
|
|||||||
makeDesktopItem,
|
makeDesktopItem,
|
||||||
copyDesktopItems,
|
copyDesktopItems,
|
||||||
autoPatchelfHook,
|
autoPatchelfHook,
|
||||||
zulu24,
|
zulu25,
|
||||||
gtk3,
|
gtk3,
|
||||||
gsettings-desktop-schemas,
|
gsettings-desktop-schemas,
|
||||||
writeScript,
|
writeScript,
|
||||||
@@ -27,7 +27,7 @@ let
|
|||||||
pname = "sparrow";
|
pname = "sparrow";
|
||||||
version = "2.2.3";
|
version = "2.2.3";
|
||||||
|
|
||||||
openjdk = zulu24.override { enableJavaFX = true; };
|
openjdk = zulu25.override { enableJavaFX = true; };
|
||||||
|
|
||||||
sparrowArch =
|
sparrowArch =
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,54 +0,0 @@
|
|||||||
{
|
|
||||||
callPackage,
|
|
||||||
enableJavaFX ? false,
|
|
||||||
...
|
|
||||||
}@args:
|
|
||||||
|
|
||||||
callPackage ./common.nix (
|
|
||||||
{
|
|
||||||
# Details from https://www.azul.com/downloads/?version=java-23-lts&package=jdk
|
|
||||||
# Note that the latest build may differ by platform
|
|
||||||
dists = {
|
|
||||||
x86_64-linux = {
|
|
||||||
zuluVersion = "23.28.85";
|
|
||||||
jdkVersion = "23.0.0";
|
|
||||||
hash =
|
|
||||||
if enableJavaFX then
|
|
||||||
"sha256-HEQ0lxHsoyHG+ZWIlWsbkqMf/rauARafzWoiElRwekA="
|
|
||||||
else
|
|
||||||
"sha256-a1YPqBMaWkoruNFoSckLyx00LCOZNsowlSn2L3XCDJA=";
|
|
||||||
};
|
|
||||||
|
|
||||||
aarch64-linux = {
|
|
||||||
zuluVersion = "23.28.85";
|
|
||||||
jdkVersion = "23.0.0";
|
|
||||||
hash =
|
|
||||||
if enableJavaFX then
|
|
||||||
throw "JavaFX is not available for aarch64-linux"
|
|
||||||
else
|
|
||||||
"sha256-/i+ch7BMAwMQ1C4e3shp9BHuQ67vVXfmIK1YKs7L24M=";
|
|
||||||
};
|
|
||||||
|
|
||||||
x86_64-darwin = {
|
|
||||||
zuluVersion = "23.28.85";
|
|
||||||
jdkVersion = "23.0.0";
|
|
||||||
hash =
|
|
||||||
if enableJavaFX then
|
|
||||||
"sha256-1/YmLWA/men8jMjnhkZVMf2irf6Tc/5x7UECxqKJcL4="
|
|
||||||
else
|
|
||||||
"sha256-rEr8M3KF9Z95gV8sHqi5lQD2RJjtssZx8Q8goy6danw=";
|
|
||||||
};
|
|
||||||
|
|
||||||
aarch64-darwin = {
|
|
||||||
zuluVersion = "23.28.85";
|
|
||||||
jdkVersion = "23.0.0";
|
|
||||||
hash =
|
|
||||||
if enableJavaFX then
|
|
||||||
"sha256-TumPJoHmvklMlcpF4PFY/Arcdc5fkX5z0xeIuNFxluQ="
|
|
||||||
else
|
|
||||||
"sha256-gFvfJL0RQgIOATLTMdfa+fStUCrdHYC3rxy0j5eNVDc=";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
// removeAttrs args [ "callPackage" ]
|
|
||||||
)
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
{
|
|
||||||
callPackage,
|
|
||||||
enableJavaFX ? false,
|
|
||||||
...
|
|
||||||
}@args:
|
|
||||||
|
|
||||||
let
|
|
||||||
# For 24 JDK FX can be different version than regular JDK
|
|
||||||
zuluVersion = if enableJavaFX then "24.32.13" else "24.32.13";
|
|
||||||
jdkVersion = "24.0.2";
|
|
||||||
in
|
|
||||||
callPackage ./common.nix (
|
|
||||||
{
|
|
||||||
# Details from https://www.azul.com/downloads/?version=java-24&package=jdk
|
|
||||||
# Note that the latest build may differ by platform
|
|
||||||
dists = {
|
|
||||||
x86_64-linux = {
|
|
||||||
inherit zuluVersion jdkVersion;
|
|
||||||
hash =
|
|
||||||
if enableJavaFX then
|
|
||||||
"sha256-6ZCa348yFLoZ70iDjNkN17dl1IWe53HxKMGpMhFuEOE="
|
|
||||||
else
|
|
||||||
"sha256-seZl5oZmHJlAFsOR6mFAvX9CEY+WatKIeYbi7W8RO/U=";
|
|
||||||
};
|
|
||||||
|
|
||||||
aarch64-linux = {
|
|
||||||
inherit zuluVersion jdkVersion;
|
|
||||||
hash =
|
|
||||||
if enableJavaFX then
|
|
||||||
"sha256-pVspe5R5INmEIJNiihDanOwleBklUp7Svj1NwzOe+ws="
|
|
||||||
else
|
|
||||||
"sha256-hV19g22QKWngOvNGh4dCaTOzLke6VjdsPCGQiVlyij0=";
|
|
||||||
};
|
|
||||||
|
|
||||||
x86_64-darwin = {
|
|
||||||
inherit zuluVersion jdkVersion;
|
|
||||||
hash =
|
|
||||||
if enableJavaFX then
|
|
||||||
"sha256-JXsx8GvjPEQO9ZN3p+CraSWeqc0KDIRBado+jz7l2ww="
|
|
||||||
else
|
|
||||||
"sha256-UHY+Oy6g98bVk5BTfd/Mx3OT5He9SnWUR0L+LZso3Lo=";
|
|
||||||
};
|
|
||||||
|
|
||||||
aarch64-darwin = {
|
|
||||||
inherit zuluVersion jdkVersion;
|
|
||||||
hash =
|
|
||||||
if enableJavaFX then
|
|
||||||
"sha256-Z825S6qxHMm3kwHQnu15dihguDOrxlM1lca3wU8lCqk="
|
|
||||||
else
|
|
||||||
"sha256-jDHoPG4NpNXVK35yNHe5JBkmaKNAixmmMEE0P9jcfnU=";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
// removeAttrs args [ "callPackage" ]
|
|
||||||
)
|
|
||||||
@@ -1689,6 +1689,8 @@ mapAliases {
|
|||||||
zotify = throw "zotify has been removed due to lack of upstream maintenance"; # Added 2025-09-26
|
zotify = throw "zotify has been removed due to lack of upstream maintenance"; # Added 2025-09-26
|
||||||
zq = throw "zq has been replaced by zed"; # Converted to throw 2025-10-26
|
zq = throw "zq has been replaced by zed"; # Converted to throw 2025-10-26
|
||||||
zsh-git-prompt = throw "zsh-git-prompt was removed as it is unmaintained upstream"; # Added 2025-08-28
|
zsh-git-prompt = throw "zsh-git-prompt was removed as it is unmaintained upstream"; # Added 2025-08-28
|
||||||
|
zulu23 = throw "Zulu OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-14
|
||||||
|
zulu24 = throw "Zulu OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-11-14
|
||||||
zyn-fusion = throw "'zyn-fusion' has been renamed to/replaced by 'zynaddsubfx'"; # Converted to throw 2025-10-27
|
zyn-fusion = throw "'zyn-fusion' has been renamed to/replaced by 'zynaddsubfx'"; # Converted to throw 2025-10-27
|
||||||
# keep-sorted end
|
# keep-sorted end
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5427,16 +5427,12 @@ with pkgs;
|
|||||||
zulu11 = callPackage ../development/compilers/zulu/11.nix { };
|
zulu11 = callPackage ../development/compilers/zulu/11.nix { };
|
||||||
zulu17 = callPackage ../development/compilers/zulu/17.nix { };
|
zulu17 = callPackage ../development/compilers/zulu/17.nix { };
|
||||||
zulu21 = callPackage ../development/compilers/zulu/21.nix { };
|
zulu21 = callPackage ../development/compilers/zulu/21.nix { };
|
||||||
zulu23 = callPackage ../development/compilers/zulu/23.nix { };
|
|
||||||
zulu24 = callPackage ../development/compilers/zulu/24.nix { };
|
|
||||||
zulu25 = callPackage ../development/compilers/zulu/25.nix { };
|
zulu25 = callPackage ../development/compilers/zulu/25.nix { };
|
||||||
})
|
})
|
||||||
zulu8
|
zulu8
|
||||||
zulu11
|
zulu11
|
||||||
zulu17
|
zulu17
|
||||||
zulu21
|
zulu21
|
||||||
zulu23
|
|
||||||
zulu24
|
|
||||||
zulu25
|
zulu25
|
||||||
;
|
;
|
||||||
zulu = zulu21;
|
zulu = zulu21;
|
||||||
|
|||||||
Reference in New Issue
Block a user