From 3c083ed52f3abc6c7fb36613110e3d79cc7dc3b7 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 22 Sep 2024 16:11:28 +0200 Subject: [PATCH] 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 {