From 775c4ad4390d97e201ce5784df3eb09b577e5df1 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 22 Sep 2024 16:10:59 +0200 Subject: [PATCH 1/9] plantuml-c4: migrate to pkgs/by-name, format with nixfmt-rfc-style --- .../pl/plantuml-c4/package.nix} | 42 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 27 insertions(+), 17 deletions(-) rename pkgs/{tools/misc/plantuml/plantuml-c4.nix => by-name/pl/plantuml-c4/package.nix} (72%) diff --git a/pkgs/tools/misc/plantuml/plantuml-c4.nix b/pkgs/by-name/pl/plantuml-c4/package.nix similarity index 72% rename from pkgs/tools/misc/plantuml/plantuml-c4.nix rename to pkgs/by-name/pl/plantuml-c4/package.nix index 77cfa82e894f..b28d13d1a788 100644 --- a/pkgs/tools/misc/plantuml/plantuml-c4.nix +++ b/pkgs/by-name/pl/plantuml-c4/package.nix @@ -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 # -DRELATIVE_INCLUDE="..." arg to make plantuml find the C4 templates @@ -26,20 +35,22 @@ let # This way the plantuml derivation can remain unchanged. plantumlWithExtraPath = let - plantumlIncludePath = lib.concatStringsSep ":" [ c4-lib sprites ]; + plantumlIncludePath = lib.concatStringsSep ":" [ + c4-lib + sprites + ]; includeFlag = "-Dplantuml.include.path=${lib.escapeShellArg plantumlIncludePath}"; - postFixedJre = - runCommand "jre-postfixed" { nativeBuildInputs = [ makeWrapper ]; } '' - mkdir -p $out/bin + postFixedJre = runCommand "jre-postfixed" { nativeBuildInputs = [ makeWrapper ]; } '' + mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/java \ - --add-flags ${lib.escapeShellArg includeFlag} - ''; + makeWrapper ${jre}/bin/java $out/bin/java \ + --add-flags ${lib.escapeShellArg includeFlag} + ''; in plantuml.override { jre = postFixedJre; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "plantuml-c4"; version = "2.8.0"; @@ -55,13 +66,14 @@ stdenv.mkDerivation rec { ''; passthru.tests.example-c4-diagram = - 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 + 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/!include ..\//!include /' ${sprites}/examples/complex-example.puml > sprites.puml - plantuml sprites.puml -o $out - ''; + sed 's/!include ..\//!include /' ${sprites}/examples/complex-example.puml > sprites.puml + plantuml sprites.puml -o $out + ''; meta = with lib; { description = "PlantUML bundled with C4-Plantuml and plantuml sprites library"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b44299fa7223..316c342a9570 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11321,8 +11321,6 @@ with pkgs; plantuml = callPackage ../tools/misc/plantuml { }; - plantuml-c4 = callPackage ../tools/misc/plantuml/plantuml-c4.nix { }; - plantuml-server = callPackage ../tools/misc/plantuml-server { }; plan9port = darwin.apple_sdk_11_0.callPackage ../tools/system/plan9port { From 5483308d3330259ff919da0ef9b5632cf32418b9 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 22 Sep 2024 16:19:05 +0200 Subject: [PATCH 2/9] plantuml-c4: 2.8.0 -> 2.10.0 https://github.com/plantuml-stdlib/C4-PlantUML/releases/tag/v2.10.0 https://github.com/plantuml-stdlib/C4-PlantUML/compare/v2.8.0...v2.10.0 https://github.com/tupadr3/plantuml-icon-font-sprites/releases/tag/v3.0.0 https://github.com/tupadr3/plantuml-icon-font-sprites/compare/fa3f885dbd45c9cd0cdf6c0e5e4fb51ec8b76582...v3.0.0 --- pkgs/by-name/pl/plantuml-c4/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pl/plantuml-c4/package.nix b/pkgs/by-name/pl/plantuml-c4/package.nix index b28d13d1a788..b1028c2d7dab 100644 --- a/pkgs/by-name/pl/plantuml-c4/package.nix +++ b/pkgs/by-name/pl/plantuml-c4/package.nix @@ -21,13 +21,13 @@ let c4-lib = fetchzip { - url = "https://github.com/plantuml-stdlib/C4-PlantUML/archive/refs/tags/v2.8.0.zip"; - hash = "sha256-pGtTFg7HcAFYPrjd+CAaxS4C6Cqaj94aq45v3NpiAxM="; + url = "https://github.com/plantuml-stdlib/C4-PlantUML/archive/refs/tags/v2.10.0.zip"; + hash = "sha256-p9Njb7VauXVf6yOBDQrO9mS+za9NntFUCK5tig0mH3U="; }; sprites = fetchzip { - url = "https://github.com/tupadr3/plantuml-icon-font-sprites/archive/fa3f885dbd45c9cd0cdf6c0e5e4fb51ec8b76582.zip"; - hash = "sha256-lt9+NNMIaZSkKNsGyHoqXUCTlKmZFGfNYYGjer6X0Xc="; + url = "https://github.com/tupadr3/plantuml-icon-font-sprites/archive/refs/tags/v3.0.0.zip"; + hash = "sha256-I/cR1VPR7aKyTZF9X/4GkgcxV9+sLgNpTZugvCy0Dvs="; }; # In order to pre-fix the plantuml.jar parameter with the argument @@ -52,7 +52,7 @@ in stdenv.mkDerivation { pname = "plantuml-c4"; - version = "2.8.0"; + version = "2.10.0"; nativeBuildInputs = [ makeWrapper ]; From 00b7f08db7626eafeed196804a137a70662b5208 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 22 Sep 2024 16:37:11 +0200 Subject: [PATCH 3/9] plantuml-c4: add anthonyroussel to maintainers --- pkgs/by-name/pl/plantuml-c4/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pl/plantuml-c4/package.nix b/pkgs/by-name/pl/plantuml-c4/package.nix index b1028c2d7dab..a17aedefee26 100644 --- a/pkgs/by-name/pl/plantuml-c4/package.nix +++ b/pkgs/by-name/pl/plantuml-c4/package.nix @@ -80,7 +80,10 @@ stdenv.mkDerivation { mainProgram = "plantuml"; homepage = "https://github.com/plantuml-stdlib/C4-PlantUML"; license = licenses.mit; - maintainers = with maintainers; [ tfc ]; + maintainers = with maintainers; [ + tfc + anthonyroussel + ]; platforms = platforms.unix; }; } From 3c083ed52f3abc6c7fb36613110e3d79cc7dc3b7 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 22 Sep 2024 16:11:28 +0200 Subject: [PATCH 4/9] plantuml: migrate to pkgs/by-name, format with nixfmt-rfc-style --- .../pl/plantuml/package.nix} | 19 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 insertions(+), 9 deletions(-) rename pkgs/{tools/misc/plantuml/default.nix => by-name/pl/plantuml/package.nix} (87%) diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/by-name/pl/plantuml/package.nix similarity index 87% rename from pkgs/tools/misc/plantuml/default.nix rename to pkgs/by-name/pl/plantuml/package.nix index 83476bd99573..958d8e4a78ab 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/by-name/pl/plantuml/package.nix @@ -1,9 +1,10 @@ -{ lib -, stdenvNoCC -, fetchurl -, makeBinaryWrapper -, jre -, graphviz +{ + lib, + stdenvNoCC, + fetchurl, + graphviz, + jre, + makeBinaryWrapper, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -30,6 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; doInstallCheck = true; + postCheckInstall = '' $out/bin/plantuml -help $out/bin/plantuml -testdot @@ -41,7 +43,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { # "plantuml -license" says GPLv3 or later license = lib.licenses.gpl3Plus; mainProgram = "plantuml"; - maintainers = with lib.maintainers; [ bjornfor Mogria ]; + maintainers = with lib.maintainers; [ + bjornfor + Mogria + ]; platforms = lib.platforms.unix; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 316c342a9570..1fcc190c508a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11319,8 +11319,6 @@ with pkgs; pk2cmd = callPackage ../tools/misc/pk2cmd { }; - plantuml = callPackage ../tools/misc/plantuml { }; - plantuml-server = callPackage ../tools/misc/plantuml-server { }; plan9port = darwin.apple_sdk_11_0.callPackage ../tools/system/plan9port { From 0c102fdf95f6268338a3556edf40223b0cdcf0b1 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 22 Sep 2024 16:30:33 +0200 Subject: [PATCH 5/9] plantuml: 1.2024.5 -> 1.2024.7 --- pkgs/by-name/pl/plantuml/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plantuml/package.nix b/pkgs/by-name/pl/plantuml/package.nix index 958d8e4a78ab..f77e74507a69 100644 --- a/pkgs/by-name/pl/plantuml/package.nix +++ b/pkgs/by-name/pl/plantuml/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "plantuml"; - version = "1.2024.5"; + version = "1.2024.7"; src = fetchurl { url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar"; - hash = "sha256-YayIedHIIpecVF7BZSvBTp66Eb7He+l+1RCir5KuL28="; + hash = "sha256-8BlAPc2BeojyTcZVboUA6+sOA5AO5eG871mSIWinm5E="; }; nativeBuildInputs = [ From ba1883b14b5d5cf432098a727d268f5e387dd90a Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 22 Sep 2024 16:34:55 +0200 Subject: [PATCH 6/9] plantuml: add passthru.tests.version --- pkgs/by-name/pl/plantuml/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/pl/plantuml/package.nix b/pkgs/by-name/pl/plantuml/package.nix index f77e74507a69..1857837fc1cc 100644 --- a/pkgs/by-name/pl/plantuml/package.nix +++ b/pkgs/by-name/pl/plantuml/package.nix @@ -5,6 +5,7 @@ graphviz, jre, makeBinaryWrapper, + testers, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -37,6 +38,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { $out/bin/plantuml -testdot ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "plantuml --version"; + }; + meta = { description = "Draw UML diagrams using a simple and human readable text description"; homepage = "https://plantuml.com/"; From 3ad1fa85df3db7c4030fbd6139bcc77b806e19d8 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 22 Sep 2024 16:36:45 +0200 Subject: [PATCH 7/9] plantuml: add anthonyroussel to maintainers --- pkgs/by-name/pl/plantuml/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pl/plantuml/package.nix b/pkgs/by-name/pl/plantuml/package.nix index 1857837fc1cc..cfb35e1d7c63 100644 --- a/pkgs/by-name/pl/plantuml/package.nix +++ b/pkgs/by-name/pl/plantuml/package.nix @@ -52,6 +52,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ bjornfor Mogria + anthonyroussel ]; platforms = lib.platforms.unix; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; From 8078f7fda86e3e1069e133c5f46ee936b0e06c5b Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 22 Sep 2024 16:38:29 +0200 Subject: [PATCH 8/9] plantuml-server: migrate to pkgs/by-name, format with nixfmt-rfc-style --- .../pl/plantuml-server/package.nix} | 18 +++++++++++------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 11 insertions(+), 9 deletions(-) rename pkgs/{tools/misc/plantuml-server/default.nix => by-name/pl/plantuml-server/package.nix} (81%) diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/by-name/pl/plantuml-server/package.nix similarity index 81% rename from pkgs/tools/misc/plantuml-server/default.nix rename to pkgs/by-name/pl/plantuml-server/package.nix index 0eed91bdb99e..a8125475df88 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/by-name/pl/plantuml-server/package.nix @@ -1,18 +1,22 @@ -{ lib, stdenv, fetchurl, nixosTests }: +{ + lib, + stdenv, + fetchurl, + nixosTests, +}: -let - version = "1.2024.7"; -in stdenv.mkDerivation rec { pname = "plantuml-server"; - inherit version; + version = "1.2024.7"; + src = fetchurl { url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; - sha256 = "sha256-9YTclV+FoiNbcpeNtlbbozqjB1BN9EJn03CzyHDbC+8="; + hash = "sha256-9YTclV+FoiNbcpeNtlbbozqjB1BN9EJn03CzyHDbC+8="; }; dontUnpack = true; - installPhase = '' + + postInstall = '' mkdir -p "$out/webapps" cp "$src" "$out/webapps/plantuml.war" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fcc190c508a..4bcf9fed1ca2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11319,8 +11319,6 @@ with pkgs; pk2cmd = callPackage ../tools/misc/pk2cmd { }; - plantuml-server = callPackage ../tools/misc/plantuml-server { }; - plan9port = darwin.apple_sdk_11_0.callPackage ../tools/system/plan9port { inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa IOKit Metal QuartzCore; inherit (darwin) DarwinTools; From cb8c920de80585e5df8db5b317ac65f495672260 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 22 Sep 2024 16:41:35 +0200 Subject: [PATCH 9/9] plantuml-server: add anthonyroussel to maintainers --- pkgs/by-name/pl/plantuml-server/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pl/plantuml-server/package.nix b/pkgs/by-name/pl/plantuml-server/package.nix index a8125475df88..189da083d1ef 100644 --- a/pkgs/by-name/pl/plantuml-server/package.nix +++ b/pkgs/by-name/pl/plantuml-server/package.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = with maintainers; [ truh ]; + maintainers = with maintainers; [ + truh + anthonyroussel + ]; }; }