From 9e2797cded531bf519b9c536b6b77a86a7dc6dc9 Mon Sep 17 00:00:00 2001 From: Naora Date: Sun, 16 Feb 2025 23:08:12 +0100 Subject: [PATCH] Updating dream-html and adding depencies for pure-html (#1920) * chore(dream_html): updating dream_html * fix(dependencies): add dependencies for pure-html * fix(review): removing uri and stringext * fix fmt --------- Co-authored-by: Antonio Nuno Monteiro --- ocaml/default.nix | 2 ++ ocaml/dream-html/default.nix | 13 +++---------- ocaml/dream-html/pure.nix | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 ocaml/dream-html/pure.nix diff --git a/ocaml/default.nix b/ocaml/default.nix index 7871119eb..c679f7a8c 100644 --- a/ocaml/default.nix +++ b/ocaml/default.nix @@ -2219,6 +2219,8 @@ with oself; ]); }; + pure-html = callPackage ./dream-html/pure.nix { }; + qrc = let version = "0.2.0"; diff --git a/ocaml/dream-html/default.nix b/ocaml/dream-html/default.nix index 2e1c6584f..2e2ce54f1 100644 --- a/ocaml/dream-html/default.nix +++ b/ocaml/dream-html/default.nix @@ -1,17 +1,10 @@ -{ lib, buildDunePackage, fetchFromGitHub, dream }: +{ lib, buildDunePackage, dream, pure-html }: buildDunePackage { pname = "dream-html"; - version = "1.1.0"; + inherit (pure-html) src version; - src = fetchFromGitHub { - owner = "yawaramin"; - repo = "dream-html"; - rev = "v1.1.0"; - sha256 = "sha256-OfdWal7fYqiT+4vfZZi5x6ItBVCP4rPHb2aO5TO6L88="; - }; - - propagatedBuildInputs = [ dream ]; + propagatedBuildInputs = [ pure-html dream ]; meta = { description = diff --git a/ocaml/dream-html/pure.nix b/ocaml/dream-html/pure.nix new file mode 100644 index 000000000..d47f405a0 --- /dev/null +++ b/ocaml/dream-html/pure.nix @@ -0,0 +1,21 @@ +{ lib, buildDunePackage, fetchFromGitHub, uri }: + +buildDunePackage { + pname = "pure-html"; + version = "3.10.0"; + + src = fetchFromGitHub { + owner = "yawaramin"; + repo = "dream-html"; + rev = "v3.10.0"; + sha256 = "sha256-OlO3g+cEP27GjxJZT0jCTRkICLFRLS0jWkitqXeAVX8="; + }; + + propagatedBuildInputs = [ uri ]; + + meta = { + description = + "Write HTML directly in your OCaml source files with editor support."; + license = lib.licenses.gpl3; + }; +}