Unverified Commit ab8489cc authored by Jules Aguillon's avatar Jules Aguillon Committed by GitHub
Browse files

Upgrade ocamlPackages.yaml and add ocamlPackages.yaml-sexp (#142089) 

* ocamlPackages.yaml: 2.1.0 -> 3.0.0

Also added the checkInputs.

* Add ocamlPackage.yaml-sexp 3.0.0

The part of yaml that requires sexplib is moved to a second package.
parent 57961d2b

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

+6 −5
Original line number Diff line number Diff line 
{ lib, fetchurl, buildDunePackage

, dune-configurator

, ppx_sexp_conv

, bos, ctypes, fmt, logs, rresult, sexplib

, bos, ctypes, fmt, logs, rresult

, mdx, alcotest, crowbar, junit_alcotest, ezjsonm

}:



buildDunePackage rec {

  pname = "yaml";

  version = "2.1.0";

  version = "3.0.0";



  useDune2 = true;



  src = fetchurl {

    url = "https://github.com/avsm/ocaml-yaml/releases/download/v${version}/yaml-v${version}.tbz";

    sha256 = "03g8vsh5jgi1cm5q78v15slgnzifp91fp7n4v1i7pa8yk0bkh585";

    sha256 = "1iws6lbnrrd5hhmm7lczfvqp0aidx5xn7jlqk2s5rjfmj9qf4j2c";

  };



  buildInputs = [ dune-configurator ];

  propagatedBuildInputs = [ bos ctypes fmt logs ppx_sexp_conv rresult sexplib ];

  propagatedBuildInputs = [ bos ctypes rresult ];

  checkInputs = [ fmt logs mdx alcotest crowbar junit_alcotest ezjsonm ];



  meta = {

    description = "Parse and generate YAML 1.1 files";

pkgs/development/ocaml-modules/yaml/yaml-sexp.nix

0 → 100644
+13 −0
Original line number Diff line number Diff line 
{ lib, fetchurl, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib }:



buildDunePackage rec {

  pname = "yaml-sexp";



  inherit (yaml) version src useDune2;



  propagatedBuildInputs = [ yaml ppx_sexp_conv sexplib ];



  meta = yaml.meta // {

    description = "ocaml-yaml with sexp support";

  };

}

pkgs/top-level/ocaml-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -1408,6 +1408,8 @@ let 


    yaml = callPackage ../development/ocaml-modules/yaml { };



    yaml-sexp = callPackage ../development/ocaml-modules/yaml/yaml-sexp.nix { };



    yojson = callPackage ../development/ocaml-modules/yojson { };



    z3 = callPackage ../development/ocaml-modules/z3 {