public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update botan and fix the build

Browse Source
This commit is contained in:
Michael Raskin 2015-01-06 18:47:02 +03:00
parent 302f056f91
commit bc159cc816
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/botan/default.nix
View File

@ -2,6 +2,6 @@
callPackage ./generic.nix (args // { callPackage ./generic.nix (args // {
baseVersion = "1.10"; baseVersion = "1.10";
revision = "8"; revision = "9";
sha256 = "182f316rbdd6jrqn92vjms3jyb9syn4ic0nzi3b7rfjbj3zdabxw"; sha256 = "1wldp9py3qcdgswgxya83c03y6345a6cf3vwz0y41bl1l39jfza8";
}) })

4
pkgs/development/libraries/botan/default.upstream
View File

@ -1,9 +1,9 @@
url http://botan.randombit.net/download.html url http://botan.randombit.net/download.html
version_link 'Botan-[0-9]+[.][0-9]*[02468]([.][0-9]+)?[.](tbz|tbz2|tar[.]bz2)$' version_link 'Botan-[0-9]+[.][0-9]*[02468]([.][0-9]+)?[.](tgz|tbz|tbz2|tar[.]bz2)$'
ensure_version ensure_version
do_overwrite(){ do_overwrite(){
ensure_hash ensure_hash
set_var_value hash $CURRENT_HASH set_var_value sha256 $CURRENT_HASH
set_var_value baseVersion ${CURRENT_VERSION%.*} set_var_value baseVersion ${CURRENT_VERSION%.*}
set_var_value revision ${CURRENT_VERSION##*.} set_var_value revision ${CURRENT_VERSION##*.}
} }

9
pkgs/development/libraries/botan/generic.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
version = "${baseVersion}.${revision}"; version = "${baseVersion}.${revision}";
src = fetchurl { src = fetchurl {
name = "Botan-${version}.tar.bz2"; name = "Botan-${version}.tgz";
url = "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.tbz"; url = "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.tbz";
inherit sha256; inherit sha256;
}; };
@ -17,17 +17,22 @@ stdenv.mkDerivation rec {
buildInputs = [ python bzip2 zlib gmp openssl boost ]; buildInputs = [ python bzip2 zlib gmp openssl boost ];
configurePhase = '' configurePhase = ''
python configure.py --prefix=$out --with-gnump --with-bzip2 --with-zlib --with-openssl --cc=$CC python configure.py --prefix=$out --with-gnump --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""}
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
preInstall = ''
patchShebangs src/scripts
'';
postInstall = '' postInstall = ''
cd "$out"/lib/pkgconfig cd "$out"/lib/pkgconfig
ln -s botan-*.pc botan.pc || true ln -s botan-*.pc botan.pc || true
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
inherit version;
description = "Cryptographic algorithms library"; description = "Cryptographic algorithms library";
maintainers = with maintainers; [ raskin ]; maintainers = with maintainers; [ raskin ];
platforms = platforms.unix; platforms = platforms.unix;

5
pkgs/development/libraries/botan/unstable.nix
View File

@ -2,6 +2,7 @@
callPackage ./generic.nix (args // { callPackage ./generic.nix (args // {
baseVersion = "1.11"; baseVersion = "1.11";
revision = "9"; revision = "12";
sha256 = "0jgx5va042gmr6nc91p5dd59wnfxlz19mz2nnyv74pvwwmizs09m"; sha256 = "099hbimpqry96xzbv69x1wmqrybcnfn7yw8jj6ljvk6r8wk4qg85";
openssl = null;
}) })

5
pkgs/development/libraries/botan/unstable.upstream
View File

@ -1,9 +1,10 @@
url http://botan.randombit.net/download.html url http://botan.randombit.net/download.html
version_link 'Botan-[0-9]+[.][0-9]+([.][0-9]+)?[.](tbz|tbz2|tar[.]bz2)$' version_link 'Botan-[0-9]+[.][0-9]+([.][0-9]+)?[.](tgz|tbz|tbz2|tar[.]bz2)$'
ensure_version ensure_version
attribute_name botanUnstable
do_overwrite(){ do_overwrite(){
ensure_hash ensure_hash
set_var_value hash $CURRENT_HASH set_var_value sha256 $CURRENT_HASH
set_var_value baseVersion ${CURRENT_VERSION%.*} set_var_value baseVersion ${CURRENT_VERSION%.*}
set_var_value revision ${CURRENT_VERSION##*.} set_var_value revision ${CURRENT_VERSION##*.}
} }