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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Luca Bruno
2014-11-10 10:03:52 +01:00
parent 4030ab3ba4 9e3137ddf0
commit 6af0d6974f
96 changed files with 1773 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/ocaml-modules/ocsigen-deriving/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchgit, ocaml, findlib, ocaml_oasis, ocaml_data_notation, ocaml_optcomp}:
{stdenv, fetchgit, ocaml, findlib, ocaml_oasis, ocaml_data_notation, ocaml_optcomp, camlp4}:
stdenv.mkDerivation {
name = "ocsigen-deriving";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "2b3bf3f4972d0e6eaf075f7353ce482b776726e0cd04947a89b7156384ec0662";
};
buildInputs = [ocaml findlib ocaml_oasis ocaml_data_notation ocaml_optcomp];
buildInputs = [ocaml findlib ocaml_oasis ocaml_data_notation ocaml_optcomp camlp4];
configurePhase = ''
make setup-dev.exe

6
pkgs/development/ocaml-modules/optcomp/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib}:
{stdenv, fetchurl, ocaml, findlib, camlp4}:
stdenv.mkDerivation {
name = "ocaml-optcomp";
@@ -9,13 +9,13 @@ stdenv.mkDerivation {
createFindlibDestdir = true;
buildInputs = [ocaml findlib];
buildInputs = [ocaml findlib camlp4];
meta = {
homepage = https://github.com/diml/optcomp;
description = "Optional compilation for OCaml with cpp-like directives";
license = "BSD";
license = stdenv.lib.licenses.bsd3;
platforms = ocaml.meta.platforms;
maintainers = [
stdenv.lib.maintainers.gal_bolle