From d1bbd569c99cbf74ff39108f54fc0fac2374260e Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@univ-orleans.fr>
Date: Thu, 17 Jul 2014 14:19:27 +0200
Subject: [PATCH 1/4] Update ocaml-pcre to version 7.1.1

---
 pkgs/development/ocaml-modules/pcre/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix
index 6df221a9244..b6c2488b250 100644
--- a/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/pkgs/development/ocaml-modules/pcre/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, pcre, ocaml, findlib}:
 
 stdenv.mkDerivation {
-  name = "ocaml-pcre-7.0.4";
+  name = "ocaml-pcre-7.1.1";
 
   src = fetchurl {
-    url = https://bitbucket.org/mmottl/pcre-ocaml/downloads/pcre-ocaml-7.0.4.tar.gz;
-    sha256 = "0h2qlza7jkzgrglw1k0fydpbil0dgpv526kxyyd1apdbyzhb0mpw";
+    url = https://github.com/mmottl/pcre-ocaml/releases/download/v7.1.1/pcre-ocaml-7.1.1.tar.gz;
+    sha256 = "0nj4gb6hjjjmz5gnl9cjrh4w82rw8cvbwnk0hxhfgfd25p9k50n3";
   };
 
   buildInputs = [ocaml findlib];

From 29d5629074f3462948fe3b37fbe3bb2445f95740 Mon Sep 17 00:00:00 2001
From: drozv <drdrozv@gmail.com>
Date: Thu, 12 Jun 2014 21:46:59 -0400
Subject: [PATCH 2/4] Fix x11 include and lib parameters for configure script.

---
 pkgs/development/compilers/ocaml/4.01.0.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix
index 79a7c8cd61f..48966fc2866 100644
--- a/pkgs/development/compilers/ocaml/4.01.0.nix
+++ b/pkgs/development/compilers/ocaml/4.01.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, x11 }:
+{ stdenv, fetchurl, ncurses, buildEnv, libX11, xproto }:
 
 let
    useX11 = !stdenv.isArm && !stdenv.isMips;
@@ -8,6 +8,10 @@ in
 
 stdenv.mkDerivation rec {
 
+  x11env = buildEnv { name = "x11env"; paths = [libX11 xproto]; };
+  x11lib = x11env + "/lib";
+  x11inc = x11env + "/include";
+
   name = "ocaml-4.01.0";
 
   src = fetchurl {
@@ -16,9 +20,11 @@ stdenv.mkDerivation rec {
   };
 
   prefixKey = "-prefix ";
-  configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];
+  configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11lib
+                                                    "-x11include" x11inc ];
+
   buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
-  buildInputs = [ncurses] ++ optionals useX11 [ x11 ];
+  buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ];
   installTargets = "install" + optionalString useNativeCompilers " installopt";
   preConfigure = ''
     CAT=$(type -tp cat)

From c59819311c6e15d6c807fcfb294e9b3600a79407 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Mon, 21 Jul 2014 11:27:09 +0200
Subject: [PATCH 3/4] =?UTF-8?q?Make=20x11=C2=A0optionnal=20for=20ocaml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/compilers/ocaml/4.01.0.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix
index 48966fc2866..0f8ed7deaa4 100644
--- a/pkgs/development/compilers/ocaml/4.01.0.nix
+++ b/pkgs/development/compilers/ocaml/4.01.0.nix
@@ -1,9 +1,12 @@
-{ stdenv, fetchurl, ncurses, buildEnv, libX11, xproto }:
+{ stdenv, fetchurl, ncurses, buildEnv, libX11, xproto,
+  useX11 ? (!stdenv.isArm && !stdenv.isMips) }:
 
 let
-   useX11 = !stdenv.isArm && !stdenv.isMips;
    useNativeCompilers = !stdenv.isMips;
    inherit (stdenv.lib) optionals optionalString;
+   x11Ok = if useX11 && (!stdenv.isArm && !stdenv.isMips)
+           then throw "x11 not available in ocaml with arm or mips arch"
+           else true;
 in
 
 stdenv.mkDerivation rec {

From 08f59327291df52f3644744a6b373513e502f880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 12 Aug 2014 21:53:02 +0200
Subject: [PATCH 4/4] ocaml: refactor the useX11 check to actually work

---
 pkgs/development/compilers/ocaml/4.01.0.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix
index 0f8ed7deaa4..0f68014fad6 100644
--- a/pkgs/development/compilers/ocaml/4.01.0.nix
+++ b/pkgs/development/compilers/ocaml/4.01.0.nix
@@ -1,12 +1,16 @@
-{ stdenv, fetchurl, ncurses, buildEnv, libX11, xproto,
-  useX11 ? (!stdenv.isArm && !stdenv.isMips) }:
+let
+  safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips);
+in
+
+{ stdenv, fetchurl, ncurses, buildEnv, libX11, xproto, useX11 ? safeX11 stdenv }:
+
+if useX11 && !(safeX11 stdenv)
+  then throw "x11 not available in ocaml with arm or mips arch"
+  else # let the indentation flow
 
 let
    useNativeCompilers = !stdenv.isMips;
    inherit (stdenv.lib) optionals optionalString;
-   x11Ok = if useX11 && (!stdenv.isArm && !stdenv.isMips)
-           then throw "x11 not available in ocaml with arm or mips arch"
-           else true;
 in
 
 stdenv.mkDerivation rec {