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

jbuilder: 1.0.1 -> dune: 1.1.1

Browse Source
This commit is contained in:
Vincent Laporte
2018-09-05 16:11:47 +00:00
committed by Vincent Laporte
parent eb429c7c54
commit fc19401d67
69 changed files with 228 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/ocaml-modules/cstruct/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, jbuilder, findlib, sexplib, ocplib-endian }:
{ stdenv, fetchurl, ocaml, dune, findlib, sexplib, ocplib-endian }:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-cstruct-${version}";
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
unpackCmd = "tar -xjf $curSrc";
buildInputs = [ ocaml jbuilder findlib ];
buildInputs = [ ocaml dune findlib ];
propagatedBuildInputs = [ sexplib ocplib-endian ];
buildPhase = "jbuilder build -p cstruct";
buildPhase = "dune build -p cstruct";
inherit (jbuilder) installPhase;
inherit (dune) installPhase;
meta = {
description = "Access C-like structures directly from OCaml";

2
pkgs/development/ocaml-modules/cstruct/ppx.nix
View File

@@ -9,5 +9,5 @@ stdenv.mkDerivation rec {
buildInputs = cstruct.buildInputs ++ [ ppx_tools_versioned ];
propagatedBuildInputs = [ cstruct ];
buildPhase = "jbuilder build -p ppx_cstruct";
buildPhase = "dune build -p ppx_cstruct";
}