dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

plantuml-c4: migrate to pkgs/by-name, format with nixfmt-rfc-style

Browse Source
This commit is contained in:
Anthony ROUSSEL 2024-09-22 16:10:59 +02:00
parent 13d7ef16dc
commit 775c4ad439
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkgs/tools/misc/plantuml/plantuml-c4.nix → pkgs/by-name/pl/plantuml-c4/package.nix
View File

@ -1,4 +1,13 @@
{ lib, stdenv, makeWrapper, fetchzip, runCommand, plantuml, plantuml-c4, jre }: {
lib,
stdenv,
fetchzip,
jre,
makeWrapper,
plantuml-c4,
plantuml,
runCommand,
}:
# The C4-PlantUML docs say that it suffices to run plantuml with the # The C4-PlantUML docs say that it suffices to run plantuml with the
# -DRELATIVE_INCLUDE="..." arg to make plantuml find the C4 templates # -DRELATIVE_INCLUDE="..." arg to make plantuml find the C4 templates
@ -26,20 +35,22 @@ let
# This way the plantuml derivation can remain unchanged. # This way the plantuml derivation can remain unchanged.
plantumlWithExtraPath = plantumlWithExtraPath =
let let
plantumlIncludePath = lib.concatStringsSep ":" [ c4-lib sprites ]; plantumlIncludePath = lib.concatStringsSep ":" [
c4-lib
sprites
];
includeFlag = "-Dplantuml.include.path=${lib.escapeShellArg plantumlIncludePath}"; includeFlag = "-Dplantuml.include.path=${lib.escapeShellArg plantumlIncludePath}";
postFixedJre = postFixedJre = runCommand "jre-postfixed" { nativeBuildInputs = [ makeWrapper ]; } ''
runCommand "jre-postfixed" { nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin
mkdir -p $out/bin
makeWrapper ${jre}/bin/java $out/bin/java \ makeWrapper ${jre}/bin/java $out/bin/java \
--add-flags ${lib.escapeShellArg includeFlag} --add-flags ${lib.escapeShellArg includeFlag}
''; '';
in in
plantuml.override { jre = postFixedJre; }; plantuml.override { jre = postFixedJre; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "plantuml-c4"; pname = "plantuml-c4";
version = "2.8.0"; version = "2.8.0";
@ -55,13 +66,14 @@ stdenv.mkDerivation rec {
''; '';
passthru.tests.example-c4-diagram = passthru.tests.example-c4-diagram =
runCommand "c4-plantuml-sample.png" { nativeBuildInputs = [ plantuml-c4 ]; } '' runCommand "c4-plantuml-sample.png" { nativeBuildInputs = [ plantuml-c4 ]; }
sed 's/https:.*\///' "${c4-lib}/samples/C4_Context Diagram Sample - enterprise.puml" > sample.puml ''
plantuml sample.puml -o $out sed 's/https:.*\///' "${c4-lib}/samples/C4_Context Diagram Sample - enterprise.puml" > sample.puml
plantuml sample.puml -o $out
sed 's/!include ..\//!include /' ${sprites}/examples/complex-example.puml > sprites.puml sed 's/!include ..\//!include /' ${sprites}/examples/complex-example.puml > sprites.puml
plantuml sprites.puml -o $out plantuml sprites.puml -o $out
''; '';
meta = with lib; { meta = with lib; {
description = "PlantUML bundled with C4-Plantuml and plantuml sprites library"; description = "PlantUML bundled with C4-Plantuml and plantuml sprites library";

2
pkgs/top-level/all-packages.nix
View File

@ -11321,8 +11321,6 @@ with pkgs;
plantuml = callPackage ../tools/misc/plantuml { }; plantuml = callPackage ../tools/misc/plantuml { };
plantuml-c4 = callPackage ../tools/misc/plantuml/plantuml-c4.nix { };
plantuml-server = callPackage ../tools/misc/plantuml-server { }; plantuml-server = callPackage ../tools/misc/plantuml-server { };
plan9port = darwin.apple_sdk_11_0.callPackage ../tools/system/plan9port { plan9port = darwin.apple_sdk_11_0.callPackage ../tools/system/plan9port {