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

Merge pull request #105461 from mweinelt/botan 

botan2: 2.9.0 -> 2.17.2
This commit is contained in:
Michael Raskin 2020-12-21 11:25:53 +00:00 committed by GitHub
parent 652da3f472 e88bdd5f50
commit 67e7d1170b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/botan/2.0.nix
View File

@ -1,9 +1,9 @@
{ callPackage, ... } @ args: { callPackage, ... } @ args:
callPackage ./generic.nix (args // { callPackage ./generic.nix (args // {
baseVersion = "2.9"; baseVersion = "2.17";
revision = "0"; revision = "2";
sha256 = "06fiyalvc68p11qqh953azx2vrbav5vr00yvcfp67p9l4csn8m9h"; sha256 = "0v0yiq0qxcrsn5b34j6bz8i6pds8dih2ds90ylmy1msm5gz7vqpb";
postPatch = '' postPatch = ''
sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
''; '';

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

@ -4,6 +4,7 @@ callPackage ./generic.nix (args // {
baseVersion = "1.10"; baseVersion = "1.10";
revision = "17"; revision = "17";
sha256 = "04rnha712dd3sdb2q7k2yw45sf405jyigk7yrjfr6bwd9fvgyiv8"; sha256 = "04rnha712dd3sdb2q7k2yw45sf405jyigk7yrjfr6bwd9fvgyiv8";
sourceExtension = "tgz";
extraConfigureFlags = "--with-gnump"; extraConfigureFlags = "--with-gnump";
postPatch = '' postPatch = ''
sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt

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

@ -1,6 +1,7 @@
{ stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost { stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost
# Passed by version specific builders # Passed by version specific builders
, baseVersion, revision, sha256 , baseVersion, revision, sha256
, sourceExtension ? "tar.xz"
, extraConfigureFlags ? "" , extraConfigureFlags ? ""
, postPatch ? null , postPatch ? null
, darwin , darwin
@ -12,10 +13,10 @@ stdenv.mkDerivation rec {
version = "${baseVersion}.${revision}"; version = "${baseVersion}.${revision}";
src = fetchurl { src = fetchurl {
name = "Botan-${version}.tgz"; name = "Botan-${version}.${sourceExtension}";
urls = [ urls = [
"http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.tgz" "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.${sourceExtension}"
"http://botan.randombit.net/releases/Botan-${version}.tgz" "http://botan.randombit.net/releases/Botan-${version}.${sourceExtension}"
]; ];
inherit sha256; inherit sha256;
}; };

1
pkgs/tools/security/neopg/default.nix
View File

@ -44,5 +44,6 @@ stdenv.mkDerivation rec {
''; '';
maintainers = with maintainers; [ erictapen ]; maintainers = with maintainers; [ erictapen ];
platforms = platforms.linux; platforms = platforms.linux;
broken = true; # fails to build with recent versions of botan. https://github.com/das-labor/neopg/issues/98
}; };
} }