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

Commits on Apr 18, 2018

  1. ocamlPackages.js_of_ocaml-tyxml: init at 3.1.0

    @vbgl
    vbgl committed Apr 18, 2018
    Copy the full SHA
    20c035b View commit details
Showing with 18 additions and 0 deletions.
  1. +16 −0 pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
  2. +2 −0 pkgs/top-level/ocaml-packages.nix
16 changes: 16 additions & 0 deletions pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
, js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned
, js_of_ocaml, reactivedata, tyxml
}:

stdenv.mkDerivation rec {
name = "js_of_ocaml-tyxml-${version}";

inherit (js_of_ocaml-compiler) version src installPhase meta;

buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];

propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ];

buildPhase = "jbuilder build -p js_of_ocaml-tyxml";
}
2 changes: 2 additions & 0 deletions pkgs/top-level/ocaml-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -334,6 +334,8 @@ let

js_of_ocaml-ppx_deriving_json = callPackage ../development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix {};

js_of_ocaml-tyxml = callPackage ../development/tools/ocaml/js_of_ocaml/tyxml.nix {};

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

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