Unverified Commit 6f37a0d0 authored by Vincent Laporte's avatar Vincent Laporte Committed by GitHub
Browse files

ocamlPackages.atd: 4.0.0 → 4.1.0 (#510483)

parents 059a9b3c a9f0eef3

pkgs/development/ocaml-modules/atd/jsonlike.nix

0 → 100644
+18 −0
Original line number Diff line number Diff line 
{

  buildDunePackage,

  atd,

  re,

}:



buildDunePackage {

  pname = "atd-jsonlike";

  inherit (atd) src version;



  minimalOCamlVersion = "4.12";



  propagatedBuildInputs = [ re ];



  meta = (removeAttrs atd.meta [ "mainProgram" ]) // {

    description = "Generic JSON-like AST for use with ATD code generators";

  };

}

pkgs/development/ocaml-modules/atd/yamlx.nix

0 → 100644
+19 −0
Original line number Diff line number Diff line 
{

  buildDunePackage,

  atd-jsonlike,

  yamlx,

}:



buildDunePackage {

  pname = "atd-yamlx";

  inherit (atd-jsonlike) version src;



  propagatedBuildInputs = [

    atd-jsonlike

    yamlx

  ];



  meta = atd-jsonlike.meta // {

    description = "YAML-to-jsonlike bridge for use with ATD code generators";

  };

}

pkgs/development/ocaml-modules/atdgen/codec-runtime.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ 


buildDunePackage (finalAttrs: {

  pname = "atdgen-codec-runtime";

  version = "4.0.0";

  version = "4.1.0";



  src = fetchurl {

    url = "https://github.com/ahrefs/atd/releases/download/${finalAttrs.version}/atd-${finalAttrs.version}.tbz";

    hash = "sha256-NRT+TcTniGQLPpqf7DtbEG5vYJtZ0oUicB3hvS6pCfE=";

    hash = "sha256-c7J+xg77vqYPMRy8oJwQS1U3vocz9HcnqfXth41uBGw=";

  };



  meta = {

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

+11 −3
Original line number Diff line number Diff line 
{

  lib,

  buildDunePackage,

  ocaml,

  alcotest,

  atd,

  atd-jsonlike,

  atd-yamlx,

  atdgen-codec-runtime,

  atdgen-runtime,

  atdml,

  biniou,

  re,

  python3,

  yamlx,

}:



buildDunePackage {
@@ -20,15 +25,18 @@ buildDunePackage { 


  propagatedBuildInputs = [ atdgen-runtime ];



  doCheck = true;

  doCheck = lib.versionAtLeast ocaml.version "4.14";

  nativeCheckInputs = [

    atd

    atdml

    biniou

    (python3.withPackages (ps: [ ps.jsonschema ]))

  ];

  checkInputs = [

    alcotest

    atdgen-codec-runtime

    yamlx

    atd-jsonlike

    atd-yamlx

  ];



  meta = (removeAttrs atd.meta [ "mainProgram" ]) // {

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

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ buildDunePackage { 
  pname = "atdml";

  inherit (atd) version src;



  minimalOCamlVersion = "4.10";



  buildInputs = [ cmdliner ];



  propagatedBuildInputs = [ atd ];