summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules/sexplib
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2014-09-29 23:54:20 +0200
committerVincent Laporte <Vincent.Laporte@gmail.com>2014-09-30 00:13:47 +0200
commita97cf72a27fc3171a9eaad99369bd9aed579629e (patch)
tree4de107599300bf3f80f2535961fca7e3c334da87 /pkgs/development/ocaml-modules/sexplib
parentf214d5394c397ab3620b71111c358206dc8ae4d9 (diff)
downloadnixpkgs-a97cf72a27fc3171a9eaad99369bd9aed579629e.tar
nixpkgs-a97cf72a27fc3171a9eaad99369bd9aed579629e.tar.gz
nixpkgs-a97cf72a27fc3171a9eaad99369bd9aed579629e.tar.bz2
nixpkgs-a97cf72a27fc3171a9eaad99369bd9aed579629e.tar.lz
nixpkgs-a97cf72a27fc3171a9eaad99369bd9aed579629e.tar.xz
nixpkgs-a97cf72a27fc3171a9eaad99369bd9aed579629e.tar.zst
nixpkgs-a97cf72a27fc3171a9eaad99369bd9aed579629e.zip
ocaml-sexplib: propagate the dependency to typeconv
And requires camlp4
Diffstat (limited to 'pkgs/development/ocaml-modules/sexplib')
-rw-r--r--pkgs/development/ocaml-modules/sexplib/108.08.00.nix10
-rw-r--r--pkgs/development/ocaml-modules/sexplib/default.nix10
2 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
index 3e73b562e7e..3dbb0ea8e81 100644
--- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
+++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, typeconv}:
+{stdenv, fetchurl, ocaml, findlib, typeconv, camlp4}:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -14,14 +14,16 @@ stdenv.mkDerivation {
     sha256 = "11z1k1d7dbb5m957klgalimpr0r602xp5zkkbgbffib1bphasarg";
   };
 
-  buildInputs = [ocaml findlib typeconv ];
+  buildInputs = [ocaml findlib];
+  propagatedBuildInputs = [typeconv camlp4];
 
   createFindlibDestdir = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://ocaml.janestreet.com/;
     description = "Library for serializing OCaml values to and from S-expressions";
-    license = stdenv.lib.licenses.asl20;
+    license = licenses.asl20;
+    maintainers = [ maintainers.vbgl ];
     platforms = ocaml.meta.platforms;
   };
 }
diff --git a/pkgs/development/ocaml-modules/sexplib/default.nix b/pkgs/development/ocaml-modules/sexplib/default.nix
index 6f744778875..a32c6a0e2ce 100644
--- a/pkgs/development/ocaml-modules/sexplib/default.nix
+++ b/pkgs/development/ocaml-modules/sexplib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv}:
+{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, camlp4}:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -14,14 +14,16 @@ stdenv.mkDerivation {
     sha256 = "0qh0zqp5nakqpmmhh4x7cg03vqj3j2bj4zj0nqdlksai188p9ila";
   };
 
-  buildInputs = [ocaml findlib ocaml_typeconv ];
+  buildInputs = [ocaml findlib];
+  propagatedBuildInputs = [ocaml_typeconv camlp4];
 
   createFindlibDestdir = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://ocaml.janestreet.com/;
     description = "Library for serializing OCaml values to and from S-expressions";
-    license = stdenv.lib.licenses.asl20;
+    license = licenses.asl20;
+    maintainers = [ maintainers.vbgl ];
     platforms = ocaml.meta.platforms;
   };
 }