Unverified Commit 001ff312 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #244212 from thillux/botan3 

botan3: init at 3.1.1
parents c58bd826 8c8ab9ee

pkgs/development/libraries/botan/2.0.nix

+0 −3
Original line number Diff line number Diff line
@@ -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

  '';

})

pkgs/development/libraries/botan/3.0.nix

0 → 100644
+9 −0
Original line number Diff line number Diff line 
{ 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;

})

pkgs/development/libraries/botan/generic.nix

+5 −3
Original line number Diff line number Diff line
@@ -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/";

pkgs/top-level/all-packages.nix

+3 −0
Original line number Diff line number Diff line
@@ -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 { };