Merge master into staging-nixos

}:

rustPlatform.buildRustPackage (finalAttrs: {

  pname = "fresh";

  version = "0.2.5";

  version = "0.2.9";

  src = fetchFromGitHub {

    owner = "sinelaw";

    repo = "fresh";

    tag = "v${finalAttrs.version}";

    hash = "sha256-JbjTHMvncM5wCiPa3Tmv/HJbg7sKgmOXhmu9He6Tzhk=";

    hash = "sha256-xB3ZwueGdFPcKNStet/6sLW5qiVrB0iDaeBMknrnlMI=";

  };

  cargoHash = "sha256-1b9v7K+EUOtHF3J3vOv1YyFxqnGZ5SbzyUBPCQ5i90U=";

  cargoHash = "sha256-Ja8lLU5MR4mi4tTZwUgpLpbSBdUk2OUrX299ROTgTIg=";

  nativeBuildInputs = [

    gzip

buildGoModule (finalAttrs: {

  pname = "go-tools";

  version = "2025.1.1";

  version = "2026.1";

  src = fetchFromGitHub {

    owner = "dominikh";

    repo = "go-tools";

    rev = finalAttrs.version;

    sha256 = "sha256-ekSOXaVSFdzM76tcj1hbtzhYw4fnFX3VkTnsGtJanXg=";

    sha256 = "sha256-cj/pHKwp7eGuOO1zhv5bFmuPHgsFytktLQmihhdYkfY=";

  };

  vendorHash = "sha256-HssfBnSKdVZVgf4f0mwsGTwhiszBlE2HmDy7cvyvJ60=";

  vendorHash = "sha256-Wu8+e0r0bkztLbxekbHktoKjg6c8q7ls5APSEdO8CKs=";

  excludedPackages = [ "website" ];

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 @@

+<?xml version="1.0"?>

+<project name="Processing Utils Library" default="build">

+  <target name="compile" description="Compile sources">

+    <mkdir dir="bin" />

+    <javac source="17"

+           target="17"

+           srcdir="src" destdir="bin"

+           encoding="UTF-8"

+           includeAntRuntime="false"

+           nowarn="true">

+    </javac>

+  </target>

+

+  <target name="build" depends="compile" description="Build utils library">

+    <jar basedir="bin" destfile="library/utils.jar" />

+  </target>

+

+  <target name="clean" description="Clean the build directories">

+    <delete dir="bin" />

+    <delete file="library/utils.jar" />

+  </target>

+</project>

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 @@

   <!-- also need to copy these to the bundleapp task for macos -->

   <fileset dir=".." id="runtime.jars">

     <include name="app/pde.jar" />

+    <include name="app/utils/library/utils.jar" />

     <include name="app/lib/jna.jar" />

     <include name="app/lib/jna-platform.jar" />

     <include name="app/lib/ant.jar" />

@@ -294,6 +295,7 @@

   <target name="subprojects-clean">

     <subant buildpath="../core" target="clean"/>

+    <subant buildpath="../app/utils" target="clean"/>

     <subant buildpath="../app" target="clean"/>

     <subant buildpath="../java/libraries/dxf" target="clean"/>

     <subant buildpath="../java/libraries/io" target="clean"/>

@@ -315,6 +317,7 @@

   <target name="subprojects-build">

     <subant buildpath="../core" target="build"/>

+    <subant buildpath="../app/utils" target="build"/>

     <subant buildpath="../app" target="build"/>

     <subant buildpath="../java/libraries/dxf" target="build"/>

     <subant buildpath="../java/libraries/net" target="build"/>

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 @@

     <pathelement location="../app/lib/apple.jar" />

     <pathelement location="../app/lib/jna.jar" />

     <pathelement location="../app/lib/jna-platform.jar" />

+    <pathelement location="../app/utils/library/utils.jar" />

     <pathelement location="mode/antlr-4.7.2-complete.jar" />

     <pathelement location="mode/classpath-explorer-1.0.jar" />

diff --git a/app/build.gradle.kts b/app/build.gradle.kts

index 88a0b63..a0f50bc 100644

--- a/app/build.gradle.kts

+++ b/app/build.gradle.kts

@@ -341,6 +341,7 @@ tasks.register<Copy>("includeJdk") {

     from(Jvm.current().javaHome.absolutePath)

     destinationDir = composeResources("jdk").get().asFile

+    dirPermissions { unix("rwx------") };

     fileTree(destinationDir).files.forEach { file ->

         file.setWritable(true, false)

         file.setReadable(true, false)

diff --git a/java/build.gradle.kts b/java/build.gradle.kts

index fc7151189..6dd8409fa 100644

--- a/java/build.gradle.kts

+++ b/java/build.gradle.kts

@@ -80,6 +80,7 @@ legacyLibraries.forEach { library ->

         include("*.properties")

         include("library/**/*")

         include("examples/**/*")

+        dirPermissions { unix("rwx------") };

         into( javaMode("/libraries/$library"))

     }

     bundle.configure {