Unverified Commit 83327584 authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

Merge pull request #224778 from vbgl/qcheck-ocaml-5.0 

ocamlPackages.qcheck: fix for OCaml ≥ 5.0
parents 5b68fb2a f80bf9ab

pkgs/development/ocaml-modules/caqti/async.nix

+2 −0
Original line number Diff line number Diff line
@@ -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"; };

pkgs/development/ocaml-modules/caqti/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -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";

pkgs/development/ocaml-modules/caqti/driver-mariadb.nix

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ buildDunePackage { 


  propagatedBuildInputs = [ caqti mariadb ];



  duneVersion = "3";



  meta = caqti.meta // {

    description = "MariaDB driver for Caqti using C bindings";

  };

pkgs/development/ocaml-modules/caqti/driver-postgresql.nix

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ buildDunePackage { 
  pname = "caqti-driver-postgresql";

  inherit (caqti) version src;



  duneVersion = "3";



  propagatedBuildInputs = [ caqti postgresql ];



  meta = caqti.meta // {

pkgs/development/ocaml-modules/caqti/dynload.nix

+4 −2
Original line number Diff line number Diff line 
{ 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";