pyrox.dev / nixpkgs
lol
fork atom

Update botan and fix the build

Michael Raskin bc159cc8 302f056f

+17 -10
+2 -2
pkgs/development/libraries/botan/default.nix
··· 2 2 3 3 callPackage ./generic.nix (args // { 4 4 baseVersion = "1.10"; 5 - revision = "8"; 6 - sha256 = "182f316rbdd6jrqn92vjms3jyb9syn4ic0nzi3b7rfjbj3zdabxw"; 5 + revision = "9"; 6 + sha256 = "1wldp9py3qcdgswgxya83c03y6345a6cf3vwz0y41bl1l39jfza8"; 7 7 })
+2 -2
pkgs/development/libraries/botan/default.upstream
··· 1 1 url http://botan.randombit.net/download.html 2 - version_link 'Botan-[0-9]+[.][0-9]*[02468]([.][0-9]+)?[.](tbz|tbz2|tar[.]bz2)$' 2 + version_link 'Botan-[0-9]+[.][0-9]*[02468]([.][0-9]+)?[.](tgz|tbz|tbz2|tar[.]bz2)$' 3 3 ensure_version 4 4 do_overwrite(){ 5 5 ensure_hash 6 - set_var_value hash $CURRENT_HASH 6 + set_var_value sha256 $CURRENT_HASH 7 7 set_var_value baseVersion ${CURRENT_VERSION%.*} 8 8 set_var_value revision ${CURRENT_VERSION##*.} 9 9 }
+7 -2
pkgs/development/libraries/botan/generic.nix
··· 9 9 version = "${baseVersion}.${revision}"; 10 10 11 11 src = fetchurl { 12 - name = "Botan-${version}.tar.bz2"; 12 + name = "Botan-${version}.tgz"; 13 13 url = "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.tbz"; 14 14 inherit sha256; 15 15 }; ··· 17 17 buildInputs = [ python bzip2 zlib gmp openssl boost ]; 18 18 19 19 configurePhase = '' 20 - python configure.py --prefix=$out --with-gnump --with-bzip2 --with-zlib --with-openssl --cc=$CC 20 + python configure.py --prefix=$out --with-gnump --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} 21 21 ''; 22 22 23 23 enableParallelBuilding = true; 24 24 25 + preInstall = '' 26 + patchShebangs src/scripts 27 + ''; 28 + 25 29 postInstall = '' 26 30 cd "$out"/lib/pkgconfig 27 31 ln -s botan-*.pc botan.pc || true 28 32 ''; 29 33 30 34 meta = with stdenv.lib; { 35 + inherit version; 31 36 description = "Cryptographic algorithms library"; 32 37 maintainers = with maintainers; [ raskin ]; 33 38 platforms = platforms.unix;
+3 -2
pkgs/development/libraries/botan/unstable.nix
··· 2 2 3 3 callPackage ./generic.nix (args // { 4 4 baseVersion = "1.11"; 5 - revision = "9"; 6 - sha256 = "0jgx5va042gmr6nc91p5dd59wnfxlz19mz2nnyv74pvwwmizs09m"; 5 + revision = "12"; 6 + sha256 = "099hbimpqry96xzbv69x1wmqrybcnfn7yw8jj6ljvk6r8wk4qg85"; 7 + openssl = null; 7 8 })
+3 -2
pkgs/development/libraries/botan/unstable.upstream
··· 1 1 url http://botan.randombit.net/download.html 2 - version_link 'Botan-[0-9]+[.][0-9]+([.][0-9]+)?[.](tbz|tbz2|tar[.]bz2)$' 2 + version_link 'Botan-[0-9]+[.][0-9]+([.][0-9]+)?[.](tgz|tbz|tbz2|tar[.]bz2)$' 3 3 ensure_version 4 + attribute_name botanUnstable 4 5 do_overwrite(){ 5 6 ensure_hash 6 - set_var_value hash $CURRENT_HASH 7 + set_var_value sha256 $CURRENT_HASH 7 8 set_var_value baseVersion ${CURRENT_VERSION%.*} 8 9 set_var_value revision ${CURRENT_VERSION##*.} 9 10 }