From 245070134f670feab40696464ae63d733645befc Mon Sep 17 00:00:00 2001 From: Jakob Klepp Date: Sat, 15 May 2021 11:56:22 +0200 Subject: [PATCH] plantuml-server: 1.2020.14 -> 1.2021.6 --- pkgs/tools/misc/plantuml-server/default.nix | 26 +++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index ad0ffa810cd..f0176afa4b9 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -1,30 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, maven, jdk }: +{ lib, stdenv, fetchFromGitHub, maven, jdk8_headless }: let - version = "1.2020.14"; + version = "1.2021.6"; src = fetchFromGitHub { owner = "plantuml"; repo = "plantuml-server"; rev = "v${version}"; - sha256 = "08g6ddpkly5yhjhw7gpsanyspar1752jy9cypwxsqrdzqrv738b8"; + sha256 = "sha256:1v69vabdq9pv75wzb6n5s198iy5ijfcx6lgjqwxz7n5ns3blf6sz"; }; # 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; - buildInputs = [ jdk maven ]; + nativeBuildInputs = [ jdk8_headless maven ]; buildPhase = '' + runHook preBuild + while mvn package -Dmaven.repo.local=$out/.m2; [ $? = 1 ]; do echo "timeout, restart maven to continue downloading" done + + 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''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1wwgyjalhlj5azggs9vvsrr54pg7gl8p36pgf6pk12rsszzl7a97"; + outputHash = "sha256:1fvir7yvg4a4dc4kiv2d5q081cygj7s2lmxj90j8zzkggyq7v8zh"; }; in @@ -33,25 +37,33 @@ stdenv.mkDerivation rec { inherit version; inherit src; - buildInputs = [ jdk maven ]; + nativeBuildInputs = [ jdk8_headless maven ]; buildPhase = '' + runHook preBuild + # '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 + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p "$out/webapps" cp "target/plantuml.war" "$out/webapps/plantuml.war" + + runHook postInstall ''; meta = with lib; { description = "A web application to generate UML diagrams on-the-fly."; homepage = "https://plantuml.com/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ truh ]; };