mbedtls_2: drop (#517426)

This commit is contained in:
Marcin Serwin
2026-05-08 15:32:06 +00:00
committed by GitHub
10 changed files with 19 additions and 207 deletions
-66
View File
@@ -1,66 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
premake5,
doxygen,
libsodium,
mbedtls_2,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "yojimbo";
version = "1.2.3";
src = fetchFromGitHub {
owner = "mas-bandwidth";
repo = "yojimbo";
tag = "v${finalAttrs.version}";
sha256 = "sha256-GMYkWQTwHm7fGRSTIt2phv01CjEcw0l4iPQD4uTQ5yM=";
};
nativeBuildInputs = [
premake5
doxygen
];
propagatedBuildInputs = [
libsodium
mbedtls_2
];
patches = [
# https://github.com/mas-bandwidth/serialize/pull/6
./silence-uninitialized-warning.patch
];
postBuild = ''
doxygen doxygen.config
'';
installPhase = ''
install -Dm755 -t $out/lib bin/libyojimbo.a
cp -r -t $out include
mkdir -p $out/share/doc/yojimbo
cp -r docs/html $out/share/doc/yojimbo
'';
doCheck = true;
enableParallelBuilding = true;
passthru.updateScript = nix-update-script { };
meta = {
description = "Network library for client/server games with dedicated servers";
longDescription = ''
yojimbo is a network library for client/server games with dedicated servers.
It's designed around the networking requirements of competitive multiplayer games like first person shooters.
As such it provides a time critical networking layer on top of UDP, with a client/server architecture supporting up to 64 players per-dedicated server instance.
'';
homepage = "https://github.com/mas-bandwidth/yojimbo";
license = lib.licenses.bsd3;
platforms = lib.platforms.x86_64;
maintainers = [ ];
};
})
@@ -1,13 +0,0 @@
diff --git a/serialize.h b/serialize.h
index 6e977ac..4d7413d 100644
--- a/serialize/serialize.h
+++ b/serialize/serialize.h
@@ -1400,7 +1400,7 @@ namespace serialize
template <typename Stream> bool serialize_float_internal( Stream & stream, float & value )
{
- uint32_t int_value;
+ uint32_t int_value = 0;
if ( Stream::IsWriting )
{
memcpy( (char*) &int_value, &value, 4 );
+13 -41
View File
@@ -6,41 +6,23 @@
ocaml-ng,
dune,
zlib,
pcre,
pcre2,
neko,
mbedtls_2,
mbedtls,
}:
let
ocamlDependencies =
version:
if lib.versionAtLeast version "4.3" then
with ocaml-ng.ocamlPackages;
[
ocaml
findlib
sedlex
xml-light
ptmap
camlp5
sha
luv
extlib
]
else
with ocaml-ng.ocamlPackages_4_10;
[
ocaml
findlib
sedlex
xml-light
ptmap
camlp5
sha
luv-0-5-12
extlib-1-7-7
];
version: with ocaml-ng.ocamlPackages; [
ocaml
findlib
sedlex
xml-light
ptmap
camlp5
sha
luv
extlib
];
generic =
{
@@ -55,11 +37,9 @@ let
zlib
neko
dune
pcre2
mbedtls
]
++ (if lib.versionAtLeast version "4.3" then [ pcre2 ] else [ pcre ])
++ lib.optional (lib.versionAtLeast version "4.1") (
if lib.versionAtLeast version "4.3" then mbedtls else mbedtls_2
)
++ ocamlDependencies version;
src = fetchFromGitHub {
@@ -150,14 +130,6 @@ let
};
in
{
haxe_4_0 = generic {
version = "4.0.5";
hash = "sha256-Ck/py+tZS7dBu/uikhSLKBRNljpg2h5PARX0Btklozg=";
};
haxe_4_1 = generic {
version = "4.1.5";
hash = "sha256-QP5/jwexQXai1A5Iiwiyrm+/vkdAc+9NVGt+jEQz2mY=";
};
haxe_4_3 = generic {
version = "4.3.7";
hash = "sha256-sQb7MCoH2dZOvNmDQ9P0yFYrSXYOMn4FS/jlyjth39Y=";
-29
View File
@@ -1,29 +0,0 @@
{ callPackage, fetchpatch }:
callPackage ./generic.nix {
version = "2.28.10";
hash = "sha256-09XWds45TFH7GORrju8pVQQQQomU8MlFAq1jJXrLW0s=";
patches = [
# cmake 4 compatibility
(fetchpatch {
url = "https://github.com/Mbed-TLS/mbedtls/commit/be4af04fcffcfebe44fa12d39388817d9949a9f3.patch";
hash = "sha256-CbDm6CchzoTia7Wbpbe3bo9CmHPOsxY2d055AfbCS0g=";
})
# fix build against Clang >= 20 (https://github.com/Mbed-TLS/mbedtls-framework/pull/173)
(fetchpatch {
name = "Add-__attribute__-nonstring-to-remove-unterminated-s.patch";
url = "https://github.com/Mbed-TLS/mbedtls-framework/commit/e811994babf84e29e56ebf97265f5fefdf18050f.patch";
hash = "sha256-PGXh7tMnl7VqBOWVZP3UqT5pEd0yh4oszEJNMiVOcGo=";
})
# fix build against Clang >= 20 (https://github.com/Mbed-TLS/mbedtls/pull/10215)
(fetchpatch {
name = "Add-__attribute__-nonstring-to-remove-unterminated-s.patch";
url = "https://github.com/Mbed-TLS/mbedtls/commit/2e1399f1e1ed6fa1072cf9584f5771322b0d001b.patch";
includes = [ "tests/*" ];
# drop some context in order to apply the backported patch cleanly
decode = "interdiff -U1 /dev/null -";
hash = "sha256-OTRnYw7Og6eAsB9pue1jkxO1xnkR48efz5QKjN9H0I8=";
})
];
}
@@ -103,8 +103,5 @@ stdenv.mkDerivation rec {
];
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ raphaelr ];
knownVulnerabilities = lib.optionals (lib.versionOlder version "3.0") [
"Mbed TLS 2 is not maintained anymore. Please migrate to newer versions"
];
};
}
@@ -1,49 +0,0 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
certifi,
cython,
mbedtls_2,
pytestCheckHook,
setuptools,
typing-extensions,
}:
buildPythonPackage rec {
pname = "python-mbedtls";
version = "2.10.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Synss";
repo = "python-mbedtls";
rev = version;
hash = "sha256-eKKb12G/0QAcwtv5Yk/92QXhMipeKOfKR1JEaNHDIlg=";
};
build-system = [
cython
setuptools
];
buildInputs = [ mbedtls_2 ];
dependencies = [
certifi
typing-extensions
];
__darwinAllowLocalNetworking = true;
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "mbedtls" ];
meta = {
description = "Cryptographic library with an mbed TLS back end";
homepage = "https://github.com/Synss/python-mbedtls";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ SuperSandro2000 ];
};
}
+4
View File
@@ -926,6 +926,8 @@ mapAliases {
gxneur = throw "'gxneur' has been removed due to lack of maintenance and reliance on gnome2 and 2to3."; # Added 2025-08-17
hacpack = throw "hacpack has been removed from nixpkgs, as it has been taken down upstream"; # Added 2025-09-26
harmony-music = throw "harmony-music is unmaintained and has been removed"; # Added 2025-08-26
haxe_4_0 = throw "'haxe_4_0' has been removed as it reached its end of life. Migrate to 'haxe_4_3'.";
haxe_4_1 = throw "'haxe_4_1' has been removed as it reached its end of life. Migrate to 'haxe_4_3'.";
helix-gpt = throw "helix-gpt was deprecated in January 2026 and has been since removed"; # Added 2026-02-05
helvum = throw "'helvum' has been removed as it was unmaintained upstream and relied on a vulnerable dependency. Consider using 'crosspipe' instead."; # Added 2026-03-04
HentaiAtHome = throw "'HentaiAtHome' has been renamed to/replaced by 'hentai-at-home'"; # Converted to throw 2025-10-27
@@ -1375,6 +1377,7 @@ mapAliases {
matrix-appservice-slack = throw "'matrix-appservice-slack' has been removed, as it relies on Classic Slack Apps, which no longer exist, and is abandoned upstream"; # Added 2025-11-11
matrix-synapse-tools.rust-synapse-compress-state = throw "'matrix-synapse-tools.rust-synapse-compress-state' has been renamed to/replaced by 'rust-synapse-compress-state'"; # Converted to throw 2025-10-27
matrix-synapse-tools.synadm = throw "'matrix-synapse-tools.synadm' has been renamed to/replaced by 'synadm'"; # Converted to throw 2025-10-27
mbedtls_2 = throw "'mbedtls_2' has been removed as it reached its end of life. Migrate to 'mbedtls'.";
mcomix3 = throw "'mcomix3' has been renamed to/replaced by 'mcomix'"; # Converted to throw 2025-10-27
mdbook-alerts = throw "'mdbook-alerts' has been removed because it is deprecated and natively supported by mdbook since version 0.5.0"; # Added 2026-01-07
mdbook-linkcheck = throw "'mdbook-linkcheck' has been removed and replaced by 'mdbook-linkcheck2' due to incompatibility with mdbook version 0.5.0+"; # Added 2026-03-03
@@ -2573,6 +2576,7 @@ mapAliases {
yarn2nix = throw "'yarn2nix' and its tooling has been removed as it was unusable within nodePackages. Use the standard yarn v1 hooks available in nixpkgs instead."; # Added 2026-04-25
yarn2nix-moretea = throw "'yarn2nix' and its tooling has been removed as it was unusable within nodePackages. Use the standard yarn v1 hooks available in nixpkgs instead."; # Added 2026-04-25
yeahwm = throw "'yeahwm' has been removed, as it was broken and unmaintained upstream."; # Added 2025-06-12
yojimbo = throw "'yojimbo' has been removed as it used an EOL TLS library and was broken."; # Added 2026-05-06
yosys-synlig = throw "yosys-synlig has been removed because it is unmaintained upstream and incompatible with current Yosys versions."; # Added 2026-01-06
youtube-music = lib.warnOnInstantiate "'youtube-music' has been renamed to 'pear-desktop'" pear-desktop; # Added 2025-12-23
yubikey-manager-qt = throw "'yubikey-manager-qt' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07
+1 -4
View File
@@ -4151,8 +4151,6 @@ with pkgs;
(callPackage ../development/compilers/haxe {
})
haxe_4_3
haxe_4_1
haxe_4_0
;
haxe = haxe_4_3;
@@ -6068,7 +6066,7 @@ with pkgs;
ustream-ssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = openssl; };
ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl {
ssl_implementation = mbedtls_2;
ssl_implementation = mbedtls;
};
# Make bdb5 the default as it is the last release under the custom
@@ -6792,7 +6790,6 @@ with pkgs;
)
haskellPackages.matterhorn;
mbedtls_2 = callPackage ../development/libraries/mbedtls/2.nix { };
mbedtls = callPackage ../development/libraries/mbedtls/3.nix { };
mbedtls_4 = callPackage ../development/libraries/mbedtls/4.nix { };
+1
View File
@@ -478,6 +478,7 @@ mapAliases {
python-jsonrpc-server = throw "python-jsonrpc-server has been removed because it was no longer used by anything"; # added 2025-11-11
python-Levenshtein = throw "'python-Levenshtein' has been renamed to/replaced by 'levenshtein'"; # Converted to throw 2025-10-29
python-lz4 = throw "'python-lz4' has been renamed to/replaced by 'lz4'"; # Converted to throw 2025-10-29
python-mbedtls = throw "'python-mbedtls' has been removed as it is unmaintained";
python-qt = throw "python-qt has been removed, because hard to maintain and not required by anything"; # Added 2025-01-14
python-simple-hipchat = throw "'python-simple-hipchat' has been removed because it was broken and unmaintained"; # added 2025-08-26
python-subunit = throw "'python-subunit' has been renamed to/replaced by 'subunit'"; # Converted to throw 2025-10-29
-2
View File
@@ -15891,8 +15891,6 @@ self: super: with self; {
python-matter-server = callPackage ../development/python-modules/python-matter-server { };
python-mbedtls = callPackage ../development/python-modules/python-mbedtls { };
python-melcloud = callPackage ../development/python-modules/python-melcloud { };
python-memcached = callPackage ../development/python-modules/python-memcached {