git.iko.soy/typeable/nixpkgs
on master help sign in
ocamlPackages.mdx: 1.4.0 → 1.5.0

And split to multiple outputs

commit089c0efe8c934077bcb7bf8345a2368c101d12c9 authorVincent Laporte <Vincent.Laporte@gmail.com> dateSat 7 Dec 2019, 06:54 (7 years ago) parentb5e82ad
4 files changed+18−12
pkgs/development/ocaml-modules/containers/default.nix+1−1 pkgs/development/ocaml-modules/iter/default.nix+1−1 pkgs/development/ocaml-modules/mdx/default.nix+15−9 pkgs/development/ocaml-modules/printbox/default.nix+1−1
pkgs/development/ocaml-modules/containers/default.nix+1−1
@@ -16,7 +16,7 @@ buildDunePackage rec {
1616
1717 buildInputs = [ iter ];
1818
19− checkInputs = lib.optionals doCheck [ gen mdx ounit qcheck uutf ];
19+ checkInputs = lib.optionals doCheck [ gen mdx.bin ounit qcheck uutf ];
2020
2121 propagatedBuildInputs = [ result uchar ];
2222
pkgs/development/ocaml-modules/iter/default.nix+1−1
@@ -11,7 +11,7 @@ buildDunePackage rec {
1111 sha256 = "0j2sg50byn0ppmf6l36ksip7zx1d3gv7sc4hbbxs2rmx39jr7vxh";
1212 };
1313
14− buildInputs = lib.optionals doCheck [ mdx qtest ];
14+ buildInputs = lib.optionals doCheck [ mdx.bin qtest ];
1515 propagatedBuildInputs = [ result ];
1616
1717 doCheck = lib.versionAtLeast ocaml.version "4.04";
pkgs/development/ocaml-modules/mdx/default.nix+15−9
@@ -1,24 +1,30 @@
1−{ lib, fetchFromGitHub, buildDunePackage, ocaml, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml_lwt, pandoc, re }:
1+{ lib, fetchurl, buildDunePackage, opaline, ocaml
2+, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml-version, ocaml_lwt, pandoc, re }:
23
34buildDunePackage rec {
45 pname = "mdx";
5− version = "1.4.0";
6+ version = "1.5.0";
67
7− src = fetchFromGitHub {
8− owner = "realworldocaml";
9− repo = pname;
10− rev = version;
11− sha256 = "0ljd00d261s2wf7cab086asqi39icf9zs4nylni6dldaqb027d4w";
8+ src = fetchurl {
9+ url = "https://github.com/realworldocaml/mdx/releases/download/1.5.0/mdx-1.5.0.tbz";
10+ sha256 = "0g45plf4z7d178gp0bx7842fwbd3m19679yfph3s95da6mrfm3xn";
1211 };
1312
1413 nativeBuildInputs = [ cppo ];
15− buildInputs = [ astring cmdliner fmt logs ocaml-migrate-parsetree re ];
14+ buildInputs = [ cmdliner ];
15+ propagatedBuildInputs = [ astring fmt logs ocaml-migrate-parsetree ocaml-version re ];
1616 checkInputs = lib.optionals doCheck [ ocaml_lwt pandoc ];
1717
18− doCheck = !lib.versionAtLeast ocaml.version "4.08";
18+ doCheck = true;
1919
2020 dontStrip = lib.versions.majorMinor ocaml.version == "4.04";
2121
22+ outputs = [ "bin" "lib" "out" ];
23+
24+ installPhase = ''
25+ ${opaline}/bin/opaline -prefix $bin -libdir $lib/lib/ocaml/${ocaml.version}/site-lib
26+ '';
27+
2228 meta = {
2329 homepage = https://github.com/realworldocaml/mdx;
2430 description = "Executable OCaml code blocks inside markdown files";
pkgs/development/ocaml-modules/printbox/default.nix+1−1
@@ -13,7 +13,7 @@ buildDunePackage rec {
1313 sha256 = "16nwwpp13hzlcm9xqfxc558afm3i5s802dkj69l9s2vp04lgms5n";
1414 };
1515
16− checkInputs = lib.optional doCheck mdx;
16+ checkInputs = lib.optional doCheck mdx.bin;
1717
1818 doCheck = !lib.versionAtLeast ocaml.version "4.08";
1919