diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2015-03-08 21:55:17 +0300 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2015-03-09 01:03:01 +0300 |
| commit | 1fdc855b2f9143162b94f69865e258d14917925c (patch) | |
| tree | 0646bdecce41311e36fc605dfbd57cd7cba50c7e /pkgs/development/libraries | |
| parent | 3d4f7be9a3a4d477f7276c5fef7a1de03bf2c8fb (diff) | |
| download | nixpkgs-1fdc855b2f9143162b94f69865e258d14917925c.tar nixpkgs-1fdc855b2f9143162b94f69865e258d14917925c.tar.gz nixpkgs-1fdc855b2f9143162b94f69865e258d14917925c.tar.bz2 nixpkgs-1fdc855b2f9143162b94f69865e258d14917925c.tar.lz nixpkgs-1fdc855b2f9143162b94f69865e258d14917925c.tar.xz nixpkgs-1fdc855b2f9143162b94f69865e258d14917925c.tar.zst nixpkgs-1fdc855b2f9143162b94f69865e258d14917925c.zip | |
Update botan unstable
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/botan/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/botan/generic.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/botan/unstable.nix | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 57df3e7c915..3006a5a456d 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -4,4 +4,5 @@ callPackage ./generic.nix (args // { baseVersion = "1.10"; revision = "9"; sha256 = "1wldp9py3qcdgswgxya83c03y6345a6cf3vwz0y41bl1l39jfza8"; + extraConfigureFlags = "--with-gnump"; }) diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 8d68009390d..b01ea401b38 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost # Passed by version specific builders , baseVersion, revision, sha256 +, extraConfigureFlags ? "" , ... }: @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ python bzip2 zlib gmp openssl boost ]; configurePhase = '' - python configure.py --prefix=$out --with-gnump --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} + python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags} ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix index f979fb8a959..87a3e49b89b 100644 --- a/pkgs/development/libraries/botan/unstable.nix +++ b/pkgs/development/libraries/botan/unstable.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix (args // { baseVersion = "1.11"; - revision = "10"; - sha256 = "06d5p0bs953r2pqfc635x2w78m3xv28gr6fmvd8whbk9qp8r91yb"; + revision = "14"; + sha256 = "1laa6d8w9v39a2pfmilj62jwc67r0jbq5f3xdlffd3kvkdnwcysb"; openssl = null; }) |