nzbhydra2: 8.1.2 -> 8.2.2

This commit is contained in:
whoomee
2026-01-10 22:07:00 +01:00
parent daf551acea
commit c47e83f817
3 changed files with 36 additions and 58 deletions

View File

@@ -1,25 +0,0 @@
--- a/pom.xml 1970-01-01 01:00:01.000000000 +0100
+++ b/pom.xml 2025-12-02 21:04:01.739489000 +0100
@@ -74,12 +74,13 @@
<version>3.10.1</version>
<configuration>
<compilerArgs>
<arg>-parameters</arg>
+ <arg>-proc:full</arg>
</compilerArgs>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
</plugins>
</build>
@@ -108,7 +109,7 @@
<spring-data-commons.version>3.1.5</spring-data-commons.version>
<jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>
<jackson.version>2.15.0</jackson.version>
- <lombok.version>1.18.30</lombok.version>
+ <lombok.version>1.18.42</lombok.version>
<logback.version>1.5.21</logback.version>
<guava.version>23.0</guava.version>
<junit.version>4.13.2</junit.version>

View File

@@ -0,0 +1,10 @@
--- a/other/github-release-plugin/pom.xml 1970-01-01 01:00:01.000000000 +0100
+++ b/other/github-release-plugin/pom.xml 2026-01-11 00:23:47.212158113 +0100
@@ -126,7 +133,6 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.30</version>
- <scope>provided</scope>
</path>
</annotationProcessorPaths>
</configuration>

View File

@@ -6,6 +6,8 @@
maven,
fetchFromGitHub,
jdk,
nix-update-script,
xmlstarlet,
}:
# Skip some plugins not required for NixOS packaging to reduce required dependencies.
@@ -23,53 +25,41 @@ let
"tests"
]
},!org.nzbhydra.tests:system";
timestampParameter = "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z";
parameters = lib.concatStringsSep " " [
projectFilter
timestampParameter
];
in
maven.buildMavenPackage rec {
pname = "nzbhydra2";
version = "8.1.2";
version = "8.2.2";
src = fetchFromGitHub {
owner = "theotherp";
repo = pname;
tag = "v${version}";
hash = "sha256-BD9bvbPaVz3MJam78EHqfFc9jbh1SpkIxTe0UK8Lh0w=";
hash = "sha256-aUaPzfP4PPX08DZxbDhy7U/qH37ddR9jWtt+pt7BqCI=";
};
patches = [
# Older lombok versions are incompatible with newer JDK versions.
./lombok-compiler-annotation.patch
];
mvnHash = "sha256-02Fj7Rv0kGmO7ysHWMjE7qlwFY3G+hQzjXvrvRG/2M8=";
buildOffline = true;
mvnFetchExtraArgs.preBuild = ''
mvn -nsu "${timestampParameter}" --projects org.nzbhydra:github-release-plugin "-Dmaven.repo.local=$out/.m2" clean install
'';
mvnFetchExtraArgs.postInstall = ''
${lib.getExe xmlstarlet} ed -L -u "/metadata/versioning/lastUpdated" -v "0" $out/.m2/org/nzbhydra/github-release-plugin/maven-metadata-local.xml
'';
mvnJdk = jdk;
mvnHash = "sha256-SXanl43Fpd7IdhuD1H2LpB5BwvzbbjRNyZYzBvV1XXY=";
manualMvnArtifacts = [
"org.springframework.boot:spring-boot-maven-plugin:4.0.0"
"org.apache.maven.plugins:maven-antrun-plugin:3.1.0"
"org.apache.maven.plugins:maven-dependency-plugin:3.7.0"
"org.apache.maven.plugins:maven-release-plugin:3.0.1"
"org.apache.maven.plugins:maven-plugin-plugin:3.7.1"
"org.apache.maven.plugins:maven-install-plugin:3.1.4"
# Dependencies for building and running tests are included below.
# The set of dependencies for successfully building and running the tests is different.
# For simplicity all dependencies are included here, independently of whether we're running the tests.
"org.apache.maven.plugins:maven-surefire-plugin:2.22.2"
"org.apache.maven.surefire:surefire-junit4:3.0.0-M2"
"org.apache.maven.surefire:surefire-junit-platform:2.22.2"
"org.apache.maven.surefire:surefire-junit-platform:3.0.0-M2"
"org.apache.maven.surefire:surefire-junit-platform:3.2.5"
"org.junit.platform:junit-platform-surefire-provider:1.3.2"
];
doCheck = true;
mvnDepsParameters = projectFilter;
mvnParameters = projectFilter;
mvnDepsParameters = parameters;
mvnParameters = parameters;
nativeBuildInputs = [
makeWrapper
@@ -90,8 +80,11 @@ maven.buildMavenPackage rec {
runHook postInstall
'';
passthru.tests = {
inherit (nixosTests) nzbhydra2;
passthru = {
tests = {
inherit (nixosTests) nzbhydra2;
};
updateScript = nix-update-script { };
};
meta = {