commit ab8489cc404462f4108c0735c7e33106917f82d9 · pyrox.dev/nixpkgs

+6 -5

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

···

       1
       1
        
       { lib, fetchurl, buildDunePackage

     

       2
       2
        
       , dune-configurator

     

       3
       3
       -
       , ppx_sexp_conv

     

       4
       4
       -
       , bos, ctypes, fmt, logs, rresult, sexplib

     

       3
       3
       +
       , bos, ctypes, fmt, logs, rresult

     

       4
       4
       +
       , mdx, alcotest, crowbar, junit_alcotest, ezjsonm

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       buildDunePackage rec {

     

       8
       8
        
         pname = "yaml";

     

       9
       9
       -
         version = "2.1.0";

     

       9
       9
       +
         version = "3.0.0";

     

       10
       10
        
       

     

       11
       11
        
         useDune2 = true;

     

       12
       12
        
       

     

       13
       13
        
         src = fetchurl {

     

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

     

       15
       15
       -
           sha256 = "03g8vsh5jgi1cm5q78v15slgnzifp91fp7n4v1i7pa8yk0bkh585";

     

       15
       15
       +
           sha256 = "1iws6lbnrrd5hhmm7lczfvqp0aidx5xn7jlqk2s5rjfmj9qf4j2c";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         buildInputs = [ dune-configurator ];

     

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

     

       19
       19
       +
         propagatedBuildInputs = [ bos ctypes rresult ];

     

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

     

       20
       21
        
       

     

       21
       22
        
         meta = {

     

       22
       23
        
           description = "Parse and generate YAML 1.1 files";

+13

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

···

       1
       1
       +
       { lib, fetchurl, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib }:

     

       2
       2
       +
       

     

       3
       3
       +
       buildDunePackage rec {

     

       4
       4
       +
         pname = "yaml-sexp";

     

       5
       5
       +
       

     

       6
       6
       +
         inherit (yaml) version src useDune2;

     

       7
       7
       +
       

     

       8
       8
       +
         propagatedBuildInputs = [ yaml ppx_sexp_conv sexplib ];

     

       9
       9
       +
       

     

       10
       10
       +
         meta = yaml.meta // {

     

       11
       11
       +
           description = "ocaml-yaml with sexp support";

     

       12
       12
       +
         };

     

       13
       13
       +
       }

+2

pkgs/top-level/ocaml-packages.nix

···

       1408
       1408
        
       

     

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

     

       1410
       1410
        
       

     

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

     

       1412
       1412
       +
       

     

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

     

       1412
       1414
        
       

     

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