Merge master into staging-next

pkgs/applications/science/electronics/pulseview/default.nix

@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchgit,
+  fetchFromGitHub,
   pkg-config,
   cmake,
   glib,
@@ -24,12 +24,13 @@
 
 stdenv.mkDerivation {
   pname = "pulseview";
-  version = "0.4.2-unstable-2024-03-14";
+  version = "0.4.2-unstable-2025-05-15";
 
-  src = fetchgit {
-    url = "git://sigrok.org/pulseview";
-    rev = "d00efc65ef47090b71c4da12797056033bee795f";
-    hash = "sha256-MwfMUqV3ejxesg+3cFeXVB5hwg4r0cOCgHJuH3ZLmNE=";
+  src = fetchFromGitHub {
+    owner = "sigrokproject";
+    repo = "pulseview";
+    rev = "e2fe9dfb91c7de85c410922ee9268c3f526bcc54";
+    hash = "sha256-b9pqtsF5J9MA7XMIgFZltrVqi64ZPObBTiaws3zSDRg=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/fo/fop/package.nix

@@ -1,61 +1,43 @@
 {
   lib,
-  stdenv,
   fetchurl,
-  fetchpatch,
-  ant,
-  jdk,
+  maven,
   jre,
   makeWrapper,
   stripJavaArchivesHook,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+maven.buildMavenPackage rec {
   pname = "fop";
-  version = "2.8";
+  version = "2.11";
 
   src = fetchurl {
-    url = "mirror://apache/xmlgraphics/fop/fop-${finalAttrs.version}-src.tar.gz";
-    hash = "sha256-b7Av17wu6Ar/npKOiwYqzlvBFSIuXTpqTacM1sxtBvc=";
+    url = "https://dlcdn.apache.org/xmlgraphics/fop/source/fop-${version}-src.tar.gz";
+    hash = "sha256-uY6cUjmyuenfK3jAWvugsYa5qg8rbnvRZZ6qA/g2fZM=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2024-28168.patch";
-      url = "https://github.com/apache/xmlgraphics-fop/commit/d96ba9a11710d02716b6f4f6107ebfa9ccec7134.patch";
-      hash = "sha256-zmUA1Tq6iZtvNECCiXebXodp6AikBn10NTZnVHpPMlw=";
-    })
-  ];
+  mvnHash = "sha256-EaOIAy0+YPrF+yGsFKKqcA4bt90bq1Z86V57P9rMatE=";
+
+  buildOffline = true;
+  doCheck = false;
 
   nativeBuildInputs = [
-    ant
-    jdk
     makeWrapper
     stripJavaArchivesHook
   ];
 
-  # Note: not sure if this is needed anymore
-  env.JAVA_TOOL_OPTIONS = "-Dfile.encoding=UTF8";
-
-  buildPhase = ''
-    runHook preBuild
-
-    # build only the "package" target, which generates the fop command.
-    ant -f fop/build.xml package
-
-    runHook postBuild
-  '';
-
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/lib $out/share/doc/fop
-    cp fop/build/*.jar fop/lib/*.jar $out/lib/
-    cp -r README fop/examples/ $out/share/doc/fop/
+    install -Dm644 fop*/target/*.jar -t "$out/lib"
+    install -Dm644 fop*/lib/*.jar -t "$out/lib"
+
+    install -Dm644 README -t "$out/share/doc/fop"
+    cp -r fop/examples/ "$out/share/doc/fop"
 
     # There is a fop script in the source archive, but it has many impurities.
     # Instead of patching out 90 % of the script, we write our own.
-    makeWrapper ${jre}/bin/java $out/bin/fop \
+    makeWrapper ${lib.getExe jre} "$out/bin/fop" \
         --add-flags "-Djava.awt.headless=true" \
         --add-flags "-classpath $out/lib/\*" \
         --add-flags "org.apache.fop.cli.Main"
@@ -91,4 +73,4 @@ stdenv.mkDerivation (finalAttrs: {
       binaryBytecode # source bundles dependencies as jars
     ];
   };
-})
+}

pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix

@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ha-mqtt-discoverable-cli";
-  version = "0.20.1";
+  version = "0.21.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "unixorn";
     repo = "ha-mqtt-discoverable-cli";
     tag = "v${version}";
-    hash = "sha256-4iQHpz09CbPuU+236HQdRNRDB3bcj9VZ0s/4BdxyB/8=";
+    hash = "sha256-nJS8JbitiMj9G2rfYeJpY1TOsDLspIWg2PvaEBPOW3Q=";
   };
 
   pythonRelaxDeps = [ "ha-mqtt-discoverable" ];

pkgs/by-name/lu/luanti/package.nix

@@ -40,13 +40,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "luanti";
-  version = "5.13.0";
+  version = "5.14.0";
 
   src = fetchFromGitHub {
     owner = "luanti-org";
     repo = "luanti";
     tag = finalAttrs.version;
-    hash = "sha256-TvI0+G7bRwwkEegv/AN4aBIN05M1AnWsaYD4lr3VTb8=";
+    hash = "sha256-y4Bnlq3nE2u4PN0VPyBP31YORrG6LPPoSb7T5i9JnVM=";
   };
 
   patches = [