tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

ocamlPackages.caqti: 1.9.1 → 2.1.1

authored by Vincent Laporte and committed by Vincent Laporte c29ae2c8 c6caed47

+26 -25
unified split
+1 -1
pkgs/development/ocaml-modules/caqti/async.nix
··· 4 4 pname = "caqti-async"; 5 5 inherit (caqti) version src; 6 6 7 - duneVersion = "3"; 7 + minimalOCamlVersion = "4.14"; 8 8 9 9 propagatedBuildInputs = [ async_kernel async_unix caqti core_kernel ]; 10 10
+20 -11
pkgs/development/ocaml-modules/caqti/default.nix
··· 1 - { lib, fetchurl, buildDunePackage, ocaml 2 - , cppo, logs, ptime, uri, bigstringaf 3 - , re, cmdliner, alcotest 1 + { lib 2 + , fetchurl 3 + , buildDunePackage 4 + , angstrom 5 + , bigstringaf 6 + , domain-name 7 + , dune-site 8 + , ipaddr 9 + , logs 10 + , lwt-dllist 11 + , mtime 12 + , ptime 13 + , uri 4 14 }: 5 15 6 16 buildDunePackage rec { 7 17 pname = "caqti"; 8 - version = "1.9.1"; 18 + version = "2.1.1"; 9 19 10 - minimalOCamlVersion = "4.04"; 11 - duneVersion = "3"; 20 + minimalOCamlVersion = "4.08"; 12 21 13 22 src = fetchurl { 14 23 url = "https://github.com/paurkedal/ocaml-caqti/releases/download/v${version}/caqti-v${version}.tbz"; 15 - sha256 = "sha256-PQBgJBNx3IcE6/vyNIf26a2xStU22LBhff8eM6UPaJ4="; 24 + hash = "sha256-SDpTX0HiZBkX/BgyzkrRX/w/ToKDsbMBiiYXNJWDCQo="; 16 25 }; 17 26 18 - nativeBuildInputs = [ cppo ]; 19 - propagatedBuildInputs = [ logs ptime uri bigstringaf ]; 20 - checkInputs = [ re cmdliner alcotest ]; 27 + buildInputs = [ dune-site ]; 28 + propagatedBuildInputs = [ angstrom bigstringaf domain-name ipaddr logs lwt-dllist mtime ptime uri ]; 21 29 22 - doCheck = lib.versionAtLeast ocaml.version "4.08"; 30 + # Checks depend on caqti-driver-sqlite3 (circural dependency) 31 + doCheck = false; 23 32 24 33 meta = { 25 34 description = "Unified interface to relational database libraries";
-2
pkgs/development/ocaml-modules/caqti/driver-mariadb.nix
··· 6 6 7 7 propagatedBuildInputs = [ caqti mariadb ]; 8 8 9 - duneVersion = "3"; 10 - 11 9 meta = caqti.meta // { 12 10 description = "MariaDB driver for Caqti using C bindings"; 13 11 };
-2
pkgs/development/ocaml-modules/caqti/driver-postgresql.nix
··· 4 4 pname = "caqti-driver-postgresql"; 5 5 inherit (caqti) version src; 6 6 7 - duneVersion = "3"; 8 - 9 7 propagatedBuildInputs = [ caqti postgresql ]; 10 8 11 9 meta = caqti.meta // {
+5 -3
pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix
··· 1 - { lib, buildDunePackage, caqti, ocaml_sqlite3 }: 1 + { lib, buildDunePackage, caqti, ocaml_sqlite3, alcotest }: 2 2 3 3 buildDunePackage { 4 4 pname = "caqti-driver-sqlite3"; 5 5 inherit (caqti) version src; 6 - 7 - duneVersion = "3"; 8 6 9 7 propagatedBuildInputs = [ caqti ocaml_sqlite3 ]; 8 + 9 + checkInputs = [ alcotest ]; 10 + 11 + doCheck = true; 10 12 11 13 meta = caqti.meta // { 12 14 description = "Sqlite3 driver for Caqti using C bindings";
-2
pkgs/development/ocaml-modules/caqti/dynload.nix
··· 4 4 pname = "caqti-dynload"; 5 5 inherit (caqti) version src; 6 6 7 - duneVersion = "3"; 8 - 9 7 propagatedBuildInputs = [ caqti findlib ]; 10 8 11 9 meta = caqti.meta // {
-2
pkgs/development/ocaml-modules/caqti/lwt.nix
··· 4 4 pname = "caqti-lwt"; 5 5 inherit (caqti) version src; 6 6 7 - duneVersion = "3"; 8 - 9 7 propagatedBuildInputs = [ caqti logs lwt ]; 10 8 11 9 meta = caqti.meta // { description = "Lwt support for Caqti"; };
-2
pkgs/development/ocaml-modules/caqti/type-calendar.nix
··· 4 4 pname = "caqti-type-calendar"; 5 5 inherit (caqti) src version; 6 6 7 - duneVersion = "3"; 8 - 9 7 propagatedBuildInputs = [ calendar caqti ]; 10 8 11 9 meta = caqti.meta // {