Merge pull request #244212 from thillux/botan3

botan3: init at 3.1.1
This commit is contained in:
7c6f434c 2023-07-19 18:29:07 +00:00 committed by GitHub
commit 001ff312ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 6 deletions

View File

@ -4,7 +4,4 @@ callPackage ./generic.nix (args // {
baseVersion = "2.19";
revision = "3";
sha256 = "sha256-2uBH85nFpH8IfbXT2dno8RrkmF0UySjXHaGv+AGALVU=";
postPatch = ''
sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
'';
})

View File

@ -0,0 +1,9 @@
{ callPackage, fetchpatch, lib, ... } @ args:
callPackage ./generic.nix (args // {
baseVersion = "3.1";
revision = "1";
sha256 = "sha256-MMhP6RmTapj+9TMfJGxiqiwOTSCFstRREgf2ogr6Oms=";
# reconsider removing this platform marking, when MacOS uses Clang 14.0+ by default.
badPlatforms = lib.platforms.darwin;
})

View File

@ -4,10 +4,11 @@
, sourceExtension ? "tar.xz"
, extraConfigureFlags ? ""
, extraPatches ? [ ]
, badPlatforms ? [ ]
, postPatch ? null
, knownVulnerabilities ? [ ]
, CoreServices
, Security
, CoreServices ? null
, Security ? null
, ...
}:
@ -54,9 +55,10 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Cryptographic algorithms library";
maintainers = with maintainers; [ raskin ];
maintainers = with maintainers; [ raskin thillux ];
platforms = platforms.unix;
license = licenses.bsd2;
inherit badPlatforms;
inherit knownVulnerabilities;
};
passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/";

View File

@ -20351,6 +20351,9 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
# may add CoreServices and Security again, when MacOS uses Clang 14.0+ by default.
botan3 = callPackage ../development/libraries/botan/3.0.nix { };
box2d = callPackage ../development/libraries/box2d { };
boxfort = callPackage ../development/libraries/boxfort { };