From 9879ca9598dadd9f8ce187381b3e07fd2d01448a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Oct 2025 15:09:00 +0000 Subject: [PATCH 01/10] motoc: 0.3.4 -> 0.3.5 --- pkgs/by-name/mo/motoc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/motoc/package.nix b/pkgs/by-name/mo/motoc/package.nix index ff1c38554986..19e7dfb6a7af 100644 --- a/pkgs/by-name/mo/motoc/package.nix +++ b/pkgs/by-name/mo/motoc/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "motoc"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "galister"; repo = "motoc"; tag = "v${version}"; - hash = "sha256-CAKgh9uddDhaFp2O62o1nNZ/ZWJbCR/7dMaI9V992Xk="; + hash = "sha256-ozC7Az7G7qGsGURJ6UaM6VZH4PEUTknYDPShtXEKmrA="; }; - cargoHash = "sha256-RDzPvHlXuNLv3GiaGSYCyvbhdmxQkjUtwPq/e5NloOg="; + cargoHash = "sha256-Owv0OTbBpsd6xvadVOu3F3JAmo6SPdwzT3MOAP54nPY="; buildInputs = [ openxr-loader From f87e573852eb1652f1f5fb4718d5bae0dbf49ffe Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 11 Oct 2025 22:57:01 +0200 Subject: [PATCH 02/10] python313Packages.hg-git: fix build --- pkgs/development/python-modules/hg-git/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix index 04e8fe1cc581..e714a9f5ee1b 100644 --- a/pkgs/development/python-modules/hg-git/default.nix +++ b/pkgs/development/python-modules/hg-git/default.nix @@ -32,6 +32,8 @@ buildPythonPackage rec { mercurial ]; + pythonRelaxDeps = [ "dulwich" ]; + pythonImportsCheck = [ "hggit" ]; meta = with lib; { From c61b92251504e99f519f74b78426727fefd7bd0f Mon Sep 17 00:00:00 2001 From: "[Assassin]" Date: Sun, 12 Oct 2025 02:51:34 +0200 Subject: [PATCH 03/10] vrcx: 2025.09.10 -> 2025.10.11 --- pkgs/by-name/vr/vrcx/package.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/vr/vrcx/package.nix b/pkgs/by-name/vr/vrcx/package.nix index 20cd2f40a8ff..db80c19e8455 100644 --- a/pkgs/by-name/vr/vrcx/package.nix +++ b/pkgs/by-name/vr/vrcx/package.nix @@ -11,35 +11,38 @@ stdenv, }: let - dotnet = dotnetCorePackages.dotnet_9; electron = electron_37; + dotnet = dotnetCorePackages.dotnet_9; in buildNpmPackage (finalAttrs: { pname = "vrcx"; - version = "2025.09.10"; + version = "2025.10.11"; src = fetchFromGitHub { - owner = "vrcx-team"; repo = "VRCX"; - rev = "b233bbc299fca9a956db387b83d90a4dbba61175"; - hash = "sha256-7axYnsImG+VllQE1rhr8NmuMCm5t3bgNYGIIn9j2wMk="; + owner = "vrcx-team"; + rev = "cb6bc979d9371b89b289b6cb0bb8b6f60b350bc7"; + hash = "sha256-0LnFXSLyby5b2gSIse7Qld4cQlwNAFHSuGGqk6B9TZY="; }; - npmDepsHash = "sha256-VFYWXPhZrg3q2PW4kWfVr5/DY8W6Uf1mvnwfB4mVBrs="; - npmFlags = [ "--ignore-scripts" ]; makeCacheWritable = true; + npmFlags = [ "--ignore-scripts" ]; + npmDepsHash = "sha256-giWeXrsiFaZOh5zs7L4L0w3wcnD/F3TyrMM/POfOTvE="; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; + preBuild = '' + # Build fails at executing dart from sass-embedded + rm -r node_modules/sass-embedded* + ''; + buildPhase = '' runHook preBuild - # need to run vue-demi postinstall for pinia - node ./node_modules/vue-demi/scripts/postinstall.js - env PLATFORM=linux npm exec webpack -- --config webpack.config.js --mode production + env PLATFORM=linux npm exec vite build src node ./src-electron/patch-package-version.js npm exec electron-builder -- --dir \ -c.electronDist=${electron.dist} \ @@ -64,7 +67,7 @@ buildNpmPackage (finalAttrs: { --set DOTNET_ROOT ${dotnet.runtime}/share/dotnet \ --prefix PATH : ${lib.makeBinPath [ dotnet.runtime ]} - install -Dm644 VRCX.png "$out/share/icons/hicolor/256x256/apps/vrcx.png" + install -Dm644 images/VRCX.png "$out/share/icons/hicolor/256x256/apps/vrcx.png" runHook postInstall ''; From fa99d2cdc0e44e9f8d08623a51c685176126caf0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 12 Oct 2025 10:51:50 +0800 Subject: [PATCH 04/10] =?UTF-8?q?webkitgtk=5F6=5F0:=202.50.0=20=E2=86=92?= =?UTF-8?q?=202.50.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://webkitgtk.org/2025/10/10/webkitgtk2.50.1-released.html https://github.com/WebKit/WebKit/compare/webkitgtk-2.50.0...webkitgtk-2.50.1 --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 484b42af0acd..241fb03eb9b1 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -81,7 +81,7 @@ # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. clangStdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.50.0"; + version = "2.50.1"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${ if lib.versionAtLeast gtk3.version "4.0" then "6.0" @@ -101,7 +101,7 @@ clangStdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-5WS4CZ+aOuMkCVObKQu9KtCE6ZttItSqxeUeRVTfi8I="; + hash = "sha256-M+kS7m4820uYA3FfUGhq+Fpgr0fxz3KmrMai2xuz2f4="; }; patches = lib.optionals clangStdenv.hostPlatform.isLinux [ From e4611f23ebab724216cf05a5b6f7f58458037017 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Oct 2025 07:14:13 +0000 Subject: [PATCH 05/10] brainflow: 5.18.1 -> 5.19.0 --- pkgs/by-name/br/brainflow/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/br/brainflow/package.nix b/pkgs/by-name/br/brainflow/package.nix index a431e26e0bf2..a0e3e018238e 100644 --- a/pkgs/by-name/br/brainflow/package.nix +++ b/pkgs/by-name/br/brainflow/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "brainflow"; - version = "5.18.1"; + version = "5.19.0"; src = fetchFromGitHub { owner = "brainflow-dev"; repo = "brainflow"; tag = finalAttrs.version; - hash = "sha256-VcWYH7DXpm0I8IgeDUTFs/13NfEIR5Q74iKFbFWReIA="; + hash = "sha256-XoTd7pEsY2RuMQFj5zo9NhlYgiG0J0aEMdKuxtDuaFg="; }; patches = [ ]; From 7d531bc8655aa1466f33f611022cd8de862a41f5 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 12 Oct 2025 12:35:04 +0200 Subject: [PATCH 06/10] nixos/ntpd: automagically use pool instead of server The same heuristic has been used for ntpd-rs --- nixos/modules/services/networking/ntp/ntpd.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix index 071512056bf6..71c98e4cecf9 100644 --- a/nixos/modules/services/networking/ntp/ntpd.nix +++ b/nixos/modules/services/networking/ntp/ntpd.nix @@ -23,7 +23,11 @@ let restrict 127.0.0.1 restrict -6 ::1 - ${toString (map (server: "server " + server + " iburst\n") cfg.servers)} + ${toString ( + map ( + server: "${if lib.strings.hasInfix "pool" server then "pool" else "server"} " + server + " iburst\n" + ) cfg.servers + )} ${cfg.extraConfig} ''; From b5d76676eb58544280c67210ca70ed75a09e4bfd Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Sun, 12 Oct 2025 09:27:57 -0500 Subject: [PATCH 07/10] worker-build: re-enable Rust checks --- pkgs/by-name/wo/worker-build/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/wo/worker-build/package.nix b/pkgs/by-name/wo/worker-build/package.nix index e4ddce998e36..34bcbff3076d 100644 --- a/pkgs/by-name/wo/worker-build/package.nix +++ b/pkgs/by-name/wo/worker-build/package.nix @@ -20,9 +20,6 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "worker-build"; - # missing some module upstream to run the tests - doCheck = false; - meta = { description = "Tool to be used as a custom build command for a Cloudflare Workers `workers-rs` project"; mainProgram = "worker-build"; From 299041e0f5ab6526fc7e9820a4331c11aaa597ae Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 11 Oct 2025 12:34:44 +0200 Subject: [PATCH 08/10] webkitgtk: Fix RiscV cross-compilation --- pkgs/development/libraries/webkitgtk/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 484b42af0acd..7e9717579080 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -76,6 +76,7 @@ withLibsecret ? true, systemdSupport ? lib.meta.availableOn clangStdenv.hostPlatform systemd, testers, + fetchpatch, }: # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. @@ -109,6 +110,15 @@ clangStdenv.mkDerivation (finalAttrs: { inherit (builtins) storeDir; inherit (addDriverRunpath) driverLink; }) + + # Workaround to fix cross-compilation for RiscV + # error: ‘toB3Type’ was not declared in this scope + # See: https://bugs.webkit.org/show_bug.cgi?id=271371 + (fetchpatch { + url = "https://salsa.debian.org/webkit-team/webkit/-/raw/debian/2.44.1-1/debian/patches/fix-ftbfs-riscv64.patch"; + hash = "sha256-MgaSpXq9l6KCLQdQyel6bQFHG53l3GY277WePpYXdjA="; + name = "fix_ftbfs_riscv64.patch"; + }) ]; nativeBuildInputs = [ From 0ce1bda5ae6f8ea5cbaaa7a1df43f8dca29ccb6a Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sun, 12 Oct 2025 17:47:05 +0000 Subject: [PATCH 09/10] python3Packages.cassandra-driver: enable parallel building --- pkgs/development/python-modules/cassandra-driver/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 4d325e8d2431..532b911045ac 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -62,6 +62,10 @@ buildPythonPackage rec { # This is used to determine the version of cython that can be used CASS_DRIVER_ALLOWED_CYTHON_VERSION = cython.version; + preBuild = '' + export CASS_DRIVER_BUILD_CONCURRENCY=$NIX_BUILD_CORES + ''; + # Make /etc/protocols accessible to allow socket.getprotobyname('tcp') in sandbox, # also /etc/resolv.conf is referenced by some tests preCheck = From 3dafbf5b08ec1c350bc09260b73432cf892a1ae4 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sun, 12 Oct 2025 20:37:56 +0000 Subject: [PATCH 10/10] python3Packages.cassandra-driver: unbreak for Python >= 3.13 Co-authored-by: Robert Scott --- .../python-modules/cassandra-driver/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 532b911045ac..7aefe2844a36 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -6,6 +6,7 @@ cython, eventlet, fetchFromGitHub, + fetchpatch, geomet, gevent, gremlinpython, @@ -21,7 +22,6 @@ twisted, setuptools, distutils, - pythonAtLeast, }: buildPythonPackage rec { @@ -36,6 +36,15 @@ buildPythonPackage rec { hash = "sha256-RX9GLk2admzRasmP7LCwIfsJIt8TC/9rWhIcoTqS0qc="; }; + patches = [ + # https://github.com/datastax/python-driver/pull/1242 + (fetchpatch { + name = "Maintain-compatibility-with-CPython-3.13.patch"; + url = "https://github.com/datastax/python-driver/commit/b144a84a1f97002c4545b335efaac719519cd9fa.patch"; + hash = "sha256-60ki6i1SiGxK+J4x/8voS7Hh2x249ykpjU9EMYKD8kc="; + }) + ]; + pythonRelaxDeps = [ "geomet" ]; build-system = [ @@ -120,8 +129,6 @@ buildPythonPackage rec { }; meta = { - # cassandra/io/libevwrapper.c:668:10: error: implicit declaration of function ‘PyEval_ThreadsInitialized’ [] - broken = pythonAtLeast "3.13"; description = "Python client driver for Apache Cassandra"; homepage = "http://datastax.github.io/python-driver"; changelog = "https://github.com/datastax/python-driver/blob/${version}/CHANGELOG.rst";