From 138c537d36054a53181230e76f50d2d583ff84d9 Mon Sep 17 00:00:00 2001 From: Alex James Date: Wed, 26 Nov 2025 14:20:47 -0600 Subject: [PATCH 1/2] shadowsocks-libev: misc cleanup - Replace rec with finalAttrs pattern - Switch to SRI hashes - Drop use of with lib; --- pkgs/by-name/sh/shadowsocks-libev/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/sh/shadowsocks-libev/package.nix b/pkgs/by-name/sh/shadowsocks-libev/package.nix index 2a4d822a6068..a5bea07b56f5 100644 --- a/pkgs/by-name/sh/shadowsocks-libev/package.nix +++ b/pkgs/by-name/sh/shadowsocks-libev/package.nix @@ -15,7 +15,7 @@ libxslt, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shadowsocks-libev"; version = "3.3.5"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "shadowsocks"; repo = "shadowsocks-libev"; - tag = "v${version}"; - sha256 = "1iqpmhxk354db1x08axg6wrdy9p9a4mz0h9351i3mf3pqd1v6fdw"; + tag = "v${finalAttrs.version}"; + hash = "sha256-vDmzQ8N3uDpiKCNB8CtR6SbfMjevKwR6WI2UMTusF8c="; fetchSubmodules = true; }; @@ -79,15 +79,15 @@ stdenv.mkDerivation rec { cp lib/* $out/lib ''; - meta = with lib; { + meta = { description = "Lightweight secured SOCKS5 proxy"; longDescription = '' Shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and low-end boxes. It is a port of Shadowsocks created by @clowwindy, which is maintained by @madeye and @linusyang. ''; homepage = "https://github.com/shadowsocks/shadowsocks-libev"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; -} +}) From e7fa45472907c9df79a0c74bfa92091455383a74 Mon Sep 17 00:00:00 2001 From: Alex James Date: Wed, 26 Nov 2025 14:28:53 -0600 Subject: [PATCH 2/2] shadowsocks-libev: fix compilation with mbedtls 3 mbedtls_2 is no longer maintained. Backport an upstream patch to fix compilation with mbedtls 3, and replace mbedtls_2 in buildInputs with mbedtls. --- pkgs/by-name/sh/shadowsocks-libev/package.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sh/shadowsocks-libev/package.nix b/pkgs/by-name/sh/shadowsocks-libev/package.nix index a5bea07b56f5..f324d0cda36c 100644 --- a/pkgs/by-name/sh/shadowsocks-libev/package.nix +++ b/pkgs/by-name/sh/shadowsocks-libev/package.nix @@ -2,9 +2,10 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, libsodium, - mbedtls_2, + mbedtls, libev, c-ares, pcre, @@ -28,9 +29,16 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + url = "https://github.com/shadowsocks/shadowsocks-libev/commit/9afa3cacf947f910be46b69fc5a7a1fdd02fd5e6.patch"; + hash = "sha256-rpWXe8f95UU1DjQpbKMVMwA6r5yGVaDHwH/iWxW7wcw="; + }) + ]; + buildInputs = [ libsodium - mbedtls_2 + mbedtls libev c-ares pcre