ocamlPackages.ocsipersist: migrate to logs

This commit is contained in:
Vincent Laporte
2026-03-11 22:46:06 +01:00
parent 87d9b0fe2c
commit ffb544310b
3 changed files with 28 additions and 11 deletions
@@ -1,20 +1,37 @@
{
lib,
buildDunePackage,
applyPatches,
fetchpatch,
fetchFromGitHub,
lwt_ppx,
lwt,
}:
buildDunePackage rec {
buildDunePackage (finalAttrs: {
pname = "ocsipersist-lib";
version = "2.0.0";
src = fetchFromGitHub {
owner = "ocsigen";
repo = "ocsipersist";
tag = version;
hash = "sha256-7CKKwJxqxUpCMNs4xGbsMZ6Qud9AnczBStTXS+N21DU=";
src = applyPatches {
src = fetchFromGitHub {
owner = "ocsigen";
repo = "ocsipersist";
tag = finalAttrs.version;
hash = "sha256-7CKKwJxqxUpCMNs4xGbsMZ6Qud9AnczBStTXS+N21DU=";
};
patches = [
# Migrate to logs
(fetchpatch {
url = "https://github.com/ocsigen/ocsipersist/commit/1fc0088b4dc2226f01863dd25f8ed56528c5543d.patch";
hash = "sha256-WR7SW8jAAo47AIQ7UMQNF8FTXgj6FbxIqFjrLhu7wFs=";
excludes = [
"*.opam"
"dune-project"
];
})
];
};
buildInputs = [ lwt_ppx ];
@@ -26,4 +43,4 @@ buildDunePackage rec {
maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/ocsigen/ocsipersist/";
};
}
})
@@ -1,7 +1,7 @@
{
buildDunePackage,
ocsipersist,
lwt_log,
logs,
pgocaml,
xml-light,
}:
@@ -11,7 +11,7 @@ buildDunePackage {
inherit (ocsipersist) version src;
propagatedBuildInputs = [
lwt_log
logs
ocsipersist
pgocaml
];
@@ -1,7 +1,7 @@
{
buildDunePackage,
ocsipersist,
lwt_log,
logs,
ocaml_sqlite3,
ocsigen_server,
}:
@@ -11,7 +11,7 @@ buildDunePackage {
inherit (ocsipersist) version src;
propagatedBuildInputs = [
lwt_log
logs
ocaml_sqlite3
ocsipersist
];