From 05dec2f8ac7a179ed34c9252dd2c4d2d08d00c17 Mon Sep 17 00:00:00 2001 From: Haylin Moore Date: Sat, 5 Apr 2025 22:48:48 -0400 Subject: [PATCH] greenfoot: 3.8.2 -> 3.9.0 --- pkgs/applications/editors/greenfoot/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix index 1a1b8dcffd17..a88ab68cef87 100644 --- a/pkgs/applications/editors/greenfoot/default.nix +++ b/pkgs/applications/editors/greenfoot/default.nix @@ -10,16 +10,16 @@ stdenv.mkDerivation rec { pname = "greenfoot"; - version = "3.8.2"; + version = "3.9.0"; src = fetchurl { # We use the deb here. First instinct might be to go for the "generic" JAR # download, but that is actually a graphical installer that is much harder # to unpack than the deb. - url = "https://www.greenfoot.org/download/files/Greenfoot-linux-${ + url = "https://www.greenfoot.org/download/files/Greenfoot-linux-arm64-${ builtins.replaceStrings [ "." ] [ "" ] version }.deb"; - hash = "sha256-wpmgWtx2jTDjt+7p6HcjU/uy1PRmnAHpJ1rOYb+hV+U="; + hash = "sha256-d5bkK+teTA4fxFb46ovbZE28l8WILGStv3Vg3nJZfv0="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ab5698e8162..f808f7fce820 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14228,9 +14228,9 @@ with pkgs; evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { }; greenfoot = callPackage ../applications/editors/greenfoot { - openjdk = openjdk17.override { + openjdk = openjdk21.override { enableJavaFX = true; - openjfx_jdk = openjfx17.override { withWebKit = true; }; + openjfx_jdk = openjfx21.override { withWebKit = true; }; }; };