mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 02:42:59 +00:00
mbedtls_3: init at 3.2.1
mbedtls 3 is incompatible with mbedtls 2, so create a new package for version 3. Remove comment disabling nixpkgs-update, since the version information on repology looks correct now.
This commit is contained in:
parent
493419b077
commit
100cad4858
6
pkgs/development/libraries/mbedtls/2.nix
Normal file
6
pkgs/development/libraries/mbedtls/2.nix
Normal file
@ -0,0 +1,6 @@
|
||||
{ callPackage }:
|
||||
|
||||
callPackage ./generic.nix {
|
||||
version = "2.28.1";
|
||||
hash = "sha256-brbZB3fINDeVWXf50ct4bxYkoBVyD6bBBijZyFQSnyw=";
|
||||
}
|
6
pkgs/development/libraries/mbedtls/3.nix
Normal file
6
pkgs/development/libraries/mbedtls/3.nix
Normal file
@ -0,0 +1,6 @@
|
||||
{ callPackage }:
|
||||
|
||||
callPackage ./generic.nix {
|
||||
version = "3.2.1";
|
||||
hash = "sha256-+M36NvFe4gw2PRbld/2JV3yBGrqK6soWcmrSEkUNcrc=";
|
||||
}
|
@ -1,4 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, version
|
||||
, hash
|
||||
, fetchFromGitHub
|
||||
|
||||
, cmake
|
||||
@ -11,17 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mbedtls";
|
||||
# Auto updates are disabled due to repology listing dev releases as release
|
||||
# versions. See
|
||||
# * https://github.com/NixOS/nixpkgs/pull/119838#issuecomment-822100428
|
||||
# * https://github.com/NixOS/nixpkgs/commit/0ee02a9d42b5fe1825b0f7cee7a9986bb4ba975d
|
||||
version = "2.28.1"; # nixpkgs-update: no auto update
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ARMmbed";
|
||||
owner = "Mbed-TLS";
|
||||
repo = "mbedtls";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-brbZB3fINDeVWXf50ct4bxYkoBVyD6bBBijZyFQSnyw=";
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja perl python3 ];
|
||||
@ -40,10 +39,11 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://tls.mbed.org/";
|
||||
homepage = "https://www.trustedfirmware.org/projects/mbed-tls/";
|
||||
changelog = "https://github.com/Mbed-TLS/mbedtls/blob/${pname}-${version}/ChangeLog";
|
||||
description = "Portable cryptographic and TLS library, formerly known as PolarSSL";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ raphaelr ];
|
||||
};
|
||||
}
|
@ -21486,7 +21486,8 @@ with pkgs;
|
||||
|
||||
maxflow = callPackage ../development/libraries/maxflow { };
|
||||
|
||||
mbedtls = callPackage ../development/libraries/mbedtls { };
|
||||
mbedtls = callPackage ../development/libraries/mbedtls/2.nix { };
|
||||
mbedtls_3 = callPackage ../development/libraries/mbedtls/3.nix { };
|
||||
|
||||
mdctags = callPackage ../development/tools/misc/mdctags { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user