diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2023-04-05 06:17:18 +0200 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2023-04-05 08:43:21 +0200 |
| commit | 9100134ba9902515c6d26f8ac03f1605e29fa405 (patch) | |
| tree | 1845a3297e7ddb58ee35cfee828d509471b16111 | |
| parent | 7dba85e9f81ba68e4de33bdf0d47c1991fbd2704 (diff) | |
| download | nixlib-9100134ba9902515c6d26f8ac03f1605e29fa405.tar nixlib-9100134ba9902515c6d26f8ac03f1605e29fa405.tar.gz nixlib-9100134ba9902515c6d26f8ac03f1605e29fa405.tar.bz2 nixlib-9100134ba9902515c6d26f8ac03f1605e29fa405.tar.lz nixlib-9100134ba9902515c6d26f8ac03f1605e29fa405.tar.xz nixlib-9100134ba9902515c6d26f8ac03f1605e29fa405.tar.zst nixlib-9100134ba9902515c6d26f8ac03f1605e29fa405.zip | |
ocamlPackages.caqti: use Dune 3
7 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/development/ocaml-modules/caqti/async.nix b/pkgs/development/ocaml-modules/caqti/async.nix index 148694770777..328cf37986d2 100644 --- a/pkgs/development/ocaml-modules/caqti/async.nix +++ b/pkgs/development/ocaml-modules/caqti/async.nix @@ -4,6 +4,8 @@ buildDunePackage { pname = "caqti-async"; inherit (caqti) version src; + duneVersion = "3"; + propagatedBuildInputs = [ async_kernel async_unix caqti core_kernel ]; meta = caqti.meta // { description = "Async support for Caqti"; }; diff --git a/pkgs/development/ocaml-modules/caqti/default.nix b/pkgs/development/ocaml-modules/caqti/default.nix index 18b55b9857ef..2d62ba7e0c6e 100644 --- a/pkgs/development/ocaml-modules/caqti/default.nix +++ b/pkgs/development/ocaml-modules/caqti/default.nix @@ -8,6 +8,7 @@ buildDunePackage rec { version = "1.9.1"; minimalOCamlVersion = "4.04"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/paurkedal/ocaml-caqti/releases/download/v${version}/caqti-v${version}.tbz"; diff --git a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix index bff515eff381..859402d83ea1 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix @@ -6,6 +6,8 @@ buildDunePackage { propagatedBuildInputs = [ caqti mariadb ]; + duneVersion = "3"; + meta = caqti.meta // { description = "MariaDB driver for Caqti using C bindings"; }; diff --git a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix index f33e38fab8df..d48ae1186bf7 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix @@ -4,6 +4,8 @@ buildDunePackage { pname = "caqti-driver-postgresql"; inherit (caqti) version src; + duneVersion = "3"; + propagatedBuildInputs = [ caqti postgresql ]; meta = caqti.meta // { diff --git a/pkgs/development/ocaml-modules/caqti/dynload.nix b/pkgs/development/ocaml-modules/caqti/dynload.nix index 8e6a30a1a312..dfd52e24dd1e 100644 --- a/pkgs/development/ocaml-modules/caqti/dynload.nix +++ b/pkgs/development/ocaml-modules/caqti/dynload.nix @@ -1,10 +1,12 @@ -{ lib, buildDunePackage, caqti }: +{ lib, buildDunePackage, caqti, findlib }: buildDunePackage { pname = "caqti-dynload"; inherit (caqti) version src; - propagatedBuildInputs = [ caqti ]; + duneVersion = "3"; + + propagatedBuildInputs = [ caqti findlib ]; meta = caqti.meta // { description = "Dynamic linking of Caqti drivers using findlib.dynload"; diff --git a/pkgs/development/ocaml-modules/caqti/lwt.nix b/pkgs/development/ocaml-modules/caqti/lwt.nix index d06421136280..66e5a7ce293d 100644 --- a/pkgs/development/ocaml-modules/caqti/lwt.nix +++ b/pkgs/development/ocaml-modules/caqti/lwt.nix @@ -4,6 +4,8 @@ buildDunePackage { pname = "caqti-lwt"; inherit (caqti) version src; + duneVersion = "3"; + propagatedBuildInputs = [ caqti logs lwt ]; meta = caqti.meta // { description = "Lwt support for Caqti"; }; diff --git a/pkgs/development/ocaml-modules/caqti/type-calendar.nix b/pkgs/development/ocaml-modules/caqti/type-calendar.nix index 26b0887f20e8..db4d5983aedf 100644 --- a/pkgs/development/ocaml-modules/caqti/type-calendar.nix +++ b/pkgs/development/ocaml-modules/caqti/type-calendar.nix @@ -4,6 +4,8 @@ buildDunePackage { pname = "caqti-type-calendar"; inherit (caqti) src version; + duneVersion = "3"; + propagatedBuildInputs = [ calendar caqti ]; meta = caqti.meta // { |