Merge master into staging-next

pkgs/by-name/fr/fresh-editor/package.nix

@@ -12,16 +12,16 @@
 }:
 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

pkgs/by-name/go/go-tools/package.nix

@@ -6,16 +6,16 @@
 
 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" ];
 

pkgs/by-name/pr/processing/fix-ant-build.patch

@@ -1,80 +0,0 @@
-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" />

pkgs/by-name/pr/processing/fix-permissions.patch

@@ -0,0 +1,24 @@
+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 {

pkgs/by-name/pr/processing/package.nix

@@ -3,19 +3,20 @@
   stdenv,
   fetchFromGitHub,
   fetchurl,
-  ant,
   unzip,
   makeWrapper,
+  gradle_8,
   jdk17,
   jogl,
   rsync,
-  ffmpeg,
   batik,
   stripJavaArchivesHook,
   wrapGAppsHook3,
   libGL,
 }:
 let
+  # Force use of JDK 17, see https://github.com/processing/processing4/issues/1043
+  gradle = gradle_8.override { java = jdk17; };
   jdk = jdk17;
   buildNumber = "1310";
   vaqua = fetchurl {
@@ -53,12 +54,6 @@ let
     url = "mirror://maven/com/google/code/gson/gson/2.9.1/gson-2.9.1.jar";
     sha256 = "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM=";
   };
