git.iko.soy/typeable/nixpkgs
on master help sign in
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.

commitab8489cc404462f4108c0735c7e33106917f82d9 authorJules Aguillon <juloo.dsi@gmail.com> dateMon 18 Oct 2021, 17:56 (5 years ago) parent57961d2
3 files changed+21−5
pkgs/development/ocaml-modules/yaml/default.nix+6−5 pkgs/development/ocaml-modules/yaml/yaml-sexp.nix+13 pkgs/top-level/ocaml-packages.nix+2
pkgs/development/ocaml-modules/yaml/default.nix+6−5
@@ -1,22 +1,23 @@
11{ lib, fetchurl, buildDunePackage
22, dune-configurator
3−, ppx_sexp_conv
4−, bos, ctypes, fmt, logs, rresult, sexplib
3+, bos, ctypes, fmt, logs, rresult
4+, mdx, alcotest, crowbar, junit_alcotest, ezjsonm
55}:
66
77buildDunePackage rec {
88 pname = "yaml";
9− version = "2.1.0";
9+ version = "3.0.0";
1010
1111 useDune2 = true;
1212
1313 src = fetchurl {
1414 url = "https://github.com/avsm/ocaml-yaml/releases/download/v${version}/yaml-v${version}.tbz";
15− sha256 = "03g8vsh5jgi1cm5q78v15slgnzifp91fp7n4v1i7pa8yk0bkh585";
15+ sha256 = "1iws6lbnrrd5hhmm7lczfvqp0aidx5xn7jlqk2s5rjfmj9qf4j2c";
1616 };
1717
1818 buildInputs = [ dune-configurator ];
19− propagatedBuildInputs = [ bos ctypes fmt logs ppx_sexp_conv rresult sexplib ];
19+ propagatedBuildInputs = [ bos ctypes rresult ];
20+ checkInputs = [ fmt logs mdx alcotest crowbar junit_alcotest ezjsonm ];
2021
2122 meta = {
2223 description = "Parse and generate YAML 1.1 files";
pkgs/development/ocaml-modules/yaml/yaml-sexp.nixnew file+13
@@ -0,0 +1,13 @@
1+{ lib, fetchurl, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib }:
2+
3+buildDunePackage rec {
4+ pname = "yaml-sexp";
5+
6+ inherit (yaml) version src useDune2;
7+
8+ propagatedBuildInputs = [ yaml ppx_sexp_conv sexplib ];
9+
10+ meta = yaml.meta // {
11+ description = "ocaml-yaml with sexp support";
12+ };
13+}
pkgs/top-level/ocaml-packages.nix+2
@@ -1408,6 +1408,8 @@ let
14081408
14091409 yaml = callPackage ../development/ocaml-modules/yaml { };
14101410
1411+ yaml-sexp = callPackage ../development/ocaml-modules/yaml/yaml-sexp.nix { };
1412+
14111413 yojson = callPackage ../development/ocaml-modules/yojson { };
14121414
14131415 z3 = callPackage ../development/ocaml-modules/z3 {