diff options
author | Krzysztof Nazarewski <3494992+nazarewk@users.noreply.github.com> | 2022-03-09 10:30:18 +0100 |
---|---|---|
committer | Krzysztof Nazarewski <3494992+nazarewk@users.noreply.github.com> | 2022-03-11 09:05:35 +0100 |
commit | 4ea5398d20cf110b84800e91f30a3dfce96c1b4e (patch) | |
tree | 8ee50aa1fb0d76ce7b37c41d9bb60e937b9ac277 /pkgs/tools/misc/plantuml-server | |
parent | 5660c5f8b4a5f716f4fd1fdfee11088af4139688 (diff) |
plantuml-server 1.2021.12 -> 1.2022.2
- changed JDK version to 17 (11+ required) - added maven build reproducibility
Diffstat (limited to 'pkgs/tools/misc/plantuml-server')
-rw-r--r-- | pkgs/tools/misc/plantuml-server/default.nix | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index 6afaf0fbb3483..8b6c52446aa82 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, maven, jdk8_headless }: +{ lib, stdenv, fetchFromGitHub, maven, jdk17_headless }: let - version = "1.2021.12"; + version = "1.2022.2"; src = fetchFromGitHub { owner = "plantuml"; repo = "plantuml-server"; rev = "v${version}"; - sha256 = "sha256:016mrs4djbaid1ma5922dvq372pphbzzmjzsjalj2dqp60538xll"; + sha256 = "sha256-55IBhulFo42jscBFrHM39qA0GRgKBoYNye4q9QkmjsM="; }; # perform fake build to make a fixed-output derivation out of the files downloaded from maven central deps = stdenv.mkDerivation { name = "plantuml-server-${version}-deps"; inherit src; - nativeBuildInputs = [ jdk8_headless maven ]; + nativeBuildInputs = [ jdk17_headless maven ]; buildPhase = '' runHook preBuild @@ -25,10 +25,12 @@ let runHook postBuild ''; # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside - installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete''; + installPhase = '' + find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete + ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256:12w1iw9c5j7y9hhaip07j3aszjiiakkww1v3zszlj15fj8jgqyf2"; + outputHash = "sha256-AheCBX5jFzDHqTI2pCWBIiDESEKMClXlvWIcFvu0goA="; }; in @@ -37,16 +39,20 @@ stdenv.mkDerivation rec { inherit version; inherit src; - nativeBuildInputs = [ jdk8_headless maven ]; + nativeBuildInputs = [ jdk17_headless maven ]; buildPhase = '' runHook preBuild + # maven can output reproducible files after setting project.build.outputTimestamp property + # see https://maven.apache.org/guides/mini/guide-reproducible-builds.html#how-do-i-configure-my-maven-build # 'maven.repo.local' must be writable so copy it out of nix store cp -R $src repo chmod +w -R repo cd repo - mvn package --offline -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 + mvn package --offline \ + -Dproject.build.outputTimestamp=0 \ + -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 runHook postBuild ''; |