cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #225681 from vbgl/ocaml-alcotest-1.7.0

Browse source 
ocamlPackages.alcotest: 1.6.0 → 1.7.0
This commit is contained in:
Ulrik Strid 2023-04-12 07:08:43 +02:00 committed by GitHub
commit c70dabd946
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 56 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/ocaml-modules/alcotest/default.nix
View file

@ -4,11 +4,13 @@
buildDunePackage rec { buildDunePackage rec {
pname = "alcotest"; pname = "alcotest";
version = "1.6.0"; version = "1.7.0";
duneVersion = "3";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-${version}.tbz"; url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-${version}.tbz";
sha256 = "sha256-/QD5ZoOVh0/zsdfvVm0U78Avp900Ej6yXVk1W+lLIyk="; hash = "sha256-gSus2zS0XoiZXgfXMGvasvckee8ZlmN/HV0fQWZ5At8=";
}; };
nativeBuildInputs = [ ocaml-syntax-shims ]; nativeBuildInputs = [ ocaml-syntax-shims ];

2
pkgs/development/ocaml-modules/alcotest/lwt.nix
View file

@ -7,6 +7,8 @@ buildDunePackage {
inherit (alcotest) version src; inherit (alcotest) version src;
duneVersion = "3";
propagatedBuildInputs = [ alcotest logs lwt fmt ]; propagatedBuildInputs = [ alcotest logs lwt fmt ];
doCheck = true; doCheck = true;

5
pkgs/development/ocaml-modules/angstrom-async/default.nix
View file

@ -3,9 +3,10 @@
buildDunePackage rec { buildDunePackage rec {
pname = "angstrom-async"; pname = "angstrom-async";
inherit (angstrom) version useDune2 src; inherit (angstrom) version src;
minimumOCamlVersion = "4.04.1"; duneVersion = "3";
minimalOCamlVersion = "4.04.1";
propagatedBuildInputs = [ angstrom async ]; propagatedBuildInputs = [ angstrom async ];

8
pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix
View file

@ -1,13 +1,13 @@
{ lib, fetchFromGitHub, buildDunePackage, angstrom, ocaml_lwt }: { lib, fetchFromGitHub, buildDunePackage, angstrom, lwt }:
buildDunePackage rec { buildDunePackage rec {
pname = "angstrom-lwt-unix"; pname = "angstrom-lwt-unix";
inherit (angstrom) version useDune2 src; inherit (angstrom) version src;
minimumOCamlVersion = "4.03"; duneVersion = "3";
propagatedBuildInputs = [ angstrom ocaml_lwt ]; propagatedBuildInputs = [ angstrom lwt ];
doCheck = true; doCheck = true;

4
pkgs/development/ocaml-modules/angstrom-unix/default.nix
View file

@ -3,9 +3,9 @@
buildDunePackage rec { buildDunePackage rec {
pname = "angstrom-unix"; pname = "angstrom-unix";
inherit (angstrom) version useDune2 src; inherit (angstrom) version src;
minimumOCamlVersion = "4.03"; duneVersion = "3";
propagatedBuildInputs = [ angstrom ]; propagatedBuildInputs = [ angstrom ];

4
pkgs/development/ocaml-modules/angstrom/default.nix
View file

@ -3,9 +3,9 @@
buildDunePackage rec { buildDunePackage rec {
pname = "angstrom"; pname = "angstrom";
version = "0.15.0"; version = "0.15.0";
useDune2 = true; duneVersion = "3";
minimumOCamlVersion = "4.04"; minimalOCamlVersion = "4.04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "inhabitedtype"; owner = "inhabitedtype";

3
pkgs/development/ocaml-modules/bigstringaf/default.nix
View file

@ -5,12 +5,13 @@ buildDunePackage rec {
version = "0.9.0"; version = "0.9.0";
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "inhabitedtype"; owner = "inhabitedtype";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-HXPjnE56auy2MI6HV2XuBX/VeqsO50HFzTul17lKEqE="; hash = "sha256-HXPjnE56auy2MI6HV2XuBX/VeqsO50HFzTul17lKEqE=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

2
pkgs/development/ocaml-modules/dispatch/default.nix
View file

@ -4,7 +4,7 @@ buildDunePackage rec {
pname = "dispatch"; pname = "dispatch";
version = "0.5.0"; version = "0.5.0";
useDune2 = true; duneVersion = "3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "inhabitedtype"; owner = "inhabitedtype";

1
pkgs/development/ocaml-modules/domain-name/default.nix
View file

@ -12,6 +12,7 @@ buildDunePackage rec {
}; };
minimalOCamlVersion = "4.04"; minimalOCamlVersion = "4.04";
duneVersion = "3";
checkInputs = [ alcotest ]; checkInputs = [ alcotest ];

6
pkgs/development/ocaml-modules/duff/default.nix
View file

@ -1,7 +1,6 @@
{ lib { lib
, fetchurl , fetchurl
, buildDunePackage , buildDunePackage
, ocaml
, fmt , fmt
, alcotest , alcotest
, hxd , hxd
@ -13,6 +12,9 @@ buildDunePackage rec {
pname = "duff"; pname = "duff";
version = "0.5"; version = "0.5";
minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/duff/releases/download/v${version}/duff-${version}.tbz"; url = "https://github.com/mirage/duff/releases/download/v${version}/duff-${version}.tbz";
sha256 = "sha256-0eqpfPWNOHYjkcjXRnZUTUFF0/L9E+TNoOqKCETN5hI="; sha256 = "sha256-0eqpfPWNOHYjkcjXRnZUTUFF0/L9E+TNoOqKCETN5hI=";
@ -20,7 +22,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ fmt ]; propagatedBuildInputs = [ fmt ];
doCheck = lib.versionAtLeast ocaml.version "4.08"; doCheck = true;
checkInputs = [ checkInputs = [
alcotest alcotest
crowbar crowbar

5
pkgs/development/ocaml-modules/encore/default.nix
View file

@ -1,7 +1,6 @@
{ lib { lib
, buildDunePackage , buildDunePackage
, fetchurl , fetchurl
, ocaml
, fmt , fmt
, bigstringaf , bigstringaf
, angstrom , angstrom
@ -12,14 +11,14 @@ buildDunePackage rec {
pname = "encore"; pname = "encore";
version = "0.8"; version = "0.8";
minimumOCamlVersion = "4.07"; minimalOCamlVersion = "4.08";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/encore/releases/download/v${version}/encore-v${version}.tbz"; url = "https://github.com/mirage/encore/releases/download/v${version}/encore-v${version}.tbz";
sha256 = "a406bc9863b04bb424692045939d6c170a2bb65a98521ae5608d25b0559344f6"; sha256 = "a406bc9863b04bb424692045939d6c170a2bb65a98521ae5608d25b0559344f6";
}; };
useDune2 = true; duneVersion = "3";
propagatedBuildInputs = [ angstrom fmt bigstringaf ]; propagatedBuildInputs = [ angstrom fmt bigstringaf ];
checkInputs = [ alcotest ]; checkInputs = [ alcotest ];

1
pkgs/development/ocaml-modules/faraday/async.nix
View file

@ -5,6 +5,7 @@ buildDunePackage rec {
inherit (faraday) version src; inherit (faraday) version src;
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
propagatedBuildInputs = [ faraday core_unix async ]; propagatedBuildInputs = [ faraday core_unix async ];

1
pkgs/development/ocaml-modules/faraday/default.nix
View file

@ -5,6 +5,7 @@ buildDunePackage rec {
version = "0.8.2"; version = "0.8.2";
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "inhabitedtype"; owner = "inhabitedtype";

1
pkgs/development/ocaml-modules/faraday/lwt-unix.nix
View file

@ -3,6 +3,7 @@
buildDunePackage rec { buildDunePackage rec {
pname = "faraday-lwt-unix"; pname = "faraday-lwt-unix";
inherit (faraday) version src; inherit (faraday) version src;
duneVersion = "3";
propagatedBuildInputs = [ lwt faraday-lwt ]; propagatedBuildInputs = [ lwt faraday-lwt ];

1
pkgs/development/ocaml-modules/faraday/lwt.nix
View file

@ -5,6 +5,7 @@ buildDunePackage rec {
inherit (faraday) version src; inherit (faraday) version src;
propagatedBuildInputs = [ faraday lwt ]; propagatedBuildInputs = [ faraday lwt ];
duneVersion = "3";
meta = faraday.meta // { meta = faraday.meta // {
description = "Lwt support for Faraday"; description = "Lwt support for Faraday";

1
pkgs/development/ocaml-modules/ff/default.nix
View file

@ -3,6 +3,7 @@
buildDunePackage rec { buildDunePackage rec {
pname = "ff"; pname = "ff";
inherit (ff-sig) version src; inherit (ff-sig) version src;
duneVersion = "3";
propagatedBuildInputs = [ propagatedBuildInputs = [
ff-sig ff-sig

1
pkgs/development/ocaml-modules/ff/pbt.nix
View file

@ -5,6 +5,7 @@ buildDunePackage {
inherit (ff-sig) version src; inherit (ff-sig) version src;
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
checkInputs = [ checkInputs = [
alcotest alcotest

2
pkgs/development/ocaml-modules/ff/sig.nix
View file

@ -10,6 +10,8 @@ buildDunePackage rec {
sha256 = "sha256-IoUH4awMOa1pm/t8E5io87R0TZsAxJjGWaXhXjn/w+Y="; sha256 = "sha256-IoUH4awMOa1pm/t8E5io87R0TZsAxJjGWaXhXjn/w+Y=";
}; };
duneVersion = "3";
propagatedBuildInputs = [ propagatedBuildInputs = [
zarith zarith
]; ];

4
pkgs/development/ocaml-modules/gmap/default.nix
View file

@ -4,14 +4,14 @@ buildDunePackage rec {
pname = "gmap"; pname = "gmap";
version = "0.3.0"; version = "0.3.0";
useDune2 = true; duneVersion = "3";
src = fetchurl { src = fetchurl {
url = "https://github.com/hannesm/gmap/releases/download/${version}/gmap-${version}.tbz"; url = "https://github.com/hannesm/gmap/releases/download/${version}/gmap-${version}.tbz";
sha256 = "073wa0lrb0jj706j87cwzf1a8d1ff14100mnrjs8z3xc4ri9xp84"; sha256 = "073wa0lrb0jj706j87cwzf1a8d1ff14100mnrjs8z3xc4ri9xp84";
}; };
minimumOCamlVersion = "4.03"; minimalOCamlVersion = "4.03";
checkInputs = [ alcotest fmt ]; checkInputs = [ alcotest fmt ];

1
pkgs/development/ocaml-modules/janestreet/0.14.nix
View file

@ -871,6 +871,7 @@ with self;
vcaml = janePackage { vcaml = janePackage {
pname = "vcaml"; pname = "vcaml";
duneVersion = "3";
hash = "0ykwrn8bvwx26ad4wb36jw9xnlwsdpnnx88396laxvcfimrp13qs"; hash = "0ykwrn8bvwx26ad4wb36jw9xnlwsdpnnx88396laxvcfimrp13qs";
meta.description = "OCaml bindings for the Neovim API"; meta.description = "OCaml bindings for the Neovim API";
propagatedBuildInputs = [ angstrom-async async_extra faraday ]; propagatedBuildInputs = [ angstrom-async async_extra faraday ];

4
pkgs/development/ocaml-modules/janestreet/0.15.nix
View file

@ -451,6 +451,7 @@ with self;
jsonaf = janePackage { jsonaf = janePackage {
pname = "jsonaf"; pname = "jsonaf";
duneVersion = "3";
hash = "1j9rn8vsvfpgmdpmdqb5qhvss5171j8n3ii1bcgnavqinchbvqa6"; hash = "1j9rn8vsvfpgmdpmdqb5qhvss5171j8n3ii1bcgnavqinchbvqa6";
meta.description = "A library for parsing, manipulating, and serializing data structured as JSON"; meta.description = "A library for parsing, manipulating, and serializing data structured as JSON";
propagatedBuildInputs = [ base ppx_jane angstrom faraday ]; propagatedBuildInputs = [ base ppx_jane angstrom faraday ];
@ -690,6 +691,7 @@ with self;
ppx_jsonaf_conv = janePackage { ppx_jsonaf_conv = janePackage {
pname = "ppx_jsonaf_conv"; pname = "ppx_jsonaf_conv";
duneVersion = "3";
version = "0.15.1"; version = "0.15.1";
hash = "0wprs7qmscklyskj4famhaqqisi6jypy414aqba14qdyi43w0cv3"; hash = "0wprs7qmscklyskj4famhaqqisi6jypy414aqba14qdyi43w0cv3";
minimumOCamlVersion = "4.08"; minimumOCamlVersion = "4.08";
@ -898,6 +900,7 @@ with self;
sexp = janePackage { sexp = janePackage {
pname = "sexp"; pname = "sexp";
duneVersion = "3";
hash = "00xlsymm1mpgs8cqkb6c36vh5hfw0saghvwiqh7jry65qc5nvv9z"; hash = "00xlsymm1mpgs8cqkb6c36vh5hfw0saghvwiqh7jry65qc5nvv9z";
propagatedBuildInputs = [ propagatedBuildInputs = [
async async
@ -1062,6 +1065,7 @@ with self;
}; };
vcaml = janePackage { vcaml = janePackage {
duneVersion = "3";
pname = "vcaml"; pname = "vcaml";
hash = "12fd29x9dgf4f14xrx7z4y1bm1wbfynrs3jismjbiqnckfpbqrib"; hash = "12fd29x9dgf4f14xrx7z4y1bm1wbfynrs3jismjbiqnckfpbqrib";
meta.description = "OCaml bindings for the Neovim API"; meta.description = "OCaml bindings for the Neovim API";

3
pkgs/development/ocaml-modules/junit/alcotest.nix
View file

@ -3,7 +3,8 @@
buildDunePackage ({ buildDunePackage ({
pname = "junit_alcotest"; pname = "junit_alcotest";
inherit (junit) src version meta useDune2; inherit (junit) src version meta;
duneVersion = "3";
propagatedBuildInputs = [ propagatedBuildInputs = [
junit junit

2
pkgs/development/ocaml-modules/junit/default.nix
View file

@ -14,7 +14,7 @@ buildDunePackage (rec {
tyxml tyxml
]; ];
useDune2 = true; duneVersion = "3";
doCheck = true; doCheck = true;
meta = with lib; { meta = with lib; {

3
pkgs/development/ocaml-modules/junit/ounit.nix
View file

@ -3,7 +3,8 @@
buildDunePackage ({ buildDunePackage ({
pname = "junit_ounit"; pname = "junit_ounit";
inherit (junit) src version meta useDune2; inherit (junit) src version meta;
duneVersion = "3";
propagatedBuildInputs = [ propagatedBuildInputs = [
junit junit

1
pkgs/development/ocaml-modules/ke/default.nix
View file

@ -18,6 +18,7 @@ buildDunePackage rec {
doCheck = true; doCheck = true;
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
meta = { meta = {
description = "Fast implementation of queue in OCaml"; description = "Fast implementation of queue in OCaml";

4
pkgs/development/ocaml-modules/pecu/default.nix
View file

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

2
pkgs/development/ocaml-modules/ppx_blob/default.nix
View file

@ -4,7 +4,7 @@ buildDunePackage rec {
pname = "ppx_blob"; pname = "ppx_blob";
version = "0.7.2"; version = "0.7.2";
useDune2 = true; duneVersion = "3";
src = fetchurl { src = fetchurl {
url = "https://github.com/johnwhitington/${pname}/releases/download/${version}/ppx_blob-${version}.tbz"; url = "https://github.com/johnwhitington/${pname}/releases/download/${version}/ppx_blob-${version}.tbz";

1
pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix
View file

@ -14,6 +14,7 @@ buildDunePackage rec {
version = "0.6.1"; version = "0.6.1";
minimalOCamlVersion = "4.11"; minimalOCamlVersion = "4.11";
duneVersion = "3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hammerlab"; owner = "hammerlab";

4
pkgs/development/ocaml-modules/terminal/default.nix
View file

@ -8,11 +8,11 @@ buildDunePackage rec {
version = "0.2.1"; version = "0.2.1";
minimalOCamlVersion = "4.03"; minimalOCamlVersion = "4.03";
useDune2 = true; duneVersion = "3";
src = fetchurl { src = fetchurl {
url = "https://github.com/CraigFe/progress/releases/download/${version}/terminal-${version}.tbz"; url = "https://github.com/CraigFe/progress/releases/download/${version}/terminal-${version}.tbz";
sha256 = "sha256:0vjqkvmpyi8kvmb4vrx3f0994rph8i9pvlrz1dyi126vlb2zbrvs"; hash = "sha256:0vjqkvmpyi8kvmb4vrx3f0994rph8i9pvlrz1dyi126vlb2zbrvs";
}; };
propagatedBuildInputs = [ stdlib-shims uutf uucp ]; propagatedBuildInputs = [ stdlib-shims uutf uucp ];

2
pkgs/development/ocaml-modules/unstrctrd/default.nix
View file

@ -21,7 +21,7 @@ buildDunePackage rec {
sha256 = "0mjm4v7kk75iwwsfnpmxc3bsl8aisz53y7z21sykdp60f4rxnah7"; sha256 = "0mjm4v7kk75iwwsfnpmxc3bsl8aisz53y7z21sykdp60f4rxnah7";
}; };
useDune2 = true; duneVersion = "3";
propagatedBuildInputs = [ propagatedBuildInputs = [
angstrom angstrom

1
pkgs/development/ocaml-modules/yuscii/default.nix
View file

@ -13,6 +13,7 @@ buildDunePackage rec {
version = "0.3.0"; version = "0.3.0";
minimalOCamlVersion = "4.03"; minimalOCamlVersion = "4.03";
duneVersion = "3";
src = fetchzip { src = fetchzip {
url = "https://github.com/mirage/yuscii/releases/download/v${version}/yuscii-v${version}.tbz"; url = "https://github.com/mirage/yuscii/releases/download/v${version}/yuscii-v${version}.tbz";