JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ocamlPackages.mdx: 1.4.0 → 1.5.0

Browse Source 
And split to multiple outputs
This commit is contained in:
Vincent Laporte 2019-12-07 06:54:48 +00:00 committed by Vincent Laporte
parent b5e82ad239
commit 089c0efe8c
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/ocaml-modules/containers/default.nix
View File

@ -16,7 +16,7 @@ buildDunePackage rec {
buildInputs = [ iter ];
checkInputs = lib.optionals doCheck [ gen mdx ounit qcheck uutf ];
checkInputs = lib.optionals doCheck [ gen mdx.bin ounit qcheck uutf ];
propagatedBuildInputs = [ result uchar ];

2
pkgs/development/ocaml-modules/iter/default.nix
View File

@ -11,7 +11,7 @@ buildDunePackage rec {
sha256 = "0j2sg50byn0ppmf6l36ksip7zx1d3gv7sc4hbbxs2rmx39jr7vxh";
};
buildInputs = lib.optionals doCheck [ mdx qtest ];
buildInputs = lib.optionals doCheck [ mdx.bin qtest ];
propagatedBuildInputs = [ result ];
doCheck = lib.versionAtLeast ocaml.version "4.04";

24
pkgs/development/ocaml-modules/mdx/default.nix
View File

@ -1,24 +1,30 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml_lwt, pandoc, re }:
{ lib, fetchurl, buildDunePackage, opaline, ocaml
, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml-version, ocaml_lwt, pandoc, re }:
buildDunePackage rec {
pname = "mdx";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "realworldocaml";
repo = pname;
rev = version;
sha256 = "0ljd00d261s2wf7cab086asqi39icf9zs4nylni6dldaqb027d4w";
src = fetchurl {
url = "https://github.com/realworldocaml/mdx/releases/download/1.5.0/mdx-1.5.0.tbz";
sha256 = "0g45plf4z7d178gp0bx7842fwbd3m19679yfph3s95da6mrfm3xn";
};
nativeBuildInputs = [ cppo ];
buildInputs = [ astring cmdliner fmt logs ocaml-migrate-parsetree re ];
buildInputs = [ cmdliner ];
propagatedBuildInputs = [ astring fmt logs ocaml-migrate-parsetree ocaml-version re ];
checkInputs = lib.optionals doCheck [ ocaml_lwt pandoc ];
doCheck = !lib.versionAtLeast ocaml.version "4.08";
doCheck = true;
dontStrip = lib.versions.majorMinor ocaml.version == "4.04";
outputs = [ "bin" "lib" "out" ];
installPhase = ''
${opaline}/bin/opaline -prefix $bin -libdir $lib/lib/ocaml/${ocaml.version}/site-lib
'';
meta = {
homepage = https://github.com/realworldocaml/mdx;
description = "Executable OCaml code blocks inside markdown files";

2
pkgs/development/ocaml-modules/printbox/default.nix
View File

@ -13,7 +13,7 @@ buildDunePackage rec {
sha256 = "16nwwpp13hzlcm9xqfxc558afm3i5s802dkj69l9s2vp04lgms5n";
};
checkInputs = lib.optional doCheck mdx;
checkInputs = lib.optional doCheck mdx.bin;
doCheck = !lib.versionAtLeast ocaml.version "4.08";