ocamlPackages.ppx_deriving: 4.5 → 5.1

ocamlPackages.ppx_deriving_yojson: 3.5.2 → 3.6.1

ocamlPackages.visitors: 20200210 → 20210127

ocamlPackages.pgocaml: disable for OCaml < 4.08

ocamlPackages.nocrypto: disable for OCaml < 4.08

ocamlPackages.lens: mark as broken

ocamlPackages.ppx_deriving_protobuf: mark as broken

Closes #108137
This commit is contained in:
Vincent Laporte 2021-01-31 14:15:46 +01:00
parent cb06a8a558
commit 8f1302995e
No known key found for this signature in database
GPG key ID: EBD582ADDDB1F81F
12 changed files with 54 additions and 34 deletions

View file

@ -17,9 +17,9 @@ buildDunePackage rec {
minimumOCamlVersion = "4.04"; minimumOCamlVersion = "4.04";
buildInputs = [ perl ncurses ppxlib ]; buildInputs = [ perl ncurses ];
propagatedBuildInputs = [ camlp5 ppx_deriving re ]; propagatedBuildInputs = [ camlp5 ppxlib ppx_deriving re ];
meta = { meta = {
description = "Embeddable λProlog Interpreter"; description = "Embeddable λProlog Interpreter";

View file

@ -1,5 +1,5 @@
{ lib, buildDunePackage, fetchFromGitHub { lib, buildDunePackage, fetchFromGitHub
, menhir, ppx_deriving, re, uutf, uucp, ounit2 }: , menhir, ppxlib, ppx_deriving, re, uutf, uucp, ounit2 }:
buildDunePackage rec { buildDunePackage rec {
pname = "jingoo"; pname = "jingoo";
@ -17,7 +17,7 @@ buildDunePackage rec {
}; };
buildInputs = [ menhir ]; buildInputs = [ menhir ];
propagatedBuildInputs = [ ppx_deriving re uutf uucp ]; propagatedBuildInputs = [ ppxlib ppx_deriving re uutf uucp ];
checkInputs = [ ounit2 ]; checkInputs = [ ounit2 ];
doCheck = true; doCheck = true;

View file

@ -1,4 +1,5 @@
{ lib, buildDunePackage, fetchFromGitHub, alcotest, cryptokit, fmt, yojson { lib, buildDunePackage, fetchFromGitHub, alcotest, cryptokit, fmt, yojson
, ppxlib
, base64, re, ppx_deriving }: , base64, re, ppx_deriving }:
buildDunePackage rec { buildDunePackage rec {
@ -16,6 +17,8 @@ buildDunePackage rec {
sha256 = "1p799zk8j9c0002xzi2x7ndj1bzqf14744ampcqndrjnsi7mq71s"; sha256 = "1p799zk8j9c0002xzi2x7ndj1bzqf14744ampcqndrjnsi7mq71s";
}; };
buildInputs = [ ppxlib ];
propagatedBuildInputs = propagatedBuildInputs =
[ cryptokit fmt yojson base64 re ppx_deriving ]; [ cryptokit fmt yojson base64 re ppx_deriving ];

View file

@ -24,5 +24,6 @@ buildDunePackage rec {
maintainers = with maintainers; [ maintainers = with maintainers; [
kazcw kazcw
]; ];
broken = true; # Not compatible with ppx_deriving ≥ 5.0
}; };
} }

View file

@ -2,7 +2,7 @@
, ipaddr, cstruct, lwt, rresult, logs, lru , ipaddr, cstruct, lwt, rresult, logs, lru
, tcpip, ethernet, stdlib-shims , tcpip, ethernet, stdlib-shims
, alcotest, mirage-clock-unix , alcotest, mirage-clock-unix
, ppx_deriving , ppxlib, ppx_deriving
}: }:
buildDunePackage rec { buildDunePackage rec {
@ -19,8 +19,8 @@ buildDunePackage rec {
sha256 = "0cy95j184hi8fm1h6z6x1brjfrmbq3zjy2mqz99m8ys9vwkb63ma"; sha256 = "0cy95j184hi8fm1h6z6x1brjfrmbq3zjy2mqz99m8ys9vwkb63ma";
}; };
nativeBuildInputs = [ buildInputs = [
ppx_deriving ppxlib
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -33,6 +33,7 @@ buildDunePackage rec {
tcpip tcpip
ethernet ethernet
stdlib-shims stdlib-shims
ppx_deriving
]; ];
doCheck = true; doCheck = true;

View file

@ -15,6 +15,10 @@ let
''; '';
in in
if !versionAtLeast ocaml.version "4.08"
then throw "nocrypto is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-nocrypto-${version}"; name = "ocaml${ocaml.version}-nocrypto-${version}";
version = "0.5.4"; version = "0.5.4";

View file

@ -12,7 +12,7 @@ buildDunePackage rec {
sha256 = "1rdypc83nap9j2ml9r6n1pzgf79gk1yffwyi6fmcrl7zmy01cg0n"; sha256 = "1rdypc83nap9j2ml9r6n1pzgf79gk1yffwyi6fmcrl7zmy01cg0n";
}; };
minimumOCamlVersion = "4.07"; minimumOCamlVersion = "4.08";
useDune2 = true; useDune2 = true;
propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re rresult sexplib ]; propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re rresult sexplib ];

