pyrox.dev / nixpkgs
lol
fork atom

treewide: use mbedtls 3 where possible

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Raphael Robatsch 985c8dbe 100cad48

+35 -35
unified split
+2 -2
pkgs/applications/emulators/dolphin-emu/default.nix
··· 24 24 , wxGTK30 25 25 , soundtouch 26 26 , miniupnpc 27 - , mbedtls 27 + , mbedtls_2 28 28 , curl 29 29 , lzo 30 30 , sfml ··· 104 104 wxGTK30 105 105 soundtouch 106 106 miniupnpc 107 - mbedtls 107 + mbedtls_2 108 108 curl 109 109 lzo 110 110 sfml
+2 -2
pkgs/applications/emulators/dolphin-emu/master.nix
··· 20 20 , alsa-lib 21 21 , miniupnpc 22 22 , enet 23 - , mbedtls 23 + , mbedtls_2 24 24 , soundtouch 25 25 , sfml 26 26 , xz ··· 90 90 hidapi 91 91 miniupnpc 92 92 enet 93 - mbedtls 93 + mbedtls_2 94 94 soundtouch 95 95 sfml 96 96 xz
+2 -2
pkgs/applications/emulators/dolphin-emu/primehack.nix
··· 29 29 , alsa-lib 30 30 , miniupnpc 31 31 , enet 32 - , mbedtls 32 + , mbedtls_2 33 33 , soundtouch 34 34 , sfml 35 35 , fmt ··· 87 87 hidapi 88 88 miniupnpc 89 89 enet 90 - mbedtls 90 + mbedtls_2 91 91 soundtouch 92 92 sfml 93 93 fmt
+1 -1
pkgs/applications/misc/lutris/fhsenv.nix
··· 30 30 # DGen // TODO: libarchive is broken 31 31 32 32 # Dolphin 33 - bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm 33 + bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls_2 lzo sfml gsm 34 34 wavpack orc nettle gmp pcre vulkan-loader 35 35 36 36 # DOSBox
+2 -2
pkgs/applications/misc/openrgb/default.nix
··· 1 - { lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config, coreutils, mbedtls }: 1 + { lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config, coreutils, mbedtls_2 }: 2 2 3 3 mkDerivation rec { 4 4 pname = "openrgb"; ··· 12 12 }; 13 13 14 14 nativeBuildInputs = [ qmake pkg-config ]; 15 - buildInputs = [ libusb1 hidapi mbedtls ]; 15 + buildInputs = [ libusb1 hidapi mbedtls_2 ]; 16 16 17 17 installPhase = '' 18 18 runHook preInstall
+2 -2
pkgs/applications/networking/browsers/dillo/default.nix
··· 8 8 , libXinerama 9 9 , libjpeg 10 10 , libpng 11 - , mbedtls 11 + , mbedtls_2 12 12 , openssl 13 13 , perl 14 14 , pkg-config ··· 38 38 libXinerama 39 39 libjpeg 40 40 libpng 41 - mbedtls 41 + mbedtls_2 42 42 openssl 43 43 perl 44 44 ];
+2 -2
pkgs/applications/networking/browsers/dillong/default.nix
··· 5 5 , pkg-config 6 6 , which 7 7 , fltk 8 - , mbedtls 8 + , mbedtls_2 9 9 }: 10 10 11 11 stdenv.mkDerivation { ··· 27 27 28 28 buildInputs = [ 29 29 fltk 30 - mbedtls 30 + mbedtls_2 31 31 ]; 32 32 33 33 # The start_page and home settings refer to /usr.
+2 -2
pkgs/development/compilers/haxe/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls, Security }: 1 + { lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls_2, Security }: 2 2 3 3 let 4 4 ocamlDependencies = version: ··· 42 42 inherit version; 43 43 44 44 buildInputs = [ zlib pcre neko ] 45 - ++ lib.optional (lib.versionAtLeast version "4.1") mbedtls 45 + ++ lib.optional (lib.versionAtLeast version "4.1") mbedtls_2 46 46 ++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.isDarwin) Security 47 47 ++ ocamlDependencies version; 48 48
+2 -2
pkgs/development/compilers/julia/1.8.nix
··· 15 15 , libgit2 16 16 , curl 17 17 , nghttp2 18 - , mbedtls 18 + , mbedtls_2 19 19 , libssh2 20 20 , gmp 21 21 , mpfr ··· 80 80 libgit2 81 81 curl 82 82 nghttp2 83 - mbedtls 83 + mbedtls_2 84 84 libssh2 85 85 gmp 86 86 mpfr
+2 -2
pkgs/development/compilers/neko/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, fetchpatch, boehmgc, zlib, sqlite, pcre, cmake, pkg-config 2 - , git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs 2 + , git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls_2, openssl, pkgs, gtk2, libpthreadstubs 3 3 }: 4 4 5 5 stdenv.mkDerivation rec { ··· 24 24 nativeBuildInputs = [ cmake pkg-config git ]; 25 25 buildInputs = 26 26 [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil 27 - libmysqlclient mbedtls openssl libpthreadstubs ] 27 + libmysqlclient mbedtls_2 openssl libpthreadstubs ] 28 28 ++ lib.optional stdenv.isLinux gtk2 29 29 ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security 30 30 pkgs.darwin.apple_sdk.frameworks.Carbon];
+2 -2
pkgs/development/interpreters/hashlink/default.nix
··· 7 7 , libjpeg_turbo 8 8 , libuv 9 9 , libvorbis 10 - , mbedtls 10 + , mbedtls_2 11 11 , openal 12 12 , pcre 13 13 , SDL2 ··· 37 37 libpng 38 38 libuv 39 39 libvorbis 40 - mbedtls 40 + mbedtls_2 41 41 openal 42 42 pcre 43 43 SDL2
+2 -2
pkgs/development/libraries/bctoolbox/default.nix
··· 2 2 , cmake 3 3 , bc-decaf 4 4 , fetchFromGitLab 5 - , mbedtls 5 + , mbedtls_2 6 6 , lib 7 7 , stdenv 8 8 }: ··· 21 21 # Vendored by BC 22 22 bc-decaf 23 23 24 - mbedtls 24 + mbedtls_2 25 25 ]; 26 26 27 27 src = fetchFromGitLab {
+2 -2
pkgs/development/libraries/belle-sip/default.nix
··· 4 4 , fetchFromGitLab 5 5 , lib 6 6 , libantlr3c 7 - , mbedtls 7 + , mbedtls_2 8 8 , stdenv 9 9 , zlib 10 10 }: ··· 36 36 "-Wno-error=stringop-overflow" 37 37 ]; 38 38 39 - propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox belr ]; 39 + propagatedBuildInputs = [ libantlr3c mbedtls_2 bctoolbox belr ]; 40 40 41 41 meta = with lib; { 42 42 homepage = "https://linphone.org/technical-corner/belle-sip";
+2 -2
pkgs/development/libraries/yojimbo/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }: 1 + { lib, stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls_2 }: 2 2 3 3 stdenv.mkDerivation { 4 4 pname = "yojimbo"; ··· 13 13 }; 14 14 15 15 nativeBuildInputs = [ premake5 doxygen ]; 16 - propagatedBuildInputs = [ libsodium mbedtls ]; 16 + propagatedBuildInputs = [ libsodium mbedtls_2 ]; 17 17 18 18 postBuild = '' 19 19 premake5 docs
+2 -2
pkgs/servers/http/hiawatha/default.nix
··· 3 3 4 4 , cmake 5 5 , ninja 6 - , mbedtls 6 + , mbedtls_2 7 7 , libxcrypt 8 8 9 9 , enableCache ? true # Internal cache support. ··· 28 28 }; 29 29 30 30 nativeBuildInputs = [ cmake ninja ]; 31 - buildInputs = [ mbedtls libxcrypt ] ++ lib.optionals enableXslt [ libxslt libxml2 ]; 31 + buildInputs = [ mbedtls_2 libxcrypt ] ++ lib.optionals enableXslt [ libxslt libxml2 ]; 32 32 33 33 prePatch = '' 34 34 substituteInPlace CMakeLists.txt --replace SETUID ""
+2 -2
pkgs/tools/filesystems/dislocker/default.nix
··· 3 3 , fetchpatch 4 4 , cmake 5 5 , pkg-config 6 - , mbedtls 6 + , mbedtls_2 7 7 , fuse 8 8 }: 9 9 ··· 33 33 ]; 34 34 35 35 nativeBuildInputs = [ cmake pkg-config ]; 36 - buildInputs = [ fuse mbedtls ]; 36 + buildInputs = [ fuse mbedtls_2 ]; 37 37 38 38 meta = with lib; { 39 39 description = "Read BitLocker encrypted partitions in Linux";
+2 -2
pkgs/tools/networking/shadowsocks-libev/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, cmake 2 - , libsodium, mbedtls, libev, c-ares, pcre 2 + , libsodium, mbedtls_2, libev, c-ares, pcre 3 3 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt 4 4 }: 5 5 ··· 16 16 fetchSubmodules = true; 17 17 }; 18 18 19 - buildInputs = [ libsodium mbedtls libev c-ares pcre ]; 19 + buildInputs = [ libsodium mbedtls_2 libev c-ares pcre ]; 20 20 nativeBuildInputs = [ cmake asciidoc xmlto docbook_xml_dtd_45 21 21 docbook_xsl libxslt ]; 22 22
+2 -2
pkgs/top-level/all-packages.nix
··· 21486 21486 21487 21487 maxflow = callPackage ../development/libraries/maxflow { }; 21488 21488 21489 - mbedtls = callPackage ../development/libraries/mbedtls/2.nix { }; 21490 - mbedtls_3 = callPackage ../development/libraries/mbedtls/3.nix { }; 21489 + mbedtls_2 = callPackage ../development/libraries/mbedtls/2.nix { }; 21490 + mbedtls = callPackage ../development/libraries/mbedtls/3.nix { }; 21491 21491 21492 21492 mdctags = callPackage ../development/tools/misc/mdctags { }; 21493 21493