ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #204658 from raphaelr/mbedtls-3

Browse Source
This commit is contained in:
Sandro 2022-12-08 16:38:17 +01:00 committed by GitHub
commit 4cc7973ae6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 57 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/emulators/dolphin-emu/default.nix
View File

@ -24,7 +24,7 @@
, wxGTK30
, soundtouch
, miniupnpc
, mbedtls
, mbedtls_2
, curl
, lzo
, sfml
@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
wxGTK30
soundtouch
miniupnpc
mbedtls
mbedtls_2
curl
lzo
sfml

4
pkgs/applications/emulators/dolphin-emu/master.nix
View File

@ -20,7 +20,7 @@
, alsa-lib
, miniupnpc
, enet
, mbedtls
, mbedtls_2
, soundtouch
, sfml
, xz
@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
hidapi
miniupnpc
enet
mbedtls
mbedtls_2
soundtouch
sfml
xz

4
pkgs/applications/emulators/dolphin-emu/primehack.nix
View File

@ -29,7 +29,7 @@
, alsa-lib
, miniupnpc
, enet
, mbedtls
, mbedtls_2
, soundtouch
, sfml
, fmt
@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
hidapi
miniupnpc
enet
mbedtls
mbedtls_2
soundtouch
sfml
fmt

2
pkgs/applications/misc/lutris/fhsenv.nix
View File

@ -30,7 +30,7 @@ in buildFHSUserEnv {
# DGen // TODO: libarchive is broken
# Dolphin
bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm
bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls_2 lzo sfml gsm
wavpack orc nettle gmp pcre vulkan-loader
# DOSBox

4
pkgs/applications/misc/openrgb/default.nix
View File

@ -1,4 +1,4 @@
{ lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config, coreutils, mbedtls }:
{ lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config, coreutils, mbedtls_2 }:
mkDerivation rec {
pname = "openrgb";
@ -12,7 +12,7 @@ mkDerivation rec {
};
nativeBuildInputs = [ qmake pkg-config ];
buildInputs = [ libusb1 hidapi mbedtls ];
buildInputs = [ libusb1 hidapi mbedtls_2 ];
installPhase = ''
runHook preInstall

4
pkgs/applications/networking/browsers/dillo/default.nix
View File

@ -8,7 +8,7 @@
, libXinerama
, libjpeg
, libpng
, mbedtls
, mbedtls_2
, openssl
, perl
, pkg-config
@ -38,7 +38,7 @@ stdenv.mkDerivation {
libXinerama
libjpeg
libpng
mbedtls
mbedtls_2
openssl
perl
];

4
pkgs/applications/networking/browsers/dillong/default.nix
View File

@ -5,7 +5,7 @@
, pkg-config
, which
, fltk
, mbedtls
, mbedtls_2
}:
stdenv.mkDerivation {
@ -27,7 +27,7 @@ stdenv.mkDerivation {
buildInputs = [
fltk
mbedtls
mbedtls_2
];
# The start_page and home settings refer to /usr.

4
pkgs/development/compilers/haxe/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls, Security }:
{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls_2, Security }:
let
ocamlDependencies = version:
@ -42,7 +42,7 @@ let
inherit version;
buildInputs = [ zlib pcre neko ]
++ lib.optional (lib.versionAtLeast version "4.1") mbedtls
++ lib.optional (lib.versionAtLeast version "4.1") mbedtls_2
++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.isDarwin) Security
++ ocamlDependencies version;

4
pkgs/development/compilers/julia/1.8.nix
View File

@ -15,7 +15,7 @@
, libgit2
, curl
, nghttp2
, mbedtls
, mbedtls_2
, libssh2
, gmp
, mpfr
@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
libgit2
curl
nghttp2
mbedtls
mbedtls_2
libssh2
gmp
mpfr

4
pkgs/development/compilers/neko/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, boehmgc, zlib, sqlite, pcre, cmake, pkg-config
, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls_2, openssl, pkgs, gtk2, libpthreadstubs
}:
stdenv.mkDerivation rec {
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config git ];
buildInputs =
[ boehmgc zlib sqlite pcre apacheHttpd apr aprutil
libmysqlclient mbedtls openssl libpthreadstubs ]
libmysqlclient mbedtls_2 openssl libpthreadstubs ]
++ lib.optional stdenv.isLinux gtk2
++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security
pkgs.darwin.apple_sdk.frameworks.Carbon];