-
-  arch =
-    {
-      x86_64 = "amd64";
-    }
-    .${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name;
 in
 stdenv.mkDerivation rec {
   pname = "processing";
@@ -71,10 +66,16 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-u2wQl/VGCNJPd+k3DX2eW7gkA/RARMTSNGcoQuS/Oh8=";
   };
 
-  patches = [ ./fix-ant-build.patch ];
+  patches = [
+    # Compose Multiplatform generates its createDistributable target too late, and we don't need it anyway
+    ./skip-distributable.patch
+
+    # dirPermissions: Without this, some gradle tasks (e.g. includeJdk) fail to copy contents of read-only subfolders within the nix store
+    ./fix-permissions.patch
+  ];
 
   nativeBuildInputs = [
-    ant
+    gradle
     unzip
     makeWrapper
     stripJavaArchivesHook
@@ -83,21 +84,27 @@ stdenv.mkDerivation rec {
   buildInputs = [
     jdk
     jogl
-    ant
     rsync
-    ffmpeg
     batik
   ];
 
-  dontWrapGApps = true;
+  mitmCache = gradle.fetchDeps {
+    inherit pname;
+    data = ./deps.json;
+  };
 
-  buildPhase = ''
+  gradleFlags = [ "-Dfile.encoding=utf-8" ];
+
+  gradleBuildTask = "createDistributable";
+  gradleUpdateTask = "createDistributable";
+  enableParallelUpdating = false;
+
+  # Need to run the entire createDistributable task, otherwise the buildPhase fails at the compose checkRuntime step
+  gradleUpdateScript = ''
     runHook preBuild
+    runHook preGradleUpdate
 
-    echo "tarring jdk"
-    tar --checkpoint=10000 -czf build/linux/jdk-17.0.8-${arch}.tgz ${jdk}
     mkdir -p app/lib core/library
-    cp ${ant.home}/lib/{ant.jar,ant-launcher.jar} app/lib/
     ln -s ${jogl}/share/java/* core/library/
     ln -s ${vaqua} app/lib/VAqua9.jar
     ln -s ${flatlaf} app/lib/flatlaf.jar
@@ -107,13 +114,41 @@ stdenv.mkDerivation rec {
     unzip -qo ${jna} -d app/lib/
     mv app/lib/{jna-5.10.0/dist/jna.jar,}
     mv app/lib/{jna-5.10.0/dist/jna-platform.jar,}
+
     ln -sf ${batik}/* java/libraries/svg/library/
     cp java/libraries/svg/library/share/java/batik-all-${batik.version}.jar java/libraries/svg/library/batik.jar
-    echo "tarring ffmpeg"
-    tar --checkpoint=10000 -czf build/shared/tools/MovieMaker/ffmpeg-5.0.1.gz ${ffmpeg}
-    cd build
-    ant build
-    cd ..
+
+    gradle createDistributable
+
+    runHook postGradleUpdate
+  '';
+
+  dontWrapGApps = true;
+
+  postPatch = ''
+    substituteInPlace app/build.gradle.kts \
+      --replace-fail "https://github.com/processing/processing-examples/archive/refs/heads/main.zip" "https://github.com/processing/processing-examples/archive/b10c9e9a05a0d6c20d233ca7f30d315b5047720e.zip" \
+      --replace-fail "https://github.com/processing/processing-website/archive/refs/heads/main.zip" "https://github.com/processing/processing-website/archive/f11676d1b7464291a23ae834f2ef6ab00baaed8e.zip"
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    mkdir -p app/lib core/library
+    ln -s ${jogl}/share/java/* core/library/
+    ln -s ${vaqua} app/lib/VAqua9.jar
+    ln -s ${flatlaf} app/lib/flatlaf.jar
+    ln -s ${lsp4j} java/mode/org.eclipse.lsp4j.jar
+    ln -s ${lsp4j-jsonrpc} java/mode/org.eclipse.lsp4j.jsonrpc.jar
+    ln -s ${gson} java/mode/gson.jar
+    unzip -qo ${jna} -d app/lib/
+    mv app/lib/{jna-5.10.0/dist/jna.jar,}
+    mv app/lib/{jna-5.10.0/dist/jna-platform.jar,}
+
+    ln -sf ${batik}/* java/libraries/svg/library/
+    cp java/libraries/svg/library/share/java/batik-all-${batik.version}.jar java/libraries/svg/library/batik.jar
+
+    gradle assemble
 
     runHook postBuild
   '';
@@ -121,24 +156,28 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/share/
+    gradle createDistributable
+
+    mkdir -p $out/lib
+    cp -dpr app/build/compose/binaries/main/app/Processing/lib/* $out/lib/
+    cp -dpr app/build/compose/binaries/main/app/Processing/bin $out/unwrapped
+
     mkdir -p $out/share/applications/
     cp -dp build/linux/${pname}.desktop $out/share/applications/
-    cp -dpr build/linux/work $out/share/${pname}
-    rmdir $out/share/${pname}/java
-    ln -s ${jdk} $out/share/${pname}/java
+
+    rm -r $out/lib/app/resources/jdk
+    ln -s ${jdk}/lib/openjdk $out/lib/app/resources/jdk
+
+    makeWrapper $out/unwrapped/Processing $out/bin/Processing \
+      ''${gappsWrapperArgs[@]} \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
+      --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp"
+
     runHook postInstall
   '';
 
-  preFixup = ''
-    makeWrapper $out/share/${pname}/processing $out/bin/processing \
-      "''${gappsWrapperArgs[@]}" \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
-      --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp"
-    makeWrapper $out/share/${pname}/processing-java $out/bin/processing-java \
-      "''${gappsWrapperArgs[@]}" \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
-      --prefix _JAVA_OPTIONS " " "-Dawt.useSystemAAFontSettings=gasp"
+  postFixup = ''
+    ln -s $out/bin/Processing $out/bin/processing
   '';
 
   meta = {
@@ -148,7 +187,12 @@ stdenv.mkDerivation rec {
       gpl2Only
       lgpl21Only
     ];
+    mainProgram = "Processing";
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ evan-goode ];
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryBytecode
+    ];
   };
 }

pkgs/by-name/pr/processing/skip-distributable.patch

@@ -0,0 +1,21 @@
+diff --git a/app/build.gradle.kts b/app/build.gradle.kts
+index 0d3fcbd..88a0b63 100644
+--- a/app/build.gradle.kts
++++ b/app/build.gradle.kts
+@@ -280,16 +280,7 @@ tasks.register<Exec>("packageSnap"){
+     commandLine("snapcraft")
+ }
+ tasks.register<Zip>("zipDistributable"){
+-    dependsOn("createDistributable", "setExecutablePermissions")
+     group = "compose desktop"
+-
+-    val distributable = tasks.named<AbstractJPackageTask>("createDistributable").get()
+-    val dir = distributable.destinationDir.get()
+-    val packageName = distributable.packageName.get()
+-
+-    from(dir){ eachFile{ permissions{ unix("755") } } }
+-    archiveBaseName.set(packageName)
+-    destinationDirectory.set(dir.file("../").asFile)
+ }
+ 
+ afterEvaluate{

pkgs/by-name/sp/spicedb-zed/package.nix

@@ -8,19 +8,22 @@
 
 buildGoModule (finalAttrs: {
   pname = "zed";
-  version = "0.30.2";
+  version = "0.35.0";
 
   src = fetchFromGitHub {
     owner = "authzed";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ftSgp0zxUmSTJ7lFHxFdebKrCKbsRocDkfabVpyQ5Kg=";
+    hash = "sha256-DeqfzI5+UPsR358QnummTp/cYCr2bIotB2tB/NYYd1M=";
   };
 
-  vendorHash = "sha256-2AkknaufRhv79c9WQtcW5oSwMptkR+FB+1/OJazyGSM=";
+  vendorHash = "sha256-LnmY5GikIHgOBi0hWO5B5FyBymKSZZQMK5VnDj5Ge84=";
 
   ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${finalAttrs.src.tag}'" ];
 
+  # Version test expects '(devel)' but version is being set to the package version
+  checkFlags = [ "--skip=TestGetClientVersion" ];
+
   preCheck = ''
     export NO_COLOR=true
   '';

pkgs/by-name/sr/src-cli/package.nix

@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "src-cli";
-  version = "6.12.0";
+  version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "src-cli";
     rev = version;
-    hash = "sha256-9LAThwBnW4JB7qOz7A4M/JLcjGqNyvKgXOQjdVgvsiU=";
+    hash = "sha256-YwbZohw90RgEVpKtek4Wt2/nPhPSavKsHLmUH3ytQmw=";
   };
 
   vendorHash = "sha256-z4Clm+WdwMcdO+tMLqUQx6tNiGJ+ZSK+Zt0JKwrQdVk=";

pkgs/by-name/vo/volt/package.nix

@@ -0,0 +1,27 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "volt";
+  version = "1.5.0";
+
+  src = fetchFromGitHub {
+    owner = "hqnna";
+    repo = "volt";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-o/wMeZca7ttTwRSqp5l6XmurDT1oClq7nvfv6WgnSj8=";
+  };
+
+  cargoHash = "sha256-HIae9ZpFsa/XCkoesAaiWaotNloYCz+Km9cICM6r4qE=";
+
+  meta = {
+    description = "Ergonomic terminal settings editor for the Amp coding agent";
+    homepage = "https://github.com/hqnna/volt";
+    license = lib.licenses.blueOak100;
+    maintainers = with lib.maintainers; [ qweered ];
+    mainProgram = "volt";
+  };
+})

pkgs/development/misc/h3/default.nix

@@ -56,7 +56,7 @@ in
   };
 
   h3_4 = generic {
-    version = "4.3.0";
-    hash = "sha256-DUILKZ1QvML6qg+WdOxir6zRsgTvk+En6yjeFf6MQBg=";
+    version = "4.4.1";
+    hash = "sha256-tKonXauTJiOb5DV56tOmnvba7eNYcWTnOvCSokheVsY=";
   };
 }

pkgs/development/ocaml-modules/extlib/1.7.7.nix

@@ -1,3 +1,4 @@
+# nixpkgs-update: no auto update
 # Older version of extlib for Haxe 4.0 and 4.1.
 # May be replaceable by the next extlib + extlib-base64 release.
 {

pkgs/development/ocaml-modules/luv/default.nix

@@ -1,3 +1,5 @@
+# nixpkgs-update: no auto update
+# haxe depends on specific version of luv
 {
   lib,
   buildDunePackage,

pkgs/development/python-modules/greenplanet-energy-api/default.nix

@@ -0,0 +1,47 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  aiohttp,
+  pytest-asyncio,
+  pytest-cov,
+  aioresponses,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "greenplanet-energy-api";
+  version = "0.1.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "petschni";
+    repo = "greenplanet-energy-api";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Ffmb4UUVfFhSNAy3Fq+3ERYSfD09JnrR8rKUV0sXjNI=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+  ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-cov
+    aioresponses
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "greenplanet_energy_api" ];
+
+  meta = {
+    description = "Async Python library for querying the Green Planet Energy API";
+    homepage = "https://github.com/petschni/greenplanet-energy-api";
+    changelog = "https://github.com/petschni/greenplanet-energy-api/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})

pkgs/development/python-modules/h3/default.nix

@@ -14,17 +14,17 @@
   stdenv,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "h3";
-  version = "4.4.1";
+  version = "4.4.2";
   pyproject = true;
 
   # pypi version does not include tests
   src = fetchFromGitHub {
     owner = "uber";
     repo = "h3-py";
-    tag = "v${version}";
-    hash = "sha256-ugYx8FJUxfrJHfzRxyjaOlG/Z0KhKglRHTgKKBHzUGQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-+2cf/m+8BEEjNgIyuYmLDD7wsmc3Bg8QXaIjC0Px+Qk=";
   };
 
   dontConfigure = true;
@@ -75,9 +75,10 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "h3" ];
 
   meta = {
+    changelog = "https://github.com/uber/h3-py/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     homepage = "https://github.com/uber/h3-py";
     description = "Hierarchical hexagonal geospatial indexing system";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.kalbasit ];
   };
-}
+})

pkgs/development/python-modules/pinecone-plugin-assistant/default.nix

@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pinecone-plugin-assistant";
-  version = "3.0.1";
+  version = "3.0.2";
 
   pyproject = true;
 
   src = fetchPypi {
     pname = "pinecone_plugin_assistant";
     inherit version;
-    hash = "sha256-awDpTvG/Ve1gHSMW7m9x+W+TvyFVJ3qCZjg5XhCQ3eM=";
+    hash = "sha256-BBY68oKteJW1gauJ+FDtE55N3OpyAQyt+kxXN1nVyJY=";
   };
 
   build-system = [

pkgs/servers/home-assistant/component-packages.nix

@@ -2260,7 +2260,8 @@
       ];
     "green_planet_energy" =
       ps: with ps; [
-      ]; # missing inputs: greenplanet-energy-api
+        greenplanet-energy-api
+      ];
     "greeneye_monitor" =
       ps: with ps; [
         greeneye-monitor
@@ -7498,6 +7499,7 @@
     "gpslogger"
     "graphite"
     "gree"
+    "green_planet_energy"
     "greeneye_monitor"
     "group"
     "growatt_server"

pkgs/servers/mastodon/source.nix

@@ -5,14 +5,14 @@
   patches ? [ ],
 }:
 let
-  version = "4.5.6";
+  version = "4.5.7";
 in
 applyPatches {
   src = fetchFromGitHub {
     owner = "mastodon";
     repo = "mastodon";
     rev = "v${version}";
-    hash = "sha256-m2LDNyv2jxsp5zPKOfQWvtBG8bD8iuBWBEoz+L0OvNk=";
+    hash = "sha256-+JRoUtRI7vTQG8eLpJxMhQMAR2FeIzGfJtR9pj0sW3A=";
     passthru = {
       inherit version;
       yarnHash = "sha256-2MOl6kHidkGU2I/cZaUmbQCiEl9SDfL/j9fT/6eNdFA=";

pkgs/top-level/python-packages.nix

@@ -6658,6 +6658,8 @@ self: super: with self; {
   # built-in for pypi
   greenlet = if isPyPy then null else callPackage ../development/python-modules/greenlet { };
 
+  greenplanet-energy-api = callPackage ../development/python-modules/greenplanet-energy-api { };
+
   greenwavereality = callPackage ../development/python-modules/greenwavereality { };
 
   gremlinpython = callPackage ../development/python-modules/gremlinpython { };