Merge pull request #204658 from raphaelr/mbedtls-3

Sandro 4cc7973a 299a800c

Changed files
+57 -44
pkgs
applications
emulators
misc
lutris
openrgb
networking
browsers
dillo
dillong
development
compilers
haxe
julia
neko
interpreters
hashlink
libraries
bctoolbox
belle-sip
mbedtls
yojimbo
servers
http
hiawatha
tools
filesystems
dislocker
networking
shadowsocks-libev
top-level
+2 -2
pkgs/applications/emulators/dolphin-emu/default.nix
···
, wxGTK30
, soundtouch
, miniupnpc
-
, mbedtls
, curl
, lzo
, sfml
···
wxGTK30
soundtouch
miniupnpc
-
mbedtls
curl
lzo
sfml
···
, wxGTK30
, soundtouch
, miniupnpc
+
, mbedtls_2
, curl
, lzo
, sfml
···
wxGTK30
soundtouch
miniupnpc
+
mbedtls_2
curl
lzo
sfml
+2 -2
pkgs/applications/emulators/dolphin-emu/master.nix
···
, alsa-lib
, miniupnpc
, enet
-
, mbedtls
, soundtouch
, sfml
, xz
···
hidapi
miniupnpc
enet
-
mbedtls
soundtouch
sfml
xz
···
, alsa-lib
, miniupnpc
, enet
+
, mbedtls_2
, soundtouch
, sfml
, xz
···
hidapi
miniupnpc
enet
+
mbedtls_2
soundtouch
sfml
xz
+2 -2
pkgs/applications/emulators/dolphin-emu/primehack.nix
···
, alsa-lib
, miniupnpc
, enet
-
, mbedtls
, soundtouch
, sfml
, fmt
···
hidapi
miniupnpc
enet
-
mbedtls
soundtouch
sfml
fmt
···
, alsa-lib
, miniupnpc
, enet
+
, mbedtls_2
, soundtouch
, sfml
, fmt
···
hidapi
miniupnpc
enet
+
mbedtls_2
soundtouch
sfml
fmt
+1 -1
pkgs/applications/misc/lutris/fhsenv.nix
···
# DGen // TODO: libarchive is broken
# Dolphin
-
bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm
wavpack orc nettle gmp pcre vulkan-loader
# DOSBox
···
# DGen // TODO: libarchive is broken
# Dolphin
+
bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls_2 lzo sfml gsm
wavpack orc nettle gmp pcre vulkan-loader
# DOSBox
+2 -2
pkgs/applications/misc/openrgb/default.nix
···
-
{ lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config, coreutils, mbedtls }:
mkDerivation rec {
pname = "openrgb";
···
};
nativeBuildInputs = [ qmake pkg-config ];
-
buildInputs = [ libusb1 hidapi mbedtls ];
installPhase = ''
runHook preInstall
···
+
{ lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config, coreutils, mbedtls_2 }:
mkDerivation rec {
pname = "openrgb";
···
};
nativeBuildInputs = [ qmake pkg-config ];
+
buildInputs = [ libusb1 hidapi mbedtls_2 ];
installPhase = ''
runHook preInstall
+2 -2
pkgs/applications/networking/browsers/dillo/default.nix
···
, libXinerama
, libjpeg
, libpng
-
, mbedtls
, openssl
, perl
, pkg-config
···
libXinerama
libjpeg
libpng
-
mbedtls
openssl
perl
];
···
, libXinerama
, libjpeg
, libpng
+
, mbedtls_2
, openssl
, perl
, pkg-config
···
libXinerama
libjpeg
libpng
+
mbedtls_2
openssl
perl
];
+2 -2
pkgs/applications/networking/browsers/dillong/default.nix
···
, pkg-config
, which
, fltk
-
, mbedtls
}:
stdenv.mkDerivation {
···
buildInputs = [
fltk
-
mbedtls
];
# The start_page and home settings refer to /usr.
···
, pkg-config
, which
, fltk
+
, mbedtls_2
}:
stdenv.mkDerivation {
···
buildInputs = [
fltk
+
mbedtls_2
];
# The start_page and home settings refer to /usr.
+2 -2
pkgs/development/compilers/haxe/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls, Security }:
let
ocamlDependencies = version:
···
inherit version;
buildInputs = [ zlib pcre neko ]
-
++ lib.optional (lib.versionAtLeast version "4.1") mbedtls
++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.isDarwin) Security
++ ocamlDependencies version;
···
+
{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls_2, Security }:
let
ocamlDependencies = version:
···
inherit version;
buildInputs = [ zlib pcre neko ]
+
++ lib.optional (lib.versionAtLeast version "4.1") mbedtls_2
++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.isDarwin) Security
++ ocamlDependencies version;
+2 -2
pkgs/development/compilers/julia/1.8.nix
···
, libgit2
, curl
, nghttp2
-
, mbedtls
, libssh2
, gmp
, mpfr
···
libgit2
curl
nghttp2
-
mbedtls
libssh2
gmp
mpfr
···
, libgit2
, curl
, nghttp2
+
, mbedtls_2
, libssh2
, gmp
, mpfr
···
libgit2
curl
nghttp2
+
mbedtls_2
libssh2
gmp
mpfr
+2 -2
pkgs/development/compilers/neko/default.nix
···
{ lib, stdenv, fetchFromGitHub, fetchpatch, boehmgc, zlib, sqlite, pcre, cmake, pkg-config
-
, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
}:
stdenv.mkDerivation rec {
···
nativeBuildInputs = [ cmake pkg-config git ];
buildInputs =
[ boehmgc zlib sqlite pcre apacheHttpd apr aprutil
-
libmysqlclient mbedtls openssl libpthreadstubs ]
++ lib.optional stdenv.isLinux gtk2
++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security
pkgs.darwin.apple_sdk.frameworks.Carbon];
···
{ lib, stdenv, fetchFromGitHub, fetchpatch, boehmgc, zlib, sqlite, pcre, cmake, pkg-config
+
, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls_2, openssl, pkgs, gtk2, libpthreadstubs
}:
stdenv.mkDerivation rec {
···
nativeBuildInputs = [ cmake pkg-config git ];
buildInputs =
[ boehmgc zlib sqlite pcre apacheHttpd apr aprutil
+
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];
+2 -2
pkgs/development/interpreters/hashlink/default.nix
···
, libjpeg_turbo
, libuv
, libvorbis
-
, mbedtls
, openal
, pcre
, SDL2
···
libpng
libuv
libvorbis
-
mbedtls
openal
pcre
SDL2
···
, libjpeg_turbo
, libuv
, libvorbis
+
, mbedtls_2
, openal
, pcre
, SDL2
···
libpng
libuv
libvorbis
+
mbedtls_2
openal
pcre
SDL2
+2 -2
pkgs/development/libraries/bctoolbox/default.nix
···
, cmake
, bc-decaf
, fetchFromGitLab
-
, mbedtls
, lib
, stdenv
}:
···
# Vendored by BC
bc-decaf
-
mbedtls
];
src = fetchFromGitLab {
···
, cmake
, bc-decaf
, fetchFromGitLab
+
, mbedtls_2
, lib
, stdenv
}:
···
# Vendored by BC
bc-decaf
+
mbedtls_2
];
src = fetchFromGitLab {
+2 -2
pkgs/development/libraries/belle-sip/default.nix
···
, fetchFromGitLab
, lib
, libantlr3c
-
, mbedtls
, stdenv
, zlib
}:
···
"-Wno-error=stringop-overflow"
];
-
propagatedBuildInputs = [ libantlr3c mbedtls bctoolbox belr ];
meta = with lib; {
homepage = "https://linphone.org/technical-corner/belle-sip";
···
, fetchFromGitLab
, lib
, libantlr3c
+
, mbedtls_2
, stdenv
, zlib
}:
···
"-Wno-error=stringop-overflow"
];
+
propagatedBuildInputs = [ libantlr3c mbedtls_2 bctoolbox belr ];
meta = with lib; {
homepage = "https://linphone.org/technical-corner/belle-sip";
+6
pkgs/development/libraries/mbedtls/2.nix
···
···
+
{ callPackage }:
+
+
callPackage ./generic.nix {
+
version = "2.28.1";
+
hash = "sha256-brbZB3fINDeVWXf50ct4bxYkoBVyD6bBBijZyFQSnyw=";
+
}
+6
pkgs/development/libraries/mbedtls/3.nix
···
···
+
{ callPackage }:
+
+
callPackage ./generic.nix {
+
version = "3.2.1";
+
hash = "sha256-+M36NvFe4gw2PRbld/2JV3yBGrqK6soWcmrSEkUNcrc=";
+
}
+10 -10
pkgs/development/libraries/mbedtls/default.nix pkgs/development/libraries/mbedtls/generic.nix
···
-
{ lib, stdenv
, fetchFromGitHub
, cmake
···
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
src = fetchFromGitHub {
-
owner = "ARMmbed";
repo = "mbedtls";
rev = "${pname}-${version}";
-
sha256 = "sha256-brbZB3fINDeVWXf50ct4bxYkoBVyD6bBBijZyFQSnyw=";
};
nativeBuildInputs = [ cmake ninja perl python3 ];
···
];
meta = with lib; {
-
homepage = "https://tls.mbed.org/";
description = "Portable cryptographic and TLS library, formerly known as PolarSSL";
license = licenses.asl20;
platforms = platforms.all;
-
maintainers = with maintainers; [ ];
};
}
···
+
{ lib
+
, stdenv
+
, version
+
, hash
, fetchFromGitHub
, cmake
···
stdenv.mkDerivation rec {
pname = "mbedtls";
+
inherit version;
src = fetchFromGitHub {
+
owner = "Mbed-TLS";
repo = "mbedtls";
rev = "${pname}-${version}";
+
inherit hash;
};
nativeBuildInputs = [ cmake ninja perl python3 ];
···
];
meta = with lib; {
+
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; [ raphaelr ];
};
}
+2 -2
pkgs/development/libraries/yojimbo/default.nix
···
-
{ lib, stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }:
stdenv.mkDerivation {
pname = "yojimbo";
···
};
nativeBuildInputs = [ premake5 doxygen ];
-
propagatedBuildInputs = [ libsodium mbedtls ];
postBuild = ''
premake5 docs
···
+
{ lib, stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls_2 }:
stdenv.mkDerivation {
pname = "yojimbo";
···
};
nativeBuildInputs = [ premake5 doxygen ];
+
propagatedBuildInputs = [ libsodium mbedtls_2 ];
postBuild = ''
premake5 docs
+2 -2
pkgs/servers/http/hiawatha/default.nix
···
, cmake
, ninja
-
, mbedtls
, libxcrypt
, enableCache ? true # Internal cache support.
···
};
nativeBuildInputs = [ cmake ninja ];
-
buildInputs = [ mbedtls libxcrypt ] ++ lib.optionals enableXslt [ libxslt libxml2 ];
prePatch = ''
substituteInPlace CMakeLists.txt --replace SETUID ""
···
, cmake
, ninja
+
, mbedtls_2
, libxcrypt
, enableCache ? true # Internal cache support.
···
};
nativeBuildInputs = [ cmake ninja ];
+
buildInputs = [ mbedtls_2 libxcrypt ] ++ lib.optionals enableXslt [ libxslt libxml2 ];
prePatch = ''
substituteInPlace CMakeLists.txt --replace SETUID ""
+2 -2
pkgs/tools/filesystems/dislocker/default.nix
···
, fetchpatch
, cmake
, pkg-config
-
, mbedtls
, fuse
}:
···
];
nativeBuildInputs = [ cmake pkg-config ];
-
buildInputs = [ fuse mbedtls ];
meta = with lib; {
description = "Read BitLocker encrypted partitions in Linux";
···
, fetchpatch
, cmake
, pkg-config
+
, mbedtls_2
, fuse
}:
···
];
nativeBuildInputs = [ cmake pkg-config ];
+
buildInputs = [ fuse mbedtls_2 ];
meta = with lib; {
description = "Read BitLocker encrypted partitions in Linux";
+2 -2
pkgs/tools/networking/shadowsocks-libev/default.nix
···
{ lib, stdenv, fetchFromGitHub, cmake
-
, libsodium, mbedtls, libev, c-ares, pcre
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
}:
···
fetchSubmodules = true;
};
-
buildInputs = [ libsodium mbedtls libev c-ares pcre ];
nativeBuildInputs = [ cmake asciidoc xmlto docbook_xml_dtd_45
docbook_xsl libxslt ];
···
{ lib, stdenv, fetchFromGitHub, cmake
+
, libsodium, mbedtls_2, libev, c-ares, pcre
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
}:
···
fetchSubmodules = true;
};
+
buildInputs = [ libsodium mbedtls_2 libev c-ares pcre ];
nativeBuildInputs = [ cmake asciidoc xmlto docbook_xml_dtd_45
docbook_xsl libxslt ];
+2 -1
pkgs/top-level/all-packages.nix
···
maxflow = callPackage ../development/libraries/maxflow { };
-
mbedtls = callPackage ../development/libraries/mbedtls { };
mdctags = callPackage ../development/tools/misc/mdctags { };
···
maxflow = callPackage ../development/libraries/maxflow { };
+
mbedtls_2 = callPackage ../development/libraries/mbedtls/2.nix { };
+
mbedtls = callPackage ../development/libraries/mbedtls/3.nix { };
mdctags = callPackage ../development/tools/misc/mdctags { };