View file

@ -1,20 +1,34 @@
{ lib, fetchzip, buildDunePackage { lib, fetchurl, buildDunePackage
, cppo, ppxfind, ppx_tools, ppx_derivers, result, ounit, ocaml-migrate-parsetree , cppo, ppxlib, ppx_derivers, result, ounit, ocaml-migrate-parsetree
}: }:
let params =
if lib.versionAtLeast ppxlib.version "0.15"
then {
version = "5.1";
sha256 = "1i64fd7qrfzbam5hfbl01r0sx4iihsahcwqj13smmrjlnwi3nkxh";
} else {
version = "5.0";
sha256 = "0fkzrn4pdyvf1kl0nwvhqidq01pnq3ql8zk1jd56hb0cxaw851w3";
}
; in
buildDunePackage rec { buildDunePackage rec {
pname = "ppx_deriving"; pname = "ppx_deriving";
version = "4.5"; inherit (params) version;
src = fetchzip { useDune2 = true;
url = "https://github.com/ocaml-ppx/ppx_deriving/archive/v${version}.tar.gz";
sha256 = "1v2xldag54n0xk69vv3j4nln9bzkkpq3rildq118sydzsc9v239z"; src = fetchurl {
url = "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v${version}/ppx_deriving-v${version}.tbz";
inherit (params) sha256;
}; };
buildInputs = [ ppxfind cppo ounit ]; buildInputs = [ ppxlib cppo ];
propagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers ppx_tools result ]; propagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers result ];
doCheck = true; doCheck = true;
checkInputs = [ ounit ];
meta = with lib; { meta = with lib; {
description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02."; description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02.";

View file

@ -23,5 +23,6 @@ buildDunePackage rec {
description = "A Protocol Buffers codec generator for OCaml"; description = "A Protocol Buffers codec generator for OCaml";
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.vyorkin ]; maintainers = [ maintainers.vyorkin ];
broken = true;
}; };
} }

View file

@ -1,25 +1,26 @@
{ lib, buildDunePackage, fetchFromGitHub, ppxfind, ounit { lib, buildDunePackage, fetchFromGitHub, ppxlib, ounit
, ppx_deriving, yojson , ppx_deriving, yojson
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "ppx_deriving_yojson"; pname = "ppx_deriving_yojson";
version = "3.5.3"; version = "3.6.1";
minimumOCamlVersion = "4.04"; useDune2 = true;
minimumOCamlVersion = "4.07";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ocaml-ppx"; owner = "ocaml-ppx";
repo = "ppx_deriving_yojson"; repo = "ppx_deriving_yojson";
rev = "v${version}"; rev = "v${version}";
sha256 = "030638gp39mr4hkilrjhd98q4s8gjqxifm6fy6bwqrg74hmrl2y5"; sha256 = "1icz5h6p3pfj7my5gi7wxpflrb8c902dqa17f9w424njilnpyrbk";
}; };
buildInputs = [ ppxfind ounit ]; propagatedBuildInputs = [ ppxlib ppx_deriving yojson ];
propagatedBuildInputs = [ ppx_deriving yojson ];
doCheck = true; doCheck = true;
checkInputs = [ ounit ];
meta = { meta = {
description = "A Yojson codec generator for OCaml >= 4.04"; description = "A Yojson codec generator for OCaml >= 4.04";

View file

@ -1,24 +1,22 @@
{ lib, buildDunePackage, fetchFromGitLab, ppx_tools, ppx_deriving, result, cppo }: { lib, buildDunePackage, fetchFromGitLab, ppxlib, ppx_deriving, result }:
buildDunePackage rec { buildDunePackage rec {
pname = "visitors"; pname = "visitors";
version = "20200210"; version = "20210127";
useDune2 = true; useDune2 = true;
minimumOCamlVersion = "4.02.3"; minimumOCamlVersion = "4.07";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "fpottier"; owner = "fpottier";
repo = pname; repo = pname;
rev = version; rev = version;
domain = "gitlab.inria.fr"; domain = "gitlab.inria.fr";
sha256 = "12i099h1hc1walabiwqbinnpgcxkc1wn72913v7v6vvyif21rb5a"; sha256 = "0b73h7d4yv04a0b5x2i222jknbcgf9vvxzfjxzy2jwanxz9d873z";
}; };
buildInputs = [ cppo ]; propagatedBuildInputs = [ ppxlib ppx_deriving result ];
propagatedBuildInputs = [ ppx_tools ppx_deriving result ];
meta = with lib; { meta = with lib; {
homepage = "https://gitlab.inria.fr/fpottier/visitors"; homepage = "https://gitlab.inria.fr/fpottier/visitors";

View file

@ -979,10 +979,7 @@ let
ppx_derivers = callPackage ../development/ocaml-modules/ppx_derivers {}; ppx_derivers = callPackage ../development/ocaml-modules/ppx_derivers {};
ppx_deriving = ppx_deriving = callPackage ../development/ocaml-modules/ppx_deriving {};
if lib.versionAtLeast ocaml.version "4.02"
then callPackage ../development/ocaml-modules/ppx_deriving {}
else null;
ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {}; ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {};