From 543f355883c8d7717ad9b028125a99bb978910b6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vincent.laporte@gmail.com>
Date: Thu, 3 Jul 2014 11:09:47 +0200
Subject: [PATCH 1/2] Adds biniou
---
.../ocaml-modules/biniou/default.nix | 31 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 33 insertions(+)
create mode 100644 pkgs/development/ocaml-modules/biniou/default.nix
diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix
new file mode 100644
index 000000000000..f0a1ee102088
--- /dev/null
+++ b/pkgs/development/ocaml-modules/biniou/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, ocaml, findlib, easy-format}:
+let
+ pname = "biniou";
+ version = "1.0.9";
+ webpage = "http://mjambon.com/${pname}.html";
+in
+stdenv.mkDerivation rec {
+
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "http://mjambon.com/releases/${pname}/${name}.tar.gz";
+ sha256 = "14j3hrhbjqxbizr1pr8fcig9dmfzhbjjwzwyc99fcsdic67w8izb";
+ };
+
+ buildInputs = [ ocaml findlib easy-format ];
+
+ createFindlibDestdir = true;
+
+ makeFlags = "PREFIX=$(out)";
+
+ preBuild = ''
+ mkdir $out/bin
+ '';
+
+ meta = {
+ description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
+ homepage = "${webpage}";
+ license = "bsd";
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fadcb46b0f88..a494a1f96323 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3186,6 +3186,8 @@ let
giflib = giflib_4_1;
};
+ biniou = callPackage ../development/ocaml-modules/biniou { };
+
ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
cppo = callPackage ../development/tools/ocaml/cppo { };
From e4216eddda21ecec3f631747c4e2975928a7fd99 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vincent.laporte@gmail.com>
Date: Thu, 3 Jul 2014 15:23:38 +0200
Subject: [PATCH 2/2] Clarifies the license; populates meta.platforms
---
pkgs/development/ocaml-modules/biniou/default.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix
index f0a1ee102088..59f30de5e841 100644
--- a/pkgs/development/ocaml-modules/biniou/default.nix
+++ b/pkgs/development/ocaml-modules/biniou/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
homepage = "${webpage}";
- license = "bsd";
+ license = stdenv.lib.licenses.bsd3;
+ platforms = ocaml.meta.platforms;
};
}