gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: use mbedtls 3 where possible

Browse Source 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Raphael Robatsch
2022-12-07 19:58:55 +00:00
co-authored by Sandro
parent 100cad4858
commit 985c8dbe14
18 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/emulators/dolphin-emu/default.nix
+2 -2
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
pkgs/applications/emulators/dolphin-emu/master.nix
+2 -2
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
pkgs/applications/emulators/dolphin-emu/primehack.nix
+2 -2
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
pkgs/applications/misc/lutris/fhsenv.nix
+1 -1
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
pkgs/applications/misc/openrgb/default.nix
+2 -2
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
pkgs/applications/networking/browsers/dillo/default.nix
+2 -2
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
];
pkgs/applications/networking/browsers/dillong/default.nix
+2 -2
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.
pkgs/development/compilers/haxe/default.nix
+2 -2
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;
pkgs/development/compilers/julia/1.8.nix
+2 -2
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
pkgs/development/compilers/neko/default.nix
+2 -2
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];
pkgs/development/interpreters/hashlink/default.nix
+2 -2
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
pkgs/development/libraries/bctoolbox/default.nix
+2 -2
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 {
pkgs/development/libraries/belle-sip/default.nix
+2 -2
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";
pkgs/development/libraries/yojimbo/default.nix
+2 -2
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
pkgs/servers/http/hiawatha/default.nix
+2 -2
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 ""
pkgs/tools/filesystems/dislocker/default.nix
+2 -2
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";
pkgs/tools/networking/shadowsocks-libev/default.nix
+2 -2
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 ];
pkgs/top-level/all-packages.nix
+2 -2
View File
@@ -21486,8 +21486,8 @@ with pkgs;
maxflow = callPackage ../development/libraries/maxflow { };
mbedtls = callPackage ../development/libraries/mbedtls/2.nix { };
mbedtls_3 = callPackage ../development/libraries/mbedtls/3.nix { };
mbedtls_2 = callPackage ../development/libraries/mbedtls/2.nix { };
mbedtls = callPackage ../development/libraries/mbedtls/3.nix { };
mdctags = callPackage ../development/tools/misc/mdctags { };