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: 3e9f9a64d174
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 99fec0eeb349
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jun 20, 2019

  1. ocamlPackages.bistro: init at 0.4.0

    @vbgl
    vbgl committed Jun 20, 2019
    Copy the full SHA
    99fec0e View commit details
Showing with 29 additions and 0 deletions.
  1. +27 −0 pkgs/development/ocaml-modules/bistro/default.nix
  2. +2 −0 pkgs/top-level/ocaml-packages.nix
27 changes: 27 additions & 0 deletions pkgs/development/ocaml-modules/bistro/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ lib, fetchFromGitHub, buildDunePackage
, core, lwt ? ocaml_lwt, ocaml_lwt, ocamlgraph, rresult, tyxml
}:

buildDunePackage rec {
pname = "bistro";
version = "0.4.0";
src = fetchFromGitHub {
owner = "pveber";
repo = pname;
rev = "v${version}";
sha256 = "0bxnggm4nkyl2iqwj4f5afw8lj5miq2rqsc9qfrlmg4g4rr3zh1c";
};

buildInputs = [ lwt ocamlgraph rresult tyxml ];

propagatedBuildInputs = [ core ];

minimumOCamlVersion = "4.04";

meta = {
inherit (src.meta) homepage;
description = "Build and execute typed scientific workflows";
maintainers = [ lib.maintainers.vbgl ];
license = lib.licenses.gpl2;
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/ocaml-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -61,6 +61,8 @@ let

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

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

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

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