From 2fc228efaf48520896eed71a8109aa6492c72939 Mon Sep 17 00:00:00 2001
From: toastal <561087+toastal@users.noreply.github.com>
Date: Sat, 14 May 2022 19:14:53 +0000
Subject: [PATCH] =?UTF-8?q?ocamlPackages.otoml:=200.9.0=20=E2=86=92=201.0.?=
 =?UTF-8?q?1;=20soupault:=203.2.0=20=E2=86=92=204.0.0=20(#173032)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ocamlPackages.otoml: 0.9.0 → 1.0.1

* soupault: 3.2.0 → 4.0.0

> toastal: I'm switching the OPAM tarball link to codeberg for 4.0.0

— dmbaturin, #soupault Libera.Chat

As directed by the maintainer, the releases will now point to the
Codeberg Gitea Git forge instance. This is a win for open source code
platforms and users as they will not need to interact with a
proprietary code forge!
---
 .../ocaml-modules/otoml/default.nix           |  8 ++++---
 pkgs/tools/typesetting/soupault/default.nix   | 24 ++++++++++++-------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/ocaml-modules/otoml/default.nix b/pkgs/development/ocaml-modules/otoml/default.nix
index c3f53fc611e..d69df70f772 100644
--- a/pkgs/development/ocaml-modules/otoml/default.nix
+++ b/pkgs/development/ocaml-modules/otoml/default.nix
@@ -1,4 +1,6 @@
-{ lib, fetchFromGitHub, buildDunePackage
+{ lib
+, fetchFromGitHub
+, buildDunePackage
 , menhir
 , menhirLib
 , uutf
@@ -6,7 +8,7 @@
 
 buildDunePackage rec {
   pname = "otoml";
-  version = "0.9.0";
+  version = "1.0.1";
 
   useDune2 = true;
 
@@ -16,7 +18,7 @@ buildDunePackage rec {
     owner = "dmbaturin";
     repo = pname;
     rev = version;
-    sha256 = "0l0c60rzgk11y8xq05kr8q9hkzb3c8vi995mq84x98ys73wb42j3";
+    sha256 = "sha256-2WGuq4ZLbLvfG6WZ3iimiSMqMYHCuruZc1EttZ/5rBE=";
   };
 
   strictDeps = true;
diff --git a/pkgs/tools/typesetting/soupault/default.nix b/pkgs/tools/typesetting/soupault/default.nix
index a511456e02e..d40eb4aac80 100644
--- a/pkgs/tools/typesetting/soupault/default.nix
+++ b/pkgs/tools/typesetting/soupault/default.nix
@@ -1,20 +1,27 @@
-{ fetchFromGitHub, ocamlPackages, lib }:
+{ lib
+, fetchFromGitea
+, ocamlPackages
+}:
 
 ocamlPackages.buildDunePackage rec {
   pname = "soupault";
-  version = "3.2.0";
+  version = "4.0.0";
 
   useDune2 = true;
 
-  src = fetchFromGitHub {
-    owner = "dmbaturin";
+  minimalOCamlVersion = "4.08";
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "PataphysicalSociety";
     repo = pname;
     rev = version;
-    sha256 = "sha256-T1K/ntCK19LfPmMtaAa9c1JjSL+5dax2SNhM4yUFln4=";
+    sha256 = "sha256-txNKAZMd3LReFoAtf6iaoDF+Ku3IUNDzBWUqGC2ePKw=";
   };
 
   buildInputs = with ocamlPackages; [
     base64
+    camomile
     containers
     ezjsonm
     fileutils
@@ -32,11 +39,10 @@ ocamlPackages.buildDunePackage rec {
     yaml
   ];
 
-  meta = with lib; {
+  meta = {
     description = "A tool that helps you create and manage static websites";
     homepage = "https://soupault.app/";
-    license = licenses.mit;
-    maintainers = [ maintainers.toastal ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ toastal ];
   };
 }
-