diff options
Diffstat (limited to 'pkgs/development/ocaml-modules/caqti')
8 files changed, 7 insertions, 18 deletions
diff --git a/pkgs/development/ocaml-modules/caqti/async.nix b/pkgs/development/ocaml-modules/caqti/async.nix index 0e0da6a94bb..14869477077 100644 --- a/pkgs/development/ocaml-modules/caqti/async.nix +++ b/pkgs/development/ocaml-modules/caqti/async.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-async"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ async_kernel async_unix caqti core_kernel ]; diff --git a/pkgs/development/ocaml-modules/caqti/default.nix b/pkgs/development/ocaml-modules/caqti/default.nix index 510437f1c3b..5edb68d30cf 100644 --- a/pkgs/development/ocaml-modules/caqti/default.nix +++ b/pkgs/development/ocaml-modules/caqti/default.nix @@ -1,19 +1,16 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml +{ lib, fetchurl, buildDunePackage, ocaml , cppo, logs, ptime, uri, bigstringaf , re, cmdliner, alcotest }: buildDunePackage rec { pname = "caqti"; - version = "1.8.0"; - useDune2 = true; + version = "1.9.1"; - minimumOCamlVersion = "4.04"; + minimalOCamlVersion = "4.04"; - src = fetchFromGitHub { - owner = "paurkedal"; - repo = "ocaml-${pname}"; - rev = "v${version}"; - sha256 = "sha256-8uKlrq9j1Z3QzkCyoRIn2j6wCdGyo7BY7XlbFHN1xVE="; + src = fetchurl { + url = "https://github.com/paurkedal/ocaml-caqti/releases/download/v${version}/caqti-v${version}.tbz"; + sha256 = "sha256-PQBgJBNx3IcE6/vyNIf26a2xStU22LBhff8eM6UPaJ4="; }; nativeBuildInputs = [ cppo ]; diff --git a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix index 5f4f681540e..bff515eff38 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-driver-mariadb"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti mariadb ]; diff --git a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix index a1b427a5edf..f33e38fab8d 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-driver-postgresql"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti postgresql ]; diff --git a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix index 5282ba5ef50..822c002a8de 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-driver-sqlite3"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti ocaml_sqlite3 ]; diff --git a/pkgs/development/ocaml-modules/caqti/dynload.nix b/pkgs/development/ocaml-modules/caqti/dynload.nix index 6ed86683728..8e6a30a1a31 100644 --- a/pkgs/development/ocaml-modules/caqti/dynload.nix +++ b/pkgs/development/ocaml-modules/caqti/dynload.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-dynload"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti ]; diff --git a/pkgs/development/ocaml-modules/caqti/lwt.nix b/pkgs/development/ocaml-modules/caqti/lwt.nix index f02fa377f80..d0642113628 100644 --- a/pkgs/development/ocaml-modules/caqti/lwt.nix +++ b/pkgs/development/ocaml-modules/caqti/lwt.nix @@ -2,7 +2,6 @@ buildDunePackage { pname = "caqti-lwt"; - useDune2 = true; inherit (caqti) version src; propagatedBuildInputs = [ caqti logs lwt ]; diff --git a/pkgs/development/ocaml-modules/caqti/type-calendar.nix b/pkgs/development/ocaml-modules/caqti/type-calendar.nix index d2050e2cf47..26b0887f20e 100644 --- a/pkgs/development/ocaml-modules/caqti/type-calendar.nix +++ b/pkgs/development/ocaml-modules/caqti/type-calendar.nix @@ -2,9 +2,7 @@ buildDunePackage { pname = "caqti-type-calendar"; - version = "1.2.0"; - useDune2 = true; - inherit (caqti) src; + inherit (caqti) src version; propagatedBuildInputs = [ calendar caqti ]; |