diff --git a/pkgs/by-name/pr/processing/fix-ant-build.patch b/pkgs/by-name/pr/processing/fix-ant-build.patch new file mode 100644 index 000000000000..3c471262873a --- /dev/null +++ b/pkgs/by-name/pr/processing/fix-ant-build.patch @@ -0,0 +1,80 @@ +diff --git a/app/build.xml b/app/build.xml +index 37aa13d03..a495b4f7e 100644 +--- a/app/build.xml ++++ b/app/build.xml +@@ -162,6 +162,7 @@ + encoding="UTF-8" + includeAntRuntime="false" + classpath="../core/library/core.jar; ++ utils/library/utils.jar; + lib/ant.jar; + lib/ant-launcher.jar; + lib/flatlaf.jar; +diff --git a/app/utils/build.xml b/app/utils/build.xml +new file mode 100644 +index 000000000..5a4b72e32 +--- /dev/null ++++ b/app/utils/build.xml +@@ -0,0 +1,22 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/build/build.xml b/build/build.xml +index f1247b511..2f1f22128 100644 +--- a/build/build.xml ++++ b/build/build.xml +@@ -191,6 +191,7 @@ + + + ++ + + + +@@ -294,6 +295,7 @@ + + + ++ + + + +@@ -315,6 +317,7 @@ + + + ++ + + + +diff --git a/java/build.xml b/java/build.xml +index ca2e32f4f..5aeae7ac8 100644 +--- a/java/build.xml ++++ b/java/build.xml +@@ -97,6 +97,7 @@ + + + ++ + + + diff --git a/pkgs/by-name/pr/processing/package.nix b/pkgs/by-name/pr/processing/package.nix index 8e54914698e4..01573a7ab31a 100644 --- a/pkgs/by-name/pr/processing/package.nix +++ b/pkgs/by-name/pr/processing/package.nix @@ -17,7 +17,7 @@ }: let jdk = jdk17; - buildNumber = "1306"; + buildNumber = "1310"; vaqua = fetchurl { name = "VAqua9.jar"; url = "https://violetlib.org/release/vaqua/9/VAqua9.jar"; @@ -62,18 +62,21 @@ let in stdenv.mkDerivation rec { pname = "processing"; - version = "4.4.6"; + version = "4.4.10"; src = fetchFromGitHub { owner = "processing"; repo = "processing4"; rev = "processing-${buildNumber}-${version}"; - sha256 = "sha256-dqBJeDnQEDDJ1TAZqwbPU8Arsecf9iv1T311bFIBO4w="; + sha256 = "sha256-u2wQl/VGCNJPd+k3DX2eW7gkA/RARMTSNGcoQuS/Oh8="; }; # Processing did not update the todo.txt file before tagging this release, so # the "revision-check" Ant target fails. - patches = [ ./disable-revision-check.patch ]; + patches = [ + ./disable-revision-check.patch + ./fix-ant-build.patch + ]; nativeBuildInputs = [ ant