diff --git a/pkgs/by-name/et/etherape/package.nix b/pkgs/by-name/et/etherape/package.nix index a2b044238daa..ee77b6f1e1fb 100644 --- a/pkgs/by-name/et/etherape/package.nix +++ b/pkgs/by-name/et/etherape/package.nix @@ -6,7 +6,6 @@ libtool, gtk3, libpcap, - goocanvas2, popt, itstool, libxml2, @@ -14,12 +13,14 @@ stdenv.mkDerivation rec { pname = "etherape"; - version = "0.9.20"; + version = "0.9.21"; src = fetchurl { url = "mirror://sourceforge/etherape/etherape-${version}.tar.gz"; - sha256 = "sha256-9UsQtWOXB1yYofGS4rMIF+ISWBsJKd0DBOFfqOr1n5Y="; + sha256 = "sha256-SckN87uIDTxg36xERMqPxdaLqPNrgg7V+Hc4HJoHF1w="; }; + strictDeps = true; + nativeBuildInputs = [ itstool pkg-config @@ -29,7 +30,6 @@ stdenv.mkDerivation rec { libtool gtk3 libpcap - goocanvas2 popt ]; diff --git a/pkgs/by-name/na/nats-server/package.nix b/pkgs/by-name/na/nats-server/package.nix index 7942ca0f184a..524c40644aa0 100644 --- a/pkgs/by-name/na/nats-server/package.nix +++ b/pkgs/by-name/na/nats-server/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.11.9"; + version = "2.12.0"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats-server"; rev = "v${version}"; - hash = "sha256-F35qklJRa9IUikVNhh8c34KF3l41yfPXl0aig1iQq1g="; + hash = "sha256-Ln4e58jIrZZRbgf1+b28sNT1hyNSZepH5oo71OWVFII="; }; - vendorHash = "sha256-ti2Y4ev8INMNudfwmPhmKGCManRj2cFTw6Fh7kkvDQc="; + vendorHash = "sha256-533w30v681ZYOEL+gCkF7XOXsUmW1DV2+Eukgd/OcxE="; doCheck = false; diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index 170949f1ee6c..903aeba2c55b 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -9,13 +9,13 @@ }: let pname = "open-webui"; - version = "0.6.28"; + version = "0.6.30"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-677M1IxWhdJ3AO8DPlW4eUYnOo/mCNu+11IPdaey9ks="; + hash = "sha256-0gQlzqHFVcayN1/Z5Ou1Gv1+VQMMwk7QrvVXV92EFp0="; }; frontend = buildNpmPackage rec { @@ -32,7 +32,7 @@ let url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2"; }; - npmDepsHash = "sha256-vsgdf7+h16VBF+bTxzdNeHNzsYV65KWNZ6Ga3N7fB5A="; + npmDepsHash = "sha256-AYChUMU8vLNaJPfIbX1SThx01uV3V6QpN6OjYrerg5U="; # See https://github.com/open-webui/open-webui/issues/15880 npmFlags = [ @@ -107,12 +107,10 @@ python3Packages.buildPythonApplication rec { black boto3 chromadb - colbert-ai cryptography ddgs docx2txt einops - elasticsearch extract-msg fake-useragent fastapi @@ -159,15 +157,12 @@ python3Packages.buildPythonApplication rec { peewee-migrate pgvector pillow - pinecone-client - playwright psutil pyarrow pycrdt pydub pyjwt pymdown-extensions - pymilvus pymysql pypandoc pypdf @@ -178,7 +173,6 @@ python3Packages.buildPythonApplication rec { python-socketio pytube pyxlsb - qdrant-client rank-bm25 rapidocr-onnxruntime redis @@ -206,9 +200,16 @@ python3Packages.buildPythonApplication rec { ]; all = [ + colbert-ai + elasticsearch moto gcp-storage-emulator + playwright + oracledb + pinecone-client + pymilvus pymongo + qdrant-client ] ++ moto.optional-dependencies.s3 ++ postgres; diff --git a/pkgs/by-name/op/opencloud/package.nix b/pkgs/by-name/op/opencloud/package.nix index 135cdb17a45b..95ed0bf4adb9 100644 --- a/pkgs/by-name/op/opencloud/package.nix +++ b/pkgs/by-name/op/opencloud/package.nix @@ -28,13 +28,13 @@ let in buildGoModule rec { pname = "opencloud"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "opencloud"; tag = "v${version}"; - hash = "sha256-uoGgsz0BUUVuSEZrTX8b294FbVqL2YPFg7JoyRpH8Do="; + hash = "sha256-NPBz9pevjDUqDrEg/S6Vtk+jAA9f2H95ehO8EgcB1eY="; }; postPatch = '' diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix index ab788789ac6a..dd47943591d9 100644 --- a/pkgs/by-name/op/opencloud/web.nix +++ b/pkgs/by-name/op/opencloud/web.nix @@ -9,19 +9,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencloud-web"; - version = "3.3.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "web"; tag = "v${finalAttrs.version}"; - hash = "sha256-QBIAy3S8pss6NhN7V+AovWMoYZmu0cHbi6E7lUugYzU="; + hash = "sha256-IMFbDPVn32offVIHHxQvHjauQLGYnFf/s1mAo6OF7Mk="; }; pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-KYSjgDrl/IC+xi/GN+DqB0H6q0HWT7sjzGk/YvfTmHA="; + hash = "sha256-CHImAISDPhjfhB+Qj3fuo6jaOyi+wBVwuLm8ODzRU4M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/we/websocketpp/package.nix b/pkgs/by-name/we/websocketpp/package.nix index 6b933480b0ba..aa3abf8d9388 100644 --- a/pkgs/by-name/we/websocketpp/package.nix +++ b/pkgs/by-name/we/websocketpp/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, }: @@ -16,6 +17,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-9fIwouthv2GcmBe/UPvV7Xn9P2o0Kmn2hCI4jCh0hPM="; }; + patches = [ + (fetchpatch { + url = "https://github.com/zaphoyd/websocketpp/commit/deb0a334471362608958ce59a6b0bcd3e5b73c24.patch?full_index=1"; + hash = "sha256-bFCHwtRuCFz9vr4trmmBLziPSlEx6SNjsTcBv9zV8go="; + }) + ]; + nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/pkgs/by-name/yd/ydotool/package.nix b/pkgs/by-name/yd/ydotool/package.nix index ee0ac25bdd1a..bcbe83b73bca 100644 --- a/pkgs/by-name/yd/ydotool/package.nix +++ b/pkgs/by-name/yd/ydotool/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, cmake, scdoc, util-linux, @@ -20,6 +21,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-MtanR+cxz6FsbNBngqLE+ITKPZFHmWGsD1mBDk0OVng="; }; + patches = [ + (fetchpatch2 { + url = "https://github.com/ReimuNotMoe/ydotool/commit/58fde33d9a8b393fd59348f71e80c56177b62706.patch?full_index=1"; + hash = "sha256-Ga9DPCzpJwtYVHWwKKl3kzn2BPEZBZ7uzbEY/eFXGs4="; + includes = [ "CMakeLists.txt" ]; + }) + ]; + postPatch = '' substituteInPlace Daemon/ydotoold.c \ --replace "/usr/bin/xinput" "${xorg.xinput}/bin/xinput" diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix index 73746749cfcb..4eb1555f61b2 100644 --- a/pkgs/development/python-modules/nats-py/default.nix +++ b/pkgs/development/python-modules/nats-py/default.nix @@ -56,6 +56,9 @@ buildPythonPackage rec { "test_subscribe_iterate_next_msg" "test_ordered_consumer_larger_streams" "test_object_file_basics" + # Should be safe to remove on next version upgrade (from 2.11.0) + # https://github.com/nats-io/nats.py/pull/728 + "test_object_list" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_subscribe_iterate_next_msg" diff --git a/pkgs/development/python-modules/tlsh/cmake-4-compat.patch b/pkgs/development/python-modules/tlsh/cmake-4-compat.patch new file mode 100644 index 000000000000..85aeac4ea6cb --- /dev/null +++ b/pkgs/development/python-modules/tlsh/cmake-4-compat.patch @@ -0,0 +1,22 @@ +From e08aafe1363fa9ed98ee16026ed2b81d2c2c1977 Mon Sep 17 00:00:00 2001 +From: Thomas Bracht Laumann Jespersen +Date: Tue, 24 Jun 2025 12:37:33 +0200 +Subject: [PATCH] Increase cmake_minimum_required version for CMake 4 compat + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d360291..e1cfa8c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,7 +51,7 @@ + # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + # OF THE POSSIBILITY OF SUCH DAMAGE. + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.10) + + project(TLSH) + diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index 92ba131d7a05..241669026257 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -18,6 +18,11 @@ buildPythonPackage rec { hash = "sha256-Ht4LkcNmxPEvzFHXeS/XhPt/xo+0sE4RBcLCn9N/zwE="; }; + patches = [ + # https://github.com/trendmicro/tlsh/pull/152 + ./cmake-4-compat.patch + ]; + nativeBuildInputs = [ cmake ]; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index 0813dcc24fe9..ceb3f269c904 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -20,15 +20,15 @@ }: let - nix = nixVersions.nix_2_28; + nixComponents = nixVersions.nixComponents_2_30; common = rec { - version = "2.6.4"; + version = "2.7.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixd"; tag = version; - hash = "sha256-K7S626SPzlNCmRhntSKhGP1iyHJXBZEeHliX4iEwbKk="; + hash = "sha256-VPUX/68ysFUr1S8JW9I1rU5UcRoyZiCjL+9u2owrs6w="; }; nativeBuildInputs = [ @@ -102,7 +102,10 @@ in ]; buildInputs = [ - nix + nixComponents.nix-main + nixComponents.nix-expr + nixComponents.nix-cmd + nixComponents.nix-flake gtest boost ]; @@ -126,7 +129,10 @@ in sourceRoot = "${common.src.name}/nixd"; buildInputs = [ - nix + nixComponents.nix-main + nixComponents.nix-expr + nixComponents.nix-cmd + nixComponents.nix-flake nixf nixt llvmPackages.llvm