From 5393cc5dc278c5595036025051003084a6d1336e Mon Sep 17 00:00:00 2001 From: toastal Date: Tue, 19 Mar 2024 21:56:03 +0700 Subject: soupault: mv to by-name --- pkgs/by-name/so/soupault/package.nix | 61 +++++++++++++++++++++++++++++ pkgs/tools/typesetting/soupault/default.nix | 61 ----------------------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 61 insertions(+), 63 deletions(-) create mode 100644 pkgs/by-name/so/soupault/package.nix delete mode 100644 pkgs/tools/typesetting/soupault/default.nix diff --git a/pkgs/by-name/so/soupault/package.nix b/pkgs/by-name/so/soupault/package.nix new file mode 100644 index 000000000000..639af4136729 --- /dev/null +++ b/pkgs/by-name/so/soupault/package.nix @@ -0,0 +1,61 @@ +{ lib +, fetchzip +, ocamlPackages +, soupault +, testers +}: + +let + pname = "soupault"; + + version = "4.9.0"; +in +ocamlPackages.buildDunePackage { + inherit pname version; + + minimalOCamlVersion = "4.13"; + + src = fetchzip { + urls = [ + "https://github.com/PataphysicalSociety/soupault/archive/${version}.tar.gz" + "https://codeberg.org/PataphysicalSociety/soupault/archive/${version}.tar.gz" + ]; + hash = "sha256-vGTJUbAeYs/EYFykNSmCc4c9G66/Lz3BsUYnZQ8feFo="; + }; + + buildInputs = with ocamlPackages; [ + base64 + camomile + containers + csv + digestif + ezjsonm + fileutils + fmt + jingoo + lambdasoup + lua-ml + logs + markup + odate + otoml + re + spelll + tsort + yaml + ]; + + passthru.tests.version = testers.testVersion { + package = soupault; + command = "soupault --version-number"; + }; + + meta = { + description = "A tool that helps you create and manage static websites"; + homepage = "https://soupault.app/"; + changelog = "https://codeberg.org/PataphysicalSociety/soupault/src/branch/main/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ toastal ]; + mainProgram = "soupault"; + }; +} diff --git a/pkgs/tools/typesetting/soupault/default.nix b/pkgs/tools/typesetting/soupault/default.nix deleted file mode 100644 index 639af4136729..000000000000 --- a/pkgs/tools/typesetting/soupault/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, fetchzip -, ocamlPackages -, soupault -, testers -}: - -let - pname = "soupault"; - - version = "4.9.0"; -in -ocamlPackages.buildDunePackage { - inherit pname version; - - minimalOCamlVersion = "4.13"; - - src = fetchzip { - urls = [ - "https://github.com/PataphysicalSociety/soupault/archive/${version}.tar.gz" - "https://codeberg.org/PataphysicalSociety/soupault/archive/${version}.tar.gz" - ]; - hash = "sha256-vGTJUbAeYs/EYFykNSmCc4c9G66/Lz3BsUYnZQ8feFo="; - }; - - buildInputs = with ocamlPackages; [ - base64 - camomile - containers - csv - digestif - ezjsonm - fileutils - fmt - jingoo - lambdasoup - lua-ml - logs - markup - odate - otoml - re - spelll - tsort - yaml - ]; - - passthru.tests.version = testers.testVersion { - package = soupault; - command = "soupault --version-number"; - }; - - meta = { - description = "A tool that helps you create and manage static websites"; - homepage = "https://soupault.app/"; - changelog = "https://codeberg.org/PataphysicalSociety/soupault/src/branch/main/CHANGELOG.md"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ toastal ]; - mainProgram = "soupault"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 039a0aa0b89d..7f263f553ab5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7722,8 +7722,6 @@ with pkgs; sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; - soupault = callPackage ../tools/typesetting/soupault { }; - stratisd = callPackage ../tools/filesystems/stratisd { }; stratis-cli = callPackage ../tools/filesystems/stratis-cli { }; -- cgit 1.4.1