From 7dd4833b77b2c26a73e5bc26a0c4da9b497696bf Mon Sep 17 00:00:00 2001 From: wrvsrx Date: Wed, 8 Oct 2025 19:55:02 +0800 Subject: [PATCH 1/2] libutp: move to by-name --- .../p2p/libutp/default.nix => by-name/li/libutp/package.nix} | 0 .../p2p/libutp/3.4.nix => by-name/li/libutp_3_4/package.nix} | 0 pkgs/top-level/all-packages.nix | 3 --- 3 files changed, 3 deletions(-) rename pkgs/{applications/networking/p2p/libutp/default.nix => by-name/li/libutp/package.nix} (100%) rename pkgs/{applications/networking/p2p/libutp/3.4.nix => by-name/li/libutp_3_4/package.nix} (100%) diff --git a/pkgs/applications/networking/p2p/libutp/default.nix b/pkgs/by-name/li/libutp/package.nix similarity index 100% rename from pkgs/applications/networking/p2p/libutp/default.nix rename to pkgs/by-name/li/libutp/package.nix diff --git a/pkgs/applications/networking/p2p/libutp/3.4.nix b/pkgs/by-name/li/libutp_3_4/package.nix similarity index 100% rename from pkgs/applications/networking/p2p/libutp/3.4.nix rename to pkgs/by-name/li/libutp_3_4/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a1c7a5c4ce0..88dc04e3e8e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11795,9 +11795,6 @@ with pkgs; withFonts = true; }; - libutp = callPackage ../applications/networking/p2p/libutp { }; - libutp_3_4 = callPackage ../applications/networking/p2p/libutp/3.4.nix { }; - lmms = libsForQt5.callPackage ../applications/audio/lmms { lame = null; libsoundio = null; From 925f3bdf356e6a36955f8bc6610f45a308e4a6c7 Mon Sep 17 00:00:00 2001 From: wrvsrx Date: Wed, 8 Oct 2025 20:02:19 +0800 Subject: [PATCH 2/2] libutp: fix build with cmake 4 --- pkgs/by-name/li/libutp/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libutp/package.nix b/pkgs/by-name/li/libutp/package.nix index 21d49ed832c3..2673e223b2ed 100644 --- a/pkgs/by-name/li/libutp/package.nix +++ b/pkgs/by-name/li/libutp/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { pname = "libutp"; - version = "unstable-2017-01-02"; + version = "0-unstable-2017-01-02"; src = fetchFromGitHub { # Use transmission fork from post-3.3-transmission branch @@ -17,6 +17,15 @@ stdenv.mkDerivation { sha256 = "CvuZLOBksIl/lS6LaqOIuzNvX3ihlIPjI3Eqwo7YJH0="; }; + # Compatibility with CMake < 3.5 has been removed from CMake. + postPatch = '' + substituteInPlace \ + CMakeLists.txt \ + --replace-fail \ + "cmake_minimum_required(VERSION 2.8)" \ + "cmake_minimum_required(VERSION 3.5)" + ''; + nativeBuildInputs = [ cmake ]; meta = with lib; {