mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 12:11:28 +00:00
Code Issues Wiki Activity

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

Browse source 
* 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.
This commit is contained in:
Jules Aguillon 2021-10-18 17:56:20 +02:00 committed by GitHub
parent 57961d2b83
commit ab8489cc40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/ocaml-modules/yaml/default.nix
View file

@ -1,22 +1,23 @@
{ 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";

13
pkgs/development/ocaml-modules/yaml/yaml-sexp.nix Normal file
View file

@ -0,0 +1,13 @@
{ 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";
};
}

2
pkgs/top-level/ocaml-packages.nix
View file

@ -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 {