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

Merge pull request #4463 from vbgl/oasis 

ocaml 4.02: makes dependency to campl4 explicit
This commit is contained in:
Aristid Breitkreuz 2014-10-10 18:32:59 +02:00
parent af4455d853 977f172fee
commit 2fe1aac1e4
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/ocaml-modules/http/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib}: {stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}:
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version; ocaml_version = (builtins.parseDrvName ocaml.name).version;
@ -14,7 +14,7 @@ stdenv.mkDerivation {
sha256 = "070xw033r4pk6f4l0wcknm75y9qm4mp622a4cgzmcfhm58v6kssn"; sha256 = "070xw033r4pk6f4l0wcknm75y9qm4mp622a4cgzmcfhm58v6kssn";
}; };
buildInputs = [ocaml_pcre ocamlnet ocaml findlib]; buildInputs = [ocaml_pcre ocamlnet ocaml findlib camlp4];
createFindlibDestdir = true; createFindlibDestdir = true;
@ -30,10 +30,10 @@ stdenv.mkDerivation {
make all opt make all opt
''; '';
meta = { meta = with stdenv.lib; {
homepage = "http://upsilon.cc/~zack/hacking/software/ocaml-http/"; homepage = "http://upsilon.cc/~zack/hacking/software/ocaml-http/";
description = "do it yourself (OCaml) HTTP daemon"; description = "do it yourself (OCaml) HTTP daemon";
license = stdenv.lib.licenses.lgpl2; license = licenses.lgpl2;
maintainers = [ stdenv.lib.maintainers.roconnor ]; maintainers = with maintainers; [ roconnor vbgl ];
}; };
} }

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut } : {stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp4 } :
let let
ocaml_version = (builtins.parseDrvName ocaml.name).version; ocaml_version = (builtins.parseDrvName ocaml.name).version;
@ -14,7 +14,7 @@ stdenv.mkDerivation {
sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq"; sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq";
}; };
buildInputs = [ocaml findlib lablgtk freeglut ]; buildInputs = [ocaml findlib lablgtk freeglut camlp4];
propagatedBuildInputs = [ mesa ]; propagatedBuildInputs = [ mesa ];
patches = [ ./Makefile.config.patch ./META.patch ]; patches = [ ./Makefile.config.patch ./META.patch ];

12
pkgs/development/ocaml-modules/odn/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, ounit}: {stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, ounit, camlp4}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-data-notation-0.0.11"; name = "ocaml-data-notation-0.0.11";
@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj"; sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj";
}; };
buildInputs = [ocaml findlib ocaml_typeconv ounit]; buildInputs = [ocaml findlib ocaml_typeconv ounit camlp4];
createFindlibDestdir = true; createFindlibDestdir = true;
@ -16,13 +16,13 @@ stdenv.mkDerivation {
buildPhase = "ocaml setup.ml -build"; buildPhase = "ocaml setup.ml -build";
installPhase = "ocaml setup.ml -install"; installPhase = "ocaml setup.ml -install";
meta = { meta = with stdenv.lib; {
description = "Store data using OCaml notation"; description = "Store data using OCaml notation";
homepage = https://forge.ocamlcore.org/projects/odn/; homepage = https://forge.ocamlcore.org/projects/odn/;
license = stdenv.lib.licenses.lgpl21; license = licenses.lgpl21;
platforms = ocaml.meta.platforms; platforms = ocaml.meta.platforms;
maintainers = with stdenv.lib.maintainers; [ maintainers = with maintainers; [
z77z vbgl z77z
]; ];
}; };
} }

12
pkgs/development/tools/ocaml/oasis/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, ocaml_typeconv, {stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, ocaml_typeconv, camlp4,
ocamlmod, ocamlify, ounit, expect}: ocamlmod, ocamlify, ounit, expect}:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -13,7 +13,7 @@ stdenv.mkDerivation {
buildInputs = buildInputs =
[ [
ocaml findlib ocaml_typeconv ocamlmod ocamlify ounit ocaml findlib ocaml_typeconv ocamlmod ocamlify ounit camlp4
]; ];
propagatedBuildInputs = [ ocaml_data_notation ]; propagatedBuildInputs = [ ocaml_data_notation ];
@ -22,13 +22,13 @@ stdenv.mkDerivation {
buildPhase = "ocaml setup.ml -build"; buildPhase = "ocaml setup.ml -build";
installPhase = "ocaml setup.ml -install"; installPhase = "ocaml setup.ml -install";
meta = { meta = with stdenv.lib; {
homepage = http://oasis.forge.ocamlcore.org/; homepage = http://oasis.forge.ocamlcore.org/;
description = "Configure, build and install system for OCaml projects"; description = "Configure, build and install system for OCaml projects";
license = stdenv.lib.licenses.lgpl21; license = licenses.lgpl21;
platforms = ocaml.meta.platforms; platforms = ocaml.meta.platforms;
maintainers = with stdenv.lib.maintainers; [ maintainers = with maintainers; [
z77z vbgl z77z
]; ];
}; };
} }