diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2022-08-11 13:12:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-11 13:12:46 +0200 |
| commit | ac322e2f8b43792a7b6a636114cd2c1144d31e97 (patch) | |
| tree | fe6e69c59d1742a4ae39c04a1b5c01372836d6e8 | |
| parent | 3a8c7aca86c8229125d7e3b2cbe126f7eb1e219e (diff) | |
| parent | d02d86b89b7f8a0005114245d8e29bab5aa012f2 (diff) | |
Merge pull request #185999 from mweinelt/botan-2.19.2
botan2: 2.18.1 -> 2.19.2
| -rw-r--r-- | pkgs/development/libraries/botan/2.0.nix | 15 | ||||
| -rw-r--r-- | pkgs/development/libraries/botan/generic.nix | 6 |
2 files changed, 6 insertions, 15 deletions
diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix index 113c4a27b919..6987b6c35f0a 100644 --- a/pkgs/development/libraries/botan/2.0.nix +++ b/pkgs/development/libraries/botan/2.0.nix @@ -1,19 +1,10 @@ { callPackage, fetchpatch, ... } @ args: callPackage ./generic.nix (args // { - baseVersion = "2.18"; - revision = "1"; - sha256 = "0adf53drhk1hlpfih0175c9081bqpclw6p2afn51cmx849ib9izq"; + baseVersion = "2.19"; + revision = "2"; + sha256 = "sha256-OvXxdhXGtc2Lgy0mn7bLTVTsZPnrCd2/Gt1Qk5QbTXU="; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt ''; - extraPatches = [ - (fetchpatch { - name = "CVE-2021-40529.patch"; - url = "https://github.com/randombit/botan/commit/9a23e4e3bc3966340531f2ff608fa9d33b5185a2.patch"; - sha256 = "1ax1n2l9zh0hk35vkkywgkhzpdk76xb9apz2wm3h9kjvjs9acr3y"; - # our source tarball doesn't include the tests - excludes = [ "src/tests/*" ]; - }) - ]; }) diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 1384bdee9add..3e5884c6c99a 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3, bzip2, zlib, gmp, openssl, boost +{ lib, stdenv, fetchurl, python3, bzip2, zlib, gmp, boost # Passed by version specific builders , baseVersion, revision, sha256 , sourceExtension ? "tar.xz" @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { patches = extraPatches; inherit postPatch; - buildInputs = [ python3 bzip2 zlib gmp openssl boost ] + buildInputs = [ python3 bzip2 zlib gmp boost ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; configurePhase = '' - python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" } + python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" } ''; enableParallelBuilding = true; |