Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 99fec0eeb349
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f0e7c5f569f4
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 20, 2019

  1. ocamlPackages.mdx: init at 1.4.0

    @romildo @vbgl
    romildo authored and vbgl committed Jun 20, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Doctor-wu Doctor Wu
    GPG key ID: 7D1412F015912FB2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b849589 View commit details

  2. ocamlPackages.printbox: init at 0.2

    @romildo @vbgl
    romildo authored and vbgl committed Jun 20, 2019
    Copy the full SHA
    f0e7c5f View commit details
Showing with 58 additions and 0 deletions.
  1. +28 −0 pkgs/development/ocaml-modules/mdx/default.nix
  2. +26 −0 pkgs/development/ocaml-modules/printbox/default.nix
  3. +4 −0 pkgs/top-level/ocaml-packages.nix
28 changes: 28 additions & 0 deletions pkgs/development/ocaml-modules/mdx/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, buildDunePackage, astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml_lwt, pandoc, re }:

buildDunePackage rec {
pname = "mdx";
version = "1.4.0";

minimumOCamlVersion = "4.05";

src = fetchFromGitHub {
owner = "realworldocaml";
repo = pname;
rev = version;
sha256 = "0ljd00d261s2wf7cab086asqi39icf9zs4nylni6dldaqb027d4w";
};

nativeBuildInputs = [ cppo ];
buildInputs = [ astring cmdliner fmt logs ocaml-migrate-parsetree re ];
checkInputs = [ ocaml_lwt pandoc ];

doCheck = true;

meta = {
homepage = https://github.com/realworldocaml/mdx;
description = "Executable OCaml code blocks inside markdown files";
license = stdenv.lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.romildo ];
};
}
26 changes: 26 additions & 0 deletions pkgs/development/ocaml-modules/printbox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub, buildDunePackage, mdx }:

buildDunePackage rec {
pname = "printbox";
version = "0.2";

minimumOCamlVersion = "4.05";

src = fetchFromGitHub {
owner = "c-cube";
repo = pname;
rev = version;
sha256 = "16nwwpp13hzlcm9xqfxc558afm3i5s802dkj69l9s2vp04lgms5n";
};

checkInputs = [ mdx ];

doCheck = true;

meta = {
homepage = https://github.com/c-cube/printbox/;
description = "Allows to print nested boxes, lists, arrays, tables in several formats";
license = stdenv.lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.romildo ];
};
}
4 changes: 4 additions & 0 deletions pkgs/top-level/ocaml-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -428,6 +428,8 @@ let

markup = callPackage ../development/ocaml-modules/markup { lwt = ocaml_lwt; };

mdx = callPackage ../development/ocaml-modules/mdx { };

menhir = callPackage ../development/ocaml-modules/menhir { };

merlin = callPackage ../development/tools/ocaml/merlin { };
@@ -673,6 +675,8 @@ let

ppx_tools_versioned = callPackage ../development/ocaml-modules/ppx_tools_versioned { };

printbox = callPackage ../development/ocaml-modules/printbox { };

process = callPackage ../development/ocaml-modules/process { };

ptmap = callPackage ../development/ocaml-modules/ptmap { };