Merge pull request #179861 from vbgl/ocaml-atdgen-2.9.1

ocamlPackages.atdgen: 2.4.1 → 2.9.1
This commit is contained in:
superherointj 2022-07-03 21:46:26 -03:00 committed by GitHub
commit a97a0002fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 9 deletions

View file

@ -1,4 +1,4 @@
{ lib, atdgen-codec-runtime, menhir, easy-format, buildDunePackage, which, re, nixosTests }: { lib, atdgen-codec-runtime, menhir, easy-format, buildDunePackage, re, yojson, nixosTests }:
buildDunePackage rec { buildDunePackage rec {
pname = "atd"; pname = "atd";
@ -6,9 +6,8 @@ buildDunePackage rec {
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
nativeBuildInputs = [ which menhir ]; nativeBuildInputs = [ menhir ];
buildInputs = [ re ]; propagatedBuildInputs = [ easy-format re yojson ];
propagatedBuildInputs = [ easy-format ];
strictDeps = true; strictDeps = true;

View file

@ -2,11 +2,11 @@
buildDunePackage rec { buildDunePackage rec {
pname = "atdgen-codec-runtime"; pname = "atdgen-codec-runtime";
version = "2.4.1"; version = "2.9.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/ahrefs/atd/releases/download/${version}/atdgen-codec-runtime-${version}.tbz"; url = "https://github.com/ahrefs/atd/releases/download/${version}/atdts-${version}.tbz";
sha256 = "sha256:16888rnvhgh5yxxsnzsj10g5pzs1l4dn27n23kk2f4641dn26s3a"; sha256 = "sha256-OdwaUR0Ix0Oz8NDm36nIyvIRzF+r/pKgiej1fhcOmuQ=";
}; };
meta = { meta = {

View file

@ -1,4 +1,6 @@
{ buildDunePackage, alcotest, atd, atdgen-codec-runtime, atdgen-runtime, biniou, re, yojson }: { buildDunePackage, alcotest, atd, atdgen-codec-runtime, atdgen-runtime, biniou, re, yojson
, python3
}:
buildDunePackage { buildDunePackage {
pname = "atdgen"; pname = "atdgen";
@ -9,7 +11,9 @@ buildDunePackage {
propagatedBuildInputs = [ atdgen-runtime ]; propagatedBuildInputs = [ atdgen-runtime ];
doCheck = true; doCheck = true;
checkInputs = [ alcotest atdgen-codec-runtime ]; checkInputs = [ alcotest atdgen-codec-runtime
(python3.withPackages (ps: [ ps.jsonschema ]))
];
meta = (builtins.removeAttrs atd.meta [ "mainProgram" ]) // { meta = (builtins.removeAttrs atd.meta [ "mainProgram" ]) // {
description = "Generates efficient JSON serializers, deserializers and validators"; description = "Generates efficient JSON serializers, deserializers and validators";