diff --git a/pkgs/development/ocaml-modules/ocsipersist/default.nix b/pkgs/development/ocaml-modules/ocsipersist/default.nix index 5141e0d07ead..73273870cc9e 100644 --- a/pkgs/development/ocaml-modules/ocsipersist/default.nix +++ b/pkgs/development/ocaml-modules/ocsipersist/default.nix @@ -1,23 +1,15 @@ { buildDunePackage, ocsipersist-lib, - ocsipersist-pgsql, - ocsipersist-sqlite, }: buildDunePackage { pname = "ocsipersist"; inherit (ocsipersist-lib) src version; - duneVersion = "3"; - - buildInputs = [ - ocsipersist-pgsql - ocsipersist-sqlite - ]; propagatedBuildInputs = [ ocsipersist-lib ]; meta = ocsipersist-lib.meta // { - description = "Persistent key/value storage (for Ocsigen) using multiple backends"; + description = "Persistent key/value storage for OCaml using multiple backends"; }; } diff --git a/pkgs/development/ocaml-modules/ocsipersist/lib.nix b/pkgs/development/ocaml-modules/ocsipersist/lib.nix index e21c1979cc23..d88841190bc8 100644 --- a/pkgs/development/ocaml-modules/ocsipersist/lib.nix +++ b/pkgs/development/ocaml-modules/ocsipersist/lib.nix @@ -8,15 +8,13 @@ buildDunePackage rec { pname = "ocsipersist-lib"; - version = "1.1.0"; - - duneVersion = "3"; + version = "2.0.0"; src = fetchFromGitHub { owner = "ocsigen"; repo = "ocsipersist"; - rev = version; - sha256 = "sha256:1d6kdcfjvrz0dl764mnyxc477aa57rvmzkg154qc915w2y1nbz9a"; + tag = version; + hash = "sha256-7CKKwJxqxUpCMNs4xGbsMZ6Qud9AnczBStTXS+N21DU="; }; buildInputs = [ lwt_ppx ]; @@ -26,6 +24,6 @@ buildDunePackage rec { description = "Persistent key/value storage (for Ocsigen) - support library"; license = lib.licenses.lgpl21Only; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + homepage = "https://github.com/ocsigen/ocsipersist/"; }; } diff --git a/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix b/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix index 6543eef30162..3d7c001c306f 100644 --- a/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix +++ b/pkgs/development/ocaml-modules/ocsipersist/pgsql.nix @@ -1,26 +1,22 @@ { buildDunePackage, - ocsipersist-lib, + ocsipersist, lwt_log, - ocsigen_server, pgocaml, xml-light, }: buildDunePackage { pname = "ocsipersist-pgsql"; - inherit (ocsipersist-lib) version src; - duneVersion = "3"; + inherit (ocsipersist) version src; propagatedBuildInputs = [ lwt_log - ocsigen_server - ocsipersist-lib + ocsipersist pgocaml - xml-light ]; - meta = ocsipersist-lib.meta // { - description = "Persistent key/value storage (for Ocsigen) using PostgreSQL"; + meta = ocsipersist.meta // { + description = "Persistent key/value storage for OCaml using PostgreSQL"; }; } diff --git a/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix b/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix index bb501ebcec71..429f56f46ef2 100644 --- a/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix +++ b/pkgs/development/ocaml-modules/ocsipersist/sqlite.nix @@ -1,26 +1,22 @@ { buildDunePackage, - ocsipersist-lib, + ocsipersist, lwt_log, ocaml_sqlite3, ocsigen_server, - xml-light, }: buildDunePackage { pname = "ocsipersist-sqlite"; - inherit (ocsipersist-lib) version src; - duneVersion = "3"; + inherit (ocsipersist) version src; propagatedBuildInputs = [ lwt_log ocaml_sqlite3 - ocsigen_server - ocsipersist-lib - xml-light + ocsipersist ]; - meta = ocsipersist-lib.meta // { - description = "Persistent key/value storage (for Ocsigen) using SQLite"; + meta = ocsipersist.meta // { + description = "Persistent key/value storage for OCaml using SQLite"; }; }