Author: raskin
Date: Wed Nov 10 14:48:42 2010
New Revision: 24639
URL: https://svn.nixos.org/websvn/nix/?rev=24639&sc=1
Log:
Update Botan
Modified:
nixpkgs/trunk/pkgs/development/libraries/botan/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/botan/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/botan/default.nix Wed Nov 10
13:22:53 2010 (r24638)
+++ nixpkgs/trunk/pkgs/development/libraries/botan/default.nix Wed Nov 10
14:48:42 2010 (r24639)
@@ -1,28 +1,52 @@
-a :
+...@{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
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Nov 10 13:22:53
2010 (r24638)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Nov 10 14:48:42
2010 (r24639)
@@ -2610,9 +2610,7 @@
enableStatic = true;
});
- botan = builderDefsPackage (import ../development/libraries/botan) {
- inherit perl;
- };
+ botan = callPackage ../development/libraries/botan { };
buddy = callPackage ../development/libraries/buddy { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
