From d19aa61253647802dabe98a9ec74ab58b701b7b7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 10 Nov 2010 14:48:42 +0000
Subject: [PATCH] Update Botan

svn path=/nixpkgs/trunk/; revision=24639
---
 pkgs/development/libraries/botan/default.nix | 54 ++++++++++++++------
 pkgs/top-level/all-packages.nix              |  4 +-
 2 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index 10fd49b5d18c..18de87b06677 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -1,28 +1,52 @@
-a :  
+x@{builderDefsPackage
+  , python
+  , bzip2, zlib, gmp, openssl
+  , boost
+  , ...}:
+builderDefsPackage
+(a :  
 let 
-  fetchurl = a.fetchurl;
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
 
-  version = a.lib.attrByPath ["version"] "1.8.1" a; 
-  buildInputs = with a; [
-    perl
-  ];
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="botan";
+    tarBaseName="Botan";
+    baseVersion="1.8";
+    revision="11";
+    version="${baseVersion}.${revision}";
+    name="${baseName}-${version}";
+    url="http://files.randombit.net/${baseName}/v${baseVersion}/${tarBaseName}-${version}.tbz";
+    hash="194vffc9gfb0912lzndn8nzblg2d2gjmk13fc8hppgpw7ln0mdn3";
+  };
 in
 rec {
-  src = fetchurl {
-    url = "http://files.randombit.net/botan/Botan-${version}.tbz";
-    sha256 = "1lgqkg7q0qpzh647zmzay149myrjihcx4jp3rrz6gw17rgn11v98";
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
   };
 
+  inherit (sourceInfo) name version;
   inherit buildInputs;
-  configureFlags = [];
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["doConfigure" "doMakeInstall"];
-
-  configureCommand = "perl ./configure.pl";
-  
-  name = "botan-" + version;
+  configureCommand = "python configure.py --with-gnump --with-bzip2 --with-zlib --with-openssl --with-tr1-implementation=boost";
+      
   meta = {
     description = "Cryptographic algorithms library";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      unix;
   };
-}
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://files.randombit.net/botan/";
+    };
+  };
+}) x
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67e0dbfda88a..ff0024dc4e1d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2610,9 +2610,7 @@ let
     enableStatic = true;
   });
 
-  botan = builderDefsPackage (import ../development/libraries/botan) {
-    inherit perl;
-  };
+  botan = callPackage ../development/libraries/botan { };
 
   buddy = callPackage ../development/libraries/buddy { };