From 9f82cc26840ef7b8cab89ac2d18b8ed69d79ea7e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 22 Nov 2014 22:50:31 +0000
Subject: [PATCH] ocaml-cil: update from 1.3.2 to 1.7.3

---
 pkgs/development/libraries/cil/default.nix    |  8 ------
 .../development/ocaml-modules/cil/default.nix | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +--
 3 files changed, 27 insertions(+), 10 deletions(-)
 delete mode 100644 pkgs/development/libraries/cil/default.nix
 create mode 100644 pkgs/development/ocaml-modules/cil/default.nix

diff --git a/pkgs/development/libraries/cil/default.nix b/pkgs/development/libraries/cil/default.nix
deleted file mode 100644
index ecbb0c19412b..000000000000
--- a/pkgs/development/libraries/cil/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{stdenv, fetchurl, ocaml, perl}: stdenv.mkDerivation {
-  name = "cil-1.3.2";
-  src = fetchurl {
-    url = http://manju.cs.berkeley.edu/cil/distrib/cil-1.3.2.tar.gz;
-    md5 = "aba80dd700fcb1411598670cc36a9573";
-  };
-  buildInputs = [ocaml perl];
-}
diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix
new file mode 100644
index 000000000000..43522e180b63
--- /dev/null
+++ b/pkgs/development/ocaml-modules/cil/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, perl, ocaml, findlib }:
+stdenv.mkDerivation {
+  name = "ocaml-cil-1.7.3";
+  src = fetchurl {
+    url = mirror://sourceforge/cil/cil-1.7.3.tar.gz;
+    sha256 = "05739da0b0msx6kmdavr3y2bwi92jbh3szc35d7d8pdisa8g5dv9";
+  };
+
+  buildInputs = [ perl ocaml findlib ];
+
+  createFindlibDestdir = true;
+
+  preConfigure = ''
+    export FORCE_PERL_PREFIX=1
+  '';
+  prefixKey = "-prefix=";
+
+  meta = with stdenv.lib; {
+    homepage = http://kerneis.github.io/cil/;
+    description = "A front-end for the C programming language that facilitates program analysis and transformation";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.vbgl ];
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1a5407050af..1701881ebaff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3577,6 +3577,8 @@ let
 
     ocaml_cairo2 = callPackage ../development/ocaml-modules/ocaml-cairo2 { };
 
+    cil = callPackage ../development/ocaml-modules/cil { };
+
     cmdliner = callPackage ../development/ocaml-modules/cmdliner { };
 
     cppo = callPackage ../development/tools/ocaml/cppo { };
@@ -4910,8 +4912,6 @@ let
 
   chromaprint = callPackage ../development/libraries/chromaprint { };
 
-  cil = callPackage ../development/libraries/cil { };
-
   cilaterm = callPackage ../development/libraries/cil-aterm {
     stdenv = overrideInStdenv stdenv [gnumake380];
   };