4
pkgs/development/interpreters/hashlink/default.nix
View File

@ -7,7 +7,7 @@
, libjpeg_turbo
, libuv
, libvorbis
, mbedtls
, mbedtls_2
, openal
, pcre
, SDL2
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
libpng
libuv
libvorbis
mbedtls
mbedtls_2
openal
pcre
SDL2

4
pkgs/development/libraries/bctoolbox/default.nix
View File

@ -2,7 +2,7 @@
, cmake
, bc-decaf
, fetchFromGitLab
, mbedtls
, mbedtls_2
, lib
, stdenv
}:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
# Vendored by BC
bc-decaf
mbedtls
mbedtls_2
];
src = fetchFromGitLab {

4
pkgs/development/libraries/belle-sip/default.nix
View File

@ -4,7 +4,7 @@
, fetchFromGitLab
, lib
, libantlr3c
, mbedtls
, mbedtls_2
, stdenv
, zlib
}:
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
"-Wno-error=stringop-overflow"
];
propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox belr ];
propagatedBuildInputs = [ libantlr3c mbedtls_2 bctoolbox belr ];
meta = with lib; {
homepage = "https://linphone.org/technical-corner/belle-sip";

6
pkgs/development/libraries/mbedtls/2.nix Normal file
View 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
View File

@ -0,0 +1,6 @@
{ callPackage }:
callPackage ./generic.nix {
version = "3.2.1";
hash = "sha256-+M36NvFe4gw2PRbld/2JV3yBGrqK6soWcmrSEkUNcrc=";
}

20
pkgs/development/libraries/mbedtls/default.nix → pkgs/development/libraries/mbedtls/generic.nix
View File

@ -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 ];
};
}

4
pkgs/development/libraries/yojimbo/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }:
{ lib, stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls_2 }:
stdenv.mkDerivation {
pname = "yojimbo";
@ -13,7 +13,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ premake5 doxygen ];
propagatedBuildInputs = [ libsodium mbedtls ];
propagatedBuildInputs = [ libsodium mbedtls_2 ];
postBuild = ''
premake5 docs

4
pkgs/servers/http/hiawatha/default.nix
View File

@ -3,7 +3,7 @@
, cmake
, ninja
, mbedtls
, mbedtls_2
, libxcrypt
, enableCache ? true # Internal cache support.
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ninja ];
buildInputs = [ mbedtls libxcrypt ] ++ lib.optionals enableXslt [ libxslt libxml2 ];
buildInputs = [ mbedtls_2 libxcrypt ] ++ lib.optionals enableXslt [ libxslt libxml2 ];
prePatch = ''
substituteInPlace CMakeLists.txt --replace SETUID ""

4
pkgs/tools/filesystems/dislocker/default.nix
View File

@ -3,7 +3,7 @@
, fetchpatch
, cmake
, pkg-config
, mbedtls
, mbedtls_2
, fuse
}:
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ fuse mbedtls ];
buildInputs = [ fuse mbedtls_2 ];
meta = with lib; {
description = "Read BitLocker encrypted partitions in Linux";

4
pkgs/tools/networking/shadowsocks-libev/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake
, libsodium, mbedtls, libev, c-ares, pcre
, libsodium, mbedtls_2, libev, c-ares, pcre
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
}:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
buildInputs = [ libsodium mbedtls libev c-ares pcre ];
buildInputs = [ libsodium mbedtls_2 libev c-ares pcre ];
nativeBuildInputs = [ cmake asciidoc xmlto docbook_xml_dtd_45
docbook_xsl libxslt ];

3
pkgs/top-level/all-packages.nix
View File

@ -21487,7 +21487,8 @@ with pkgs;
maxflow = callPackage ../development/libraries/maxflow { };
mbedtls = callPackage ../development/libraries/mbedtls { };
mbedtls_2 = callPackage ../development/libraries/mbedtls/2.nix { };
mbedtls = callPackage ../development/libraries/mbedtls/3.nix { };
mdctags = callPackage ../development/tools/misc/mdctags { };