From 8ed021a3e5345b32c716d8e554a905d82e8b14b1 Mon Sep 17 00:00:00 2001 From: namebee <40901726+namebee@users.noreply.github.com> Date: Tue, 7 Oct 2025 16:41:36 -0500 Subject: [PATCH 1/5] fop: 2.8 -> 2.11 Using the suggestions made by @afh in #348116. I did not see a reason to not include `stripJavaArchivesHook`. The patch for CVE-2024-28168 has been part of Apache FOP since 2.10: https://github.com/apache/xmlgraphics-fop/commit/d96ba9a11710d02716b6f4f6107ebfa9ccec7134 --- pkgs/by-name/fo/fop/package.nix | 50 +++++++++++---------------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/fo/fop/package.nix b/pkgs/by-name/fo/fop/package.nix index f7e14ccb6118..e2f1e0ff3319 100644 --- a/pkgs/by-name/fo/fop/package.nix +++ b/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 ]; }; -}) +} From dc29a8ca6e4c1fa6969b059a48e68c607ffa42b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Oct 2025 08:19:34 +0000 Subject: [PATCH 2/5] ha-mqtt-discoverable-cli: 0.20.1 -> 0.21.1 --- pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix index 1954d81f6289..64ea8cae77a6 100644 --- a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix +++ b/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" ]; From 6a45361619641cee837bc9a9ad76c856a50de10b Mon Sep 17 00:00:00 2001 From: Maxim Moskalets Date: Wed, 8 Oct 2025 00:00:58 +0300 Subject: [PATCH 3/5] pulseview: 0.4.2-unstable-2024-03-14 -> 0.4.2-unstable-2025-05-15 --- .../science/electronics/pulseview/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index ff66e511ce21..637fc58a1199 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/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 = [ From b5d81e8f85c155136aa5989843531c3d6f6c542e Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 8 Oct 2025 18:09:47 +0200 Subject: [PATCH 4/5] luanti: 5.13.0 -> 5.14.0 --- pkgs/by-name/lu/luanti/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/luanti/package.nix b/pkgs/by-name/lu/luanti/package.nix index d7fd84e0a78a..cfe5f4a2f491 100644 --- a/pkgs/by-name/lu/luanti/package.nix +++ b/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 = [ From 53d1f7335deece22cacb8d54ce34f0be27ea83ee Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 8 Oct 2025 21:17:55 +0300 Subject: [PATCH 5/5] home-assistant-custom-components.polaris-mqtt: fix filename --- .../custom-components/polaris-mqtt/{default.nix => package.nix} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pkgs/servers/home-assistant/custom-components/polaris-mqtt/{default.nix => package.nix} (100%) diff --git a/pkgs/servers/home-assistant/custom-components/polaris-mqtt/default.nix b/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/polaris-mqtt/default.nix rename to pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix