From 18a5e1522ce48de7d729dd25d7b4fe092f07fee8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 20 Jan 2017 06:36:44 +0000
Subject: [PATCH] ocamlPackages.{camlpdf,cpdf}: 2.1.1 -> 2.2.1

---
 pkgs/development/ocaml-modules/camlpdf/default.nix | 6 +++---
 pkgs/development/ocaml-modules/cpdf/default.nix    | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix
index 9946366de01f..01441fcb4ec3 100644
--- a/pkgs/development/ocaml-modules/camlpdf/default.nix
+++ b/pkgs/development/ocaml-modules/camlpdf/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, ocaml, findlib, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "2.1.1";
-  name = "ocaml-camlpdf-${version}";
+  version = "2.2.1";
+  name = "ocaml${ocaml.version}-camlpdf-${version}";
   src = fetchgit {
     url = https://github.com/johnwhitington/camlpdf.git;
     rev = "refs/tags/v${version}";
-    sha256 = "118656hc3zv5nwmbhr6llvb7q2pbxk2hz95bv8x4879a9qsnb4xr";
+    sha256 = "0wa4rw8ccpb8xprslg88hbk352bi8bia4iffc22y55gkjr60f8gj";
   };
 
   buildInputs = [ ocaml findlib ncurses ];
diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix
index 66294206e66c..07909d1a465a 100644
--- a/pkgs/development/ocaml-modules/cpdf/default.nix
+++ b/pkgs/development/ocaml-modules/cpdf/default.nix
@@ -1,16 +1,14 @@
 { stdenv, fetchgit, ocaml, findlib, camlpdf, ncurses }:
 
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.0";
-
-let version = "2.1.1"; in
+let version = "2.2.1"; in
 
 stdenv.mkDerivation {
-  name = "ocaml-cpdf-${version}";
+  name = "ocaml${ocaml.version}-cpdf-${version}";
 
   src = fetchgit {
     url = https://github.com/johnwhitington/cpdf-source.git;
     rev = "refs/tags/v${version}";
-    sha256 = "01dq7z3admwnyp22z1h43a8f3glii3zxc9c7i6s2rgza3pd9jq4k";
+    sha256 = "1i2z417agnzzdavjfwb20r6716jl3sk5yi43ssy4jqzy6ah8x1ff";
   };
 
   buildInputs = [ ocaml findlib ncurses ];