From 96da21df3424171df23bb644cc7f65c150444562 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 2 Nov 2025 17:34:39 +0100 Subject: [PATCH 1/4] transmission_4: Unvendor fast-float --- pkgs/applications/networking/p2p/transmission/4.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 95650f52160f..acf9ef6ef7bd 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -17,6 +17,7 @@ libutp, libdeflate, utf8cpp, + fast-float, fmt, libpsl, miniupnpc, @@ -109,12 +110,13 @@ stdenv.mkDerivation (finalAttrs: { # Excluding gtest since it is hardcoded to vendored version. The rest of the listed libraries are not packaged. pushd third-party for f in *; do - if [[ ! $f =~ googletest|wildmat|fast_float|wide-integer|jsonsl ]]; then + if [[ ! $f =~ googletest|wildmat|wide-integer|jsonsl ]]; then rm -r "$f" fi done popd rm \ + cmake/FindFastFloat.cmake \ cmake/FindFmt.cmake \ cmake/FindUtfCpp.cmake # Upstream uses different config file name. @@ -137,6 +139,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl dht + fast-float fmt libb64 libdeflate From 540d7365649d7de2a14725a0c270ef7af931a55a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 2 Nov 2025 19:09:22 +0100 Subject: [PATCH 2/4] small: init at 0.2.2 --- pkgs/by-name/sm/small/package.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/sm/small/package.nix diff --git a/pkgs/by-name/sm/small/package.nix b/pkgs/by-name/sm/small/package.nix new file mode 100644 index 000000000000..99aa50cff700 --- /dev/null +++ b/pkgs/by-name/sm/small/package.nix @@ -0,0 +1,30 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "small"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "alandefreitas"; + repo = "small"; + tag = "v${finalAttrs.version}"; + hash = "sha256-+aPieFls2u2A57CKQz/q+ZqGjNyscDlWDryAp3VM1Lk="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + description = "C++ small containers"; + homepage = "https://github.com/alandefreitas/small"; + license = lib.licenses.boost; + maintainers = [ ]; + platforms = lib.platforms.all; + }; +}) From a9bd863a5690d99bd3a5665cf3ab49ddf8a27a3b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 2 Nov 2025 22:05:05 +0100 Subject: [PATCH 3/4] =?UTF-8?q?transmission=5F4:=204.0.6=20=E2=86=92=204.1?= =?UTF-8?q?.0-beta.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/transmission/transmission/releases/tag/4.1.0-beta.2 https://github.com/transmission/transmission/releases/tag/4.1.0-beta.1 --- .../networking/p2p/transmission/4.nix | 30 +++++++------------ 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index acf9ef6ef7bd..1650fc0cfaaa 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch2, cmake, pkg-config, python3, @@ -13,6 +12,8 @@ systemd, zlib, pcre, + rapidjson, + small, libb64, libutp, libdeflate, @@ -63,30 +64,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "transmission"; - version = "4.0.6"; + version = "4.1.0-beta.2"; src = fetchFromGitHub { owner = "transmission"; repo = "transmission"; rev = finalAttrs.version; - hash = "sha256-KBXvBFgrJ3njIoXrxHbHHLsiocwfd7Eba/GNI8uZA38="; + hash = "sha256-eGBlXgNQ/6Xt//9KPCNCKAL1jnk/2uRb4nM01Ha68dE="; fetchSubmodules = true; }; - patches = [ - (fetchpatch2 { - url = "https://github.com/transmission/transmission/commit/febfe49ca3ecab1a7142ecb34012c1f0b2bcdee8.patch?full_index=1"; - hash = "sha256-Ge0+AXf/ilfMieGBAdvvImY7JOb0gGIdeKprC37AROs="; - excludes = [ - # The submodule that we don't use (we use our miniupnp) - "third-party/miniupnp" - # Hunk fails for this one, but we don't care because we don't rely upon - # xcode definitions even for the Darwin build. - "Transmission.xcodeproj/project.pbxproj" - ]; - }) - ]; - outputs = [ "out" "apparmor" @@ -118,9 +105,12 @@ stdenv.mkDerivation (finalAttrs: { rm \ cmake/FindFastFloat.cmake \ cmake/FindFmt.cmake \ + cmake/FindRapidJSON.cmake \ + cmake/FindSmall.cmake \ cmake/FindUtfCpp.cmake # Upstream uses different config file name. - substituteInPlace CMakeLists.txt --replace 'find_package(UtfCpp)' 'find_package(utf8cpp)' + substituteInPlace CMakeLists.txt \ + --replace-fail 'find_package(UtfCpp)' 'find_package(utf8cpp)' # Use gettext even on Darwin substituteInPlace libtransmission/utils.h \ @@ -150,6 +140,8 @@ stdenv.mkDerivation (finalAttrs: { miniupnpc openssl pcre + rapidjson + small utf8cpp zlib ] @@ -196,7 +188,7 @@ stdenv.mkDerivation (finalAttrs: { include if exists } EOF - install -Dm0444 -t $out/share/icons ../qt/icons/transmission.svg + install -Dm0444 -t $out/share/icons ../icons/hicolor_apps_scalable_transmission.svg ''; passthru.tests = { From d3f0b664a1205089b8e97e2480e8a218a5e5cc8f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 27 Jan 2026 10:10:36 +0100 Subject: [PATCH 4/4] =?UTF-8?q?transmission=5F4:=204.1.0-beta.2=20?= =?UTF-8?q?=E2=86=92=204.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/transmission/transmission/releases/tag/4.1.0-beta.3 https://github.com/transmission/transmission/releases/tag/4.1.0-beta.4 https://github.com/transmission/transmission/releases/tag/4.1.0-beta.5 https://github.com/transmission/transmission/releases/tag/4.1.0 --- pkgs/applications/networking/p2p/transmission/4.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 1650fc0cfaaa..98594f6bc78a 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -22,6 +22,7 @@ fmt, libpsl, miniupnpc, + crc32c, dht, libnatpmp, libiconv, @@ -64,13 +65,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "transmission"; - version = "4.1.0-beta.2"; + version = "4.1.0"; src = fetchFromGitHub { owner = "transmission"; repo = "transmission"; - rev = finalAttrs.version; - hash = "sha256-eGBlXgNQ/6Xt//9KPCNCKAL1jnk/2uRb4nM01Ha68dE="; + tag = finalAttrs.version; + hash = "sha256-glmwa06+jCyL9G2Rc58Yrvzo+/6Qu3bqwqy02RWgG64="; fetchSubmodules = true; }; @@ -111,10 +112,6 @@ stdenv.mkDerivation (finalAttrs: { # Upstream uses different config file name. substituteInPlace CMakeLists.txt \ --replace-fail 'find_package(UtfCpp)' 'find_package(utf8cpp)' - - # Use gettext even on Darwin - substituteInPlace libtransmission/utils.h \ - --replace-fail '#if defined(HAVE_GETTEXT) && !defined(__APPLE__)' '#if defined(HAVE_GETTEXT)' ''; nativeBuildInputs = [ @@ -128,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl + crc32c dht fast-float fmt