From 8078f7fda86e3e1069e133c5f46ee936b0e06c5b Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 22 Sep 2024 16:38:29 +0200 Subject: [PATCH] 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;