From d26b184247e61fa9d37d7fd8d5ab0925621c2b65 Mon Sep 17 00:00:00 2001 From: Sean Gilligan Date: Thu, 21 May 2026 21:59:53 -0700 Subject: [PATCH] fop: add patch to "fix" maven versions Without this patch, the fop build will fail whenever we update the `maven` Nixpkgs package (and require an updated `mvnHash` setting. This patch explicitly specifies the versions of all Maven plugins, so they can be captured in a fixed-output-derivation. --- .../fo/fop/fix-maven-plugin-versions.patch | 72 +++++++++++++++++++ pkgs/by-name/fo/fop/package.nix | 2 + 2 files changed, 74 insertions(+) create mode 100644 pkgs/by-name/fo/fop/fix-maven-plugin-versions.patch diff --git a/pkgs/by-name/fo/fop/fix-maven-plugin-versions.patch b/pkgs/by-name/fo/fop/fix-maven-plugin-versions.patch new file mode 100644 index 000000000000..18429cc71edc --- /dev/null +++ b/pkgs/by-name/fo/fop/fix-maven-plugin-versions.patch @@ -0,0 +1,72 @@ +diff --git a/pom.xml b/pom.xml +index 8f135d34c..f4e972e2d 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -92,6 +92,41 @@ + maven-jar-plugin + ${jar.plugin.version} + ++ ++ org.apache.maven.plugins ++ maven-site-plugin ++ 3.20.0 ++ ++ ++ org.apache.maven.plugins ++ maven-clean-plugin ++ 3.2.0 ++ ++ ++ org.apache.maven.plugins ++ maven-install-plugin ++ 3.1.3 ++ ++ ++ org.apache.maven.plugins ++ maven-deploy-plugin ++ 3.1.2 ++ ++ ++ org.apache.maven.plugins ++ maven-resources-plugin ++ 3.3.1 ++ ++ ++ org.apache.maven.plugins ++ maven-dependency-plugin ++ 3.7.0 ++ ++ ++ org.apache.maven.plugins ++ maven-assembly-plugin ++ 3.7.1 ++ + + org.apache.maven.plugins + maven-project-info-reports-plugin +@@ -107,6 +142,25 @@ + spotbugs-maven-plugin + ${findbugs.plugin.version} + ++ ++ org.apache.maven.plugins ++ maven-enforcer-plugin ++ 3.5.0 ++ ++ ++ ++ ++ ++ ++ ++ require-all-plugin-versions-to-be-set ++ validate ++ ++ enforce ++ ++ ++ ++ + + + diff --git a/pkgs/by-name/fo/fop/package.nix b/pkgs/by-name/fo/fop/package.nix index e2f1e0ff3319..3b0aced900e1 100644 --- a/pkgs/by-name/fo/fop/package.nix +++ b/pkgs/by-name/fo/fop/package.nix @@ -16,6 +16,8 @@ maven.buildMavenPackage rec { hash = "sha256-uY6cUjmyuenfK3jAWvugsYa5qg8rbnvRZZ6qA/g2fZM="; }; + patches = [ ./fix-maven-plugin-versions.patch ]; + mvnHash = "sha256-EaOIAy0+YPrF+yGsFKKqcA4bt90bq1Z86V57P9rMatE="; buildOffline = true;