dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
ocamlPackages.qcheck: fix for OCaml ≥ 5.0
This commit is contained in:
Ulrik Strid 2023-04-05 09:39:31 +02:00 committed by GitHub
commit 8332758415
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 77 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/ocaml-modules/caqti/async.nix
View File

@ -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"; };

1
pkgs/development/ocaml-modules/caqti/default.nix
View File

@ -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";

2
pkgs/development/ocaml-modules/caqti/driver-mariadb.nix
View File

@ -6,6 +6,8 @@ buildDunePackage {
propagatedBuildInputs = [ caqti mariadb ];
duneVersion = "3";
meta = caqti.meta // {
description = "MariaDB driver for Caqti using C bindings";
};

2
pkgs/development/ocaml-modules/caqti/driver-postgresql.nix
View File

@ -4,6 +4,8 @@ buildDunePackage {
pname = "caqti-driver-postgresql";
inherit (caqti) version src;
duneVersion = "3";
propagatedBuildInputs = [ caqti postgresql ];
meta = caqti.meta // {

6
pkgs/development/ocaml-modules/caqti/dynload.nix
View File

@ -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";

2
pkgs/development/ocaml-modules/caqti/lwt.nix
View File

@ -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"; };

2
pkgs/development/ocaml-modules/caqti/type-calendar.nix
View File

@ -4,6 +4,8 @@ buildDunePackage {
pname = "caqti-type-calendar";
inherit (caqti) src version;
duneVersion = "3";
propagatedBuildInputs = [ calendar caqti ];
meta = caqti.meta // {

2
pkgs/development/ocaml-modules/iter/default.nix
View File

@ -7,6 +7,8 @@ buildDunePackage rec {
pname = "iter";
version = "1.6";
duneVersion = "3";
src = fetchFromGitHub {
owner = "c-cube";
repo = pname;

1
pkgs/development/ocaml-modules/pratter/default.nix
View File

@ -12,6 +12,7 @@ buildDunePackage rec {
pname = "pratter";
minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchFromGitHub {
owner = "gabrielhdt";

4
pkgs/development/ocaml-modules/qcheck/alcotest.nix
View File

@ -3,7 +3,9 @@
buildDunePackage {
pname = "qcheck-alcotest";
inherit (qcheck-core) version src;
inherit (qcheck-core) version src patches;
duneVersion = "3";
propagatedBuildInputs = [ qcheck-core alcotest ];

36
pkgs/development/ocaml-modules/qcheck/bytes.patch Normal file
View File

@ -0,0 +1,36 @@
diff --git a/src/alcotest/dune b/src/alcotest/dune
index 220a8b3..df1ffe0 100644
--- a/src/alcotest/dune
+++ b/src/alcotest/dune
@@ -3,6 +3,6 @@
(name qcheck_alcotest)
(public_name qcheck-alcotest)
(wrapped false)
- (libraries unix bytes qcheck-core qcheck-core.runner alcotest)
+ (libraries unix qcheck-core qcheck-core.runner alcotest)
(flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
)
diff --git a/src/core/dune b/src/core/dune
index ad0939f..42dc8ac 100644
--- a/src/core/dune
+++ b/src/core/dune
@@ -3,6 +3,6 @@
(name qcheck_core)
(public_name qcheck-core)
(wrapped false)
- (libraries unix bytes)
+ (libraries unix)
(flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
)
diff --git a/src/ounit/dune b/src/ounit/dune
index 2fadb7a..41f8d4b 100644
--- a/src/ounit/dune
+++ b/src/ounit/dune
@@ -3,6 +3,6 @@
(name qcheck_ounit)
(public_name qcheck-ounit)
(wrapped false)
- (libraries unix bytes qcheck-core qcheck-core.runner ounit2)
+ (libraries unix qcheck-core qcheck-core.runner ounit2)
(flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
)

3
pkgs/development/ocaml-modules/qcheck/core.nix
View File

@ -5,6 +5,7 @@ buildDunePackage rec {
version = "0.20";
minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchFromGitHub {
owner = "c-cube";
@ -13,6 +14,8 @@ buildDunePackage rec {
sha256 = "sha256-d3gleiaPEDJTbHtieL4oAq1NlA/0NtzdW9SA1sItFeQ=";
};
patches = [ ./bytes.patch ];
meta = {
description = "Core qcheck library";
homepage = "https://c-cube.github.io/qcheck/";

4
pkgs/development/ocaml-modules/qcheck/default.nix
View File

@ -3,7 +3,9 @@
buildDunePackage {
pname = "qcheck";
inherit (qcheck-ounit) version src;
inherit (qcheck-ounit) version src patches;
duneVersion = "3";
propagatedBuildInputs = [ qcheck-ounit ];

4
pkgs/development/ocaml-modules/qcheck/ounit.nix
View File

@ -3,7 +3,9 @@
buildDunePackage {
pname = "qcheck-ounit";
inherit (qcheck-core) version src;
inherit (qcheck-core) version src patches;
duneVersion = "3";
propagatedBuildInputs = [ qcheck-core ounit ];

2
pkgs/development/ocaml-modules/qtest/default.nix
View File

@ -4,7 +4,7 @@ buildDunePackage rec {
pname = "qtest";
version = "2.11.2";
useDune2 = true;
duneVersion = "3";
src = fetchFromGitHub {
owner = "vincent-hugot";

2
pkgs/development/ocaml-modules/stringext/default.nix
View File

@ -8,7 +8,7 @@ let version = "1.6.0"; in
buildDunePackage {
pname = "stringext";
version = version;
useDune2 = true;
duneVersion = "3";
src = fetchurl {
url = "https://github.com/rgrinberg/stringext/releases/download/${version}/stringext-${version}.tbz";
sha256 = "1sh6nafi3i9773j5mlwwz3kxfzdjzsfqj2qibxhigawy5vazahfv";

10
pkgs/development/ocaml-modules/syslog-message/default.nix
View File

@ -1,5 +1,4 @@
{ lib, buildDunePackage, fetchurl
, ocaml
, astring, ptime, rresult, qcheck
}:
@ -7,13 +6,12 @@ buildDunePackage rec {
pname = "syslog-message";
version = "1.1.0";
minimumOCamlVersion = "4.03";
useDune2 = true;
minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl {
url = "https://github.com/verbosemode/${pname}/releases/download/${version}/${pname}-${version}.tbz";
sha256 = "0vy4dkl2q2fa6rzyfsvjyc9r1b9ymfqd6j35z2kp5vdc4r87053g";
hash = "sha256:0vy4dkl2q2fa6rzyfsvjyc9r1b9ymfqd6j35z2kp5vdc4r87053g";
};
propagatedBuildInputs = [
@ -22,7 +20,7 @@ buildDunePackage rec {
rresult
];
doCheck = lib.versionAtLeast ocaml.version "4.08";
doCheck = true;
checkInputs = [
qcheck
];

4
pkgs/development/ocaml-modules/uri/default.nix
View File

@ -3,11 +3,11 @@
}:
buildDunePackage rec {
minimumOCamlVersion = "4.03";
minimalOCamlVersion = "4.03";
pname = "uri";
version = "4.2.0";
useDune2 = true;
duneVersion = "3";
src = fetchurl {
url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";

4
pkgs/development/ocaml-modules/uri/sexp.nix
View File

@ -6,7 +6,9 @@ else
buildDunePackage {
pname = "uri-sexp";
inherit (uri) version useDune2 src meta;
inherit (uri) version src meta;
duneVersion = "3";
checkInputs = [ ounit ];
propagatedBuildInputs = [ ppx_sexp_conv sexplib0 uri ];