Add OPA to Nixpkgs.

svn path=/nixpkgs/trunk/; revision=30578

3 files changed, 7 insertions, 52 deletions

diff --git a/pkgs/development/ocaml-modules/cryptokit/META b/pkgs/development/ocaml-modules/cryptokit/META
deleted file mode 100644
index 661170835fdf..000000000000
--- a/pkgs/development/ocaml-modules/cryptokit/META
+++ /dev/null
@@ -1,8 +0,0 @@
-# Specifications for the "cryptokit" library:
-requires = ""
-description = "A library of cryptographic primitives for OCaml"
-version = "1.3"
-directory = "^"
-
-archive(byte) = "cryptokit.cma"
-archive(native) = "cryptokit.cmxa"
diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix
index f4ba9a8d7d7f..8aa3f2ba77e7 100644
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@@ -1,40 +1,24 @@
-{stdenv, fetchurl, zlib, ocaml}:
+{stdenv, fetchurl, zlib, ocaml, findlib, ncurses}:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
-  version = "1.3";
+  version = "1.5";
 in
 
 stdenv.mkDerivation {
   name = "cryptokit-${version}";
 
   src = fetchurl {
-    url = "http://forge.ocamlcore.org/frs/download.php/326/" +
+    url = "http://forge.ocamlcore.org/frs/download.php/639/" +
           "cryptokit-${version}.tar.gz";
-    sha256 = "0kqrlxkpzrj2qpniy6mhn7gx3n29s86vk4q0im2hqpxi9knkkwwy";
+    sha256 = "1r5kbsbsicrbpdrdim7h8xg2b1a8qg8sxig9q6cywzm57r33lj72";
   };
 
-  buildInputs = [zlib ocaml];
+  buildInputs = [zlib ocaml findlib ncurses];
 
-  patches = [ ./makefile.patch ];
+  buildFlags = "setup.data build";
 
-  configurePhase = ''
-    export INSTALLDIR="$out/lib/ocaml/${ocaml_version}/site-lib/cryptokit"
-    substituteInPlace Makefile \
-      --subst-var-by ZLIB_LIBDIR "${zlib}/lib" \
-      --subst-var-by ZLIB_INCLUDE "${zlib}/include" \
-      --subst-var INSTALLDIR 
-  '';
-
-  buildFlags = "all allopt";
-
-  doCheck = true;
-  
-  checkTarget = "test";
-
-  preInstall = "ensureDir $INSTALLDIR";
-
-  postInstall = "cp -a ${./META} $INSTALLDIR/META";
+  preBuild = "ensureDir $out/lib/ocaml/${ocaml_version}/site-lib/cryptokit";
 
   meta = {
     homepage = "http://pauillac.inria.fr/~xleroy/software.html";
diff --git a/pkgs/development/ocaml-modules/cryptokit/makefile.patch b/pkgs/development/ocaml-modules/cryptokit/makefile.patch
deleted file mode 100644
index b4a82c7d677f..000000000000
--- a/pkgs/development/ocaml-modules/cryptokit/makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nuar cryptokit-1.3/Makefile cryptokit-1.3.nixos/Makefile
---- cryptokit-1.3/Makefile	2005-04-20 15:19:54.000000000 +0200
-+++ cryptokit-1.3.nixos/Makefile	2010-08-17 15:22:07.000000000 +0200
-@@ -9,14 +9,13 @@
- 
- # The directory containing the Zlib library (libz.a or libz.so)
- # Leave blank if you don't have Zlib.
--ZLIB_LIBDIR=/usr/lib
--#ZLIB_LIBDIR=/usr/lib64    # for x86-64 Linux
-+ZLIB_LIBDIR=@ZLIB_LIBDIR@
- 
- # The directory containing the Zlib header file (zlib.h)
--ZLIB_INCLUDE=/usr/include
-+ZLIB_INCLUDE=@ZLIB_INCLUDE@
- 
- # Where to install the library. By default: OCaml's standard library directory.
--INSTALLDIR=`$(OCAMLC) -where`
-+INSTALLDIR=@INSTALLDIR@
- 
- # Flags for the C compiler.
- CFLAGS=-O -I$(ZLIB_INCLUDE) $(ZLIB)