From 74e12b29abe19eb110d95fcef42f85ba72a6424c Mon Sep 17 00:00:00 2001 From: xbreak Date: Wed, 3 Sep 2025 20:39:26 +0200 Subject: [PATCH 01/77] fzf-git-sh: add support for fish Adds support for fish via `fzf-git.fish`. --- pkgs/by-name/fz/fzf-git-sh/package.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fz/fzf-git-sh/package.nix b/pkgs/by-name/fz/fzf-git-sh/package.nix index 7899c70f5a71..380441e36dc7 100644 --- a/pkgs/by-name/fz/fzf-git-sh/package.nix +++ b/pkgs/by-name/fz/fzf-git-sh/package.nix @@ -14,6 +14,7 @@ util-linux, xdg-utils, zsh, + fish, unstableGitUpdater, }: @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { }; dontBuild = true; + doInstallCheck = true; postPatch = '' sed -i \ @@ -50,17 +52,30 @@ stdenv.mkDerivation rec { -e "s,__fzf_git=.*BASH_SOURCE.*,__fzf_git=$out/share/${pname}/fzf-git.sh," \ -e "/__fzf_git=.*readlink.*/d" \ fzf-git.sh + + sed -i \ + -e "s,\bbash\b,${bash}/bin/bash," \ + -e "s,\''$fzf_git_sh_path\b,$out/share/${pname}," \ + fzf-git.fish ''; installPhase = '' install -D fzf-git.sh $out/share/${pname}/fzf-git.sh + install -D fzf-git.fish $out/share/${pname}/fzf-git.fish + ''; + + # Smoke test + installCheckPhase = '' + export HOME=$(mktemp -d) + ${bash}/bin/bash -c "source $out/share/${pname}/fzf-git.sh" + ${fish}/bin/fish -c "source $out/share/${pname}/fzf-git.fish" ''; passthru.updateScript = unstableGitUpdater { }; meta = with lib; { homepage = "https://github.com/junegunn/fzf-git.sh"; - description = "Bash and zsh key bindings for Git objects, powered by fzf"; + description = "Bash, zsh and fish key bindings for Git objects, powered by fzf"; license = licenses.mit; maintainers = with maintainers; [ deejayem ]; platforms = platforms.all; From 5bf19e9c5e97978c1c2ffe0572d875e9b5983181 Mon Sep 17 00:00:00 2001 From: kyehn Date: Wed, 10 Sep 2025 22:54:17 +0800 Subject: [PATCH 02/77] tarantool: 2.10.4 -> 3.5.0 Diff: https://github.com/tarantool/tarantool/compare/2.10.4...3.5.0 --- pkgs/by-name/ta/tarantool/package.nix | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tarantool/package.nix b/pkgs/by-name/ta/tarantool/package.nix index f61eeae0247d..52dbb70b3387 100644 --- a/pkgs/by-name/ta/tarantool/package.nix +++ b/pkgs/by-name/ta/tarantool/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + autoreconfHook, cmake, zlib, openssl, @@ -15,16 +16,24 @@ stdenv.mkDerivation rec { pname = "tarantool"; - version = "2.10.4"; + version = "3.5.0"; src = fetchFromGitHub { owner = "tarantool"; repo = "tarantool"; tag = version; - hash = "sha256-yCRU5IxC6gNS+O2KYtKWjFk35EHkBnnzWy5UnyuB9f4="; + hash = "sha256-NU+0R07Qrnew7+HeeJu6QnGfktEXFRxSZFwl48vjGZE="; fetchSubmodules = true; }; + postPatch = '' + cat <<'EOF' > third_party/luajit/test/cmake/GetLinuxDistro.cmake + macro(GetLinuxDistro output) + set(''${output} linux) + endmacro() + EOF + ''; + buildInputs = [ nghttp2 git @@ -37,7 +46,18 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ gbenchmark ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + autoreconfHook + cmake + ]; + + preAutoreconf = '' + pushd third_party/libunwind + ''; + + postAutoreconf = '' + popd + ''; cmakeBuildType = "RelWithDebInfo"; From 90c943be35ec0e71631115f7b63fbdb77a31a10e Mon Sep 17 00:00:00 2001 From: kyehn Date: Wed, 10 Sep 2025 22:54:48 +0800 Subject: [PATCH 03/77] tarantool: remove with lib --- pkgs/by-name/ta/tarantool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tarantool/package.nix b/pkgs/by-name/ta/tarantool/package.nix index 52dbb70b3387..33e5e3cd7386 100644 --- a/pkgs/by-name/ta/tarantool/package.nix +++ b/pkgs/by-name/ta/tarantool/package.nix @@ -66,11 +66,11 @@ stdenv.mkDerivation rec { "-DTARANTOOL_VERSION=${version}.builtByNix" # expects the commit hash as well ]; - meta = with lib; { + meta = { description = "In-memory computing platform consisting of a database and an application server"; homepage = "https://www.tarantool.io/"; - license = licenses.bsd2; + license = lib.licenses.bsd2; mainProgram = "tarantool"; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with lib.maintainers; [ dit7ya ]; }; } From a866a39ac9c99a7725867f5374e38554b73546cc Mon Sep 17 00:00:00 2001 From: kyehn Date: Wed, 10 Sep 2025 22:55:40 +0800 Subject: [PATCH 04/77] tarantool: use finalAttrs --- pkgs/by-name/ta/tarantool/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ta/tarantool/package.nix b/pkgs/by-name/ta/tarantool/package.nix index 33e5e3cd7386..4bc82dcd46e8 100644 --- a/pkgs/by-name/ta/tarantool/package.nix +++ b/pkgs/by-name/ta/tarantool/package.nix @@ -14,14 +14,14 @@ nghttp2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tarantool"; version = "3.5.0"; src = fetchFromGitHub { owner = "tarantool"; repo = "tarantool"; - tag = version; + tag = finalAttrs.version; hash = "sha256-NU+0R07Qrnew7+HeeJu6QnGfktEXFRxSZFwl48vjGZE="; fetchSubmodules = true; }; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_DIST=ON" - "-DTARANTOOL_VERSION=${version}.builtByNix" # expects the commit hash as well + "-DTARANTOOL_VERSION=${finalAttrs.version}.builtByNix" # expects the commit hash as well ]; meta = { @@ -73,4 +73,4 @@ stdenv.mkDerivation rec { mainProgram = "tarantool"; maintainers = with lib.maintainers; [ dit7ya ]; }; -} +}) From 365f7c1c17304f60a85ab41088e46b644f34bc10 Mon Sep 17 00:00:00 2001 From: kyehn Date: Wed, 10 Sep 2025 22:58:19 +0800 Subject: [PATCH 05/77] tarantool: add updateScript --- pkgs/by-name/ta/tarantool/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ta/tarantool/package.nix b/pkgs/by-name/ta/tarantool/package.nix index 4bc82dcd46e8..38b5771a3560 100644 --- a/pkgs/by-name/ta/tarantool/package.nix +++ b/pkgs/by-name/ta/tarantool/package.nix @@ -12,6 +12,7 @@ git, gbenchmark, nghttp2, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -66,6 +67,8 @@ stdenv.mkDerivation (finalAttrs: { "-DTARANTOOL_VERSION=${finalAttrs.version}.builtByNix" # expects the commit hash as well ]; + passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; }; + meta = { description = "In-memory computing platform consisting of a database and an application server"; homepage = "https://www.tarantool.io/"; From d91a615d2561681d74be66e2ae68f00ef4e2503c Mon Sep 17 00:00:00 2001 From: kyehn Date: Wed, 17 Sep 2025 20:37:29 +0800 Subject: [PATCH 06/77] python313Packages.supervisor: 4.2.5 -> 4.3.0 Changelog: https://github.com/Supervisor/supervisor/blob/4.3.0/CHANGES.rst --- .../python-modules/supervisor/default.nix | 32 +- .../supervisor/fix-python313-unittest.patch | 337 ------------------ 2 files changed, 11 insertions(+), 358 deletions(-) delete mode 100644 pkgs/development/python-modules/supervisor/fix-python313-unittest.patch diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index 61ec354edeb8..2888c3e91171 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -3,36 +3,26 @@ stdenv, buildPythonPackage, fetchPypi, - fetchpatch, mock, pytestCheckHook, - pythonOlder, setuptools, }: -buildPythonPackage rec { +let pname = "supervisor"; - version = "4.2.5"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "4.3.0"; +in +buildPythonPackage { + inherit pname version; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-NHYbrhojxYGSKBpRFfsH+/IsmwEzwIFmvv/HD+0+vBI="; + hash = "sha256-SivxSa30KZfhu0S3DEO2EydeyYUsPtrMqGqRZrJ+lF4="; }; - patches = [ - # adapted from 49b74cafb6e72e0e620e321711c1b81a0823be12 - ./fix-python313-unittest.patch - # Fix SubprocessTests.test_getProcessStateDescription on python 3.13 - (fetchpatch { - url = "https://github.com/Supervisor/supervisor/commit/27efcd59b454e4f3a81e5e1b02ab0d8d0ff2f45f.patch"; - hash = "sha256-9KNcdRJwnZJA00dDy/mAS7RJuBei60YzVhWkeQgmJ8c="; - }) - ]; - - propagatedBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # wants to write to /tmp/foo which is likely already owned by another # nixbld user on hydra @@ -45,11 +35,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "supervisor" ]; - meta = with lib; { + meta = { description = "System for controlling process state under UNIX"; homepage = "https://supervisord.org/"; changelog = "https://github.com/Supervisor/supervisor/blob/${version}/CHANGES.rst"; - license = licenses.free; # http://www.repoze.org/LICENSE.txt - maintainers = with maintainers; [ zimbatm ]; + license = lib.licenses.free; # http://www.repoze.org/LICENSE.txt + maintainers = with lib.maintainers; [ zimbatm ]; }; } diff --git a/pkgs/development/python-modules/supervisor/fix-python313-unittest.patch b/pkgs/development/python-modules/supervisor/fix-python313-unittest.patch deleted file mode 100644 index 323d3f7f18fe..000000000000 --- a/pkgs/development/python-modules/supervisor/fix-python313-unittest.patch +++ /dev/null @@ -1,337 +0,0 @@ -From e18f91d4ddbc30920c828e782ce40fbe844fcab9 Mon Sep 17 00:00:00 2001 -From: Mike Naberezny -Date: Sun, 25 Dec 2022 10:58:24 -0800 -Subject: [PATCH] Remove unused test_suite() that now causes unittest and - pytest warnings - -supervisor/tests/test_confecho.py::test_suite - /home/runner/work/supervisor/supervisor/supervisor/tests/test_confecho.py:18: DeprecationWarning: unittest.findTestCases() is deprecated and will be removed in Python 3.13. Please use unittest.TestLoader.loadTestsFromModule() instead. - return unittest.findTestCases(sys.modules[__name__]) - -supervisor/tests/test_confecho.py::test_suite - /home/runner/work/supervisor/supervisor/.tox/py311/lib/python3.11/site-packages/_pytest/python.py:199: PytestReturnNotNoneWarning: Expected None, but supervisor/tests/test_confecho.py::test_suite returned ]>]>, which will be an error in a future version of pytest. Did you mean to use `assert` instead of `return`? ---- - supervisor/tests/test_childutils.py | 7 ------- - supervisor/tests/test_confecho.py | 7 ------- - supervisor/tests/test_dispatchers.py | 6 ------ - supervisor/tests/test_end_to_end.py | 6 ------ - supervisor/tests/test_events.py | 7 ------- - supervisor/tests/test_http.py | 6 ------ - supervisor/tests/test_loggers.py | 6 ------ - supervisor/tests/test_options.py | 7 ------- - supervisor/tests/test_poller.py | 7 ------- - supervisor/tests/test_rpcinterfaces.py | 8 -------- - supervisor/tests/test_socket_manager.py | 20 -------------------- - supervisor/tests/test_states.py | 7 ------- - supervisor/tests/test_supervisorctl.py | 7 ------- - supervisor/tests/test_supervisord.py | 7 ------- - supervisor/tests/test_templating.py | 9 --------- - supervisor/tests/test_web.py | 6 ------ - supervisor/tests/test_xmlrpc.py | 1 - - 17 files changed, 124 deletions(-) - -diff --git a/supervisor/tests/test_childutils.py b/supervisor/tests/test_childutils.py -index f2b39d8..94193fc 100644 ---- a/supervisor/tests/test_childutils.py -+++ b/supervisor/tests/test_childutils.py -@@ -132,10 +132,3 @@ class TestEventListenerProtocol(unittest.TestCase): - listener.send(msg, stdout) - expected = '%s%s\n%s' % (begin, len(msg), msg) - self.assertEqual(stdout.getvalue(), expected) -- -- --def test_suite(): -- return unittest.findTestCases(sys.modules[__name__]) -- --if __name__ == '__main__': -- unittest.main(defaultTest='test_suite') -diff --git a/supervisor/tests/test_confecho.py b/supervisor/tests/test_confecho.py -index 6ae5108..f35f845 100644 ---- a/supervisor/tests/test_confecho.py -+++ b/supervisor/tests/test_confecho.py -@@ -12,10 +12,3 @@ class TopLevelFunctionTests(unittest.TestCase): - - output = sio.getvalue() - self.assertTrue("[supervisord]" in output) -- -- --def test_suite(): -- return unittest.findTestCases(sys.modules[__name__]) -- --if __name__ == '__main__': -- unittest.main(defaultTest='test_suite') -diff --git a/supervisor/tests/test_dispatchers.py b/supervisor/tests/test_dispatchers.py -index 87692e2..ee6e44a 100644 ---- a/supervisor/tests/test_dispatchers.py -+++ b/supervisor/tests/test_dispatchers.py -@@ -1227,9 +1227,3 @@ class stripEscapeTests(unittest.TestCase): - def test_noansi(self): - noansi = b'Hello world... this is longer than a token!' - self.assertEqual(self._callFUT(noansi), noansi) -- --def test_suite(): -- return unittest.findTestCases(sys.modules[__name__]) -- --if __name__ == '__main__': -- unittest.main(defaultTest='test_suite') -diff --git a/supervisor/tests/test_end_to_end.py b/supervisor/tests/test_end_to_end.py -index dd5c977..763da48 100644 ---- a/supervisor/tests/test_end_to_end.py -+++ b/supervisor/tests/test_end_to_end.py -@@ -419,9 +419,3 @@ class EndToEndTests(BaseTestCase): - finally: - transport.close() - self.assertEqual(ident, "from_command_line") -- --def test_suite(): -- return unittest.findTestCases(sys.modules[__name__]) -- --if __name__ == '__main__': -- unittest.main(defaultTest='test_suite') -diff --git a/supervisor/tests/test_events.py b/supervisor/tests/test_events.py -index bd33a0c..a432da8 100644 ---- a/supervisor/tests/test_events.py -+++ b/supervisor/tests/test_events.py -@@ -508,10 +508,3 @@ class TestUtilityFunctions(unittest.TestCase): - self.assertTrue(events.EventTypes.FOO is FooEvent) - finally: - del events.EventTypes.FOO -- --def test_suite(): -- return unittest.findTestCases(sys.modules[__name__]) -- --if __name__ == '__main__': -- unittest.main(defaultTest='test_suite') -- -diff --git a/supervisor/tests/test_http.py b/supervisor/tests/test_http.py -index 1198597..f4c4496 100644 ---- a/supervisor/tests/test_http.py -+++ b/supervisor/tests/test_http.py -@@ -684,9 +684,3 @@ class DummyProducer: - return self.data.pop(0) - else: - return b'' -- --def test_suite(): -- return unittest.findTestCases(sys.modules[__name__]) -- --if __name__ == '__main__': -- unittest.main(defaultTest='test_suite') -diff --git a/supervisor/tests/test_loggers.py b/supervisor/tests/test_loggers.py -index 0742c17..a9ae297 100644 ---- a/supervisor/tests/test_loggers.py -+++ b/supervisor/tests/test_loggers.py -@@ -599,9 +599,3 @@ class DummyHandler: - self.records.append(record) - def close(self): - self.closed = True -- --def test_suite(): -- return unittest.findTestCases(sys.modules[__name__]) -- --if __name__ == '__main__': -- unittest.main(defaultTest='test_suite') -diff --git a/supervisor/tests/test_options.py b/supervisor/tests/test_options.py -index f43537a..18e7399 100644 ---- a/supervisor/tests/test_options.py -+++ b/supervisor/tests/test_options.py -@@ -3804,10 +3804,3 @@ class UtilFunctionsTests(unittest.TestCase): - self.assertEqual(s('process'), ('process', 'process')) - self.assertEqual(s('group:'), ('group', None)) - self.assertEqual(s('group:*'), ('group', None)) -- --def test_suite(): -- return unittest.findTestCases(sys.modules[__name__]) -- --if __name__ == '__main__': -- unittest.main(defaultTest='test_suite') -- -diff --git a/supervisor/tests/test_poller.py b/supervisor/tests/test_poller.py -index 1b12a8e..fb5bf81 100644 ---- a/supervisor/tests/test_poller.py -+++ b/supervisor/tests/test_poller.py -@@ -437,10 +437,3 @@ class FakeKEvent(object): - def __init__(self, ident, filter): - self.ident = ident - self.filter = filter -- -- --def test_suite(): -- return unittest.findTestCases(sys.modules[__name__]) -- --if __name__ == '__main__': -- unittest.main(defaultTest='test_suite') -diff --git a/supervisor/tests/test_rpcinterfaces.py b/supervisor/tests/test_rpcinterfaces.py -index 0827adf..ec88a90 100644 ---- a/supervisor/tests/test_rpcinterfaces.py -+++ b/supervisor/tests/test_rpcinterfaces.py -@@ -2392,14 +2392,6 @@ class Test_make_main_rpcinterface(unittest.TestCase): - ) - - -- - class DummyRPCInterface: - def hello(self): - return 'Hello!' -- --def test_suite(): -- return unittest.findTestCases(sys.modules[__name__]) -- --if __name__ == '__main__': -- unittest.main(defaultTest='test_suite') -- -diff --git a/supervisor/tests/test_socket_manager.py b/supervisor/tests/test_socket_manager.py -index 626d786..8eaafaa 100644 ---- a/supervisor/tests/test_socket_manager.py -+++ b/supervisor/tests/test_socket_manager.py -@@ -51,7 +51,6 @@ class ProxyTest(unittest.TestCase): - proxy = self._makeOne(Subject(), on_delete=self.setOnDeleteCalled) - self.assertEqual(5, proxy.getValue()) - proxy = None -- gc_collect() - self.assertTrue(self.on_deleteCalled) - - class ReferenceCounterTest(unittest.TestCase): -@@ -94,9 +93,6 @@ class ReferenceCounterTest(unittest.TestCase): - - class SocketManagerTest(unittest.TestCase): - -- def tearDown(self): -- gc_collect() -- - def _getTargetClass(self): - from supervisor.socket_manager import SocketManager - return SocketManager -@@ -160,12 +156,10 @@ class SocketManagerTest(unittest.TestCase): - self.assertTrue(sock_manager.is_prepared()) - self.assertFalse(sock_manager.socket.close_called) - sock = None -- gc_collect() - # Socket not actually closed yet b/c ref ct is 1 - self.assertTrue(sock_manager.is_prepared()) - self.assertFalse(sock_manager.socket.close_called) - sock2 = None -- gc_collect() - # Socket closed - self.assertFalse(sock_manager.is_prepared()) - self.assertTrue(sock_manager.socket.close_called) -@@ -178,7 +172,6 @@ class SocketManagerTest(unittest.TestCase): - self.assertNotEqual(sock_id, sock3_id) - # Drop ref ct to zero - del sock3 -- gc_collect() - # Now assert that socket is closed - self.assertFalse(sock_manager.is_prepared()) - self.assertTrue(sock_manager.socket.close_called) -@@ -193,7 +186,6 @@ class SocketManagerTest(unittest.TestCase): - self.assertEqual('Creating socket %s' % repr(conf), logger.data[0]) - # socket close - del sock -- gc_collect() - self.assertEqual(len(logger.data), 2) - self.assertEqual('Closing socket %s' % repr(conf), logger.data[1]) - -@@ -242,15 +234,3 @@ class SocketManagerTest(unittest.TestCase): - self.fail() - except Exception as e: - self.assertEqual(e.args[0], 'Socket has not been prepared') -- --def gc_collect(): -- if __pypy__ is not None: -- gc.collect() -- gc.collect() -- gc.collect() -- --def test_suite(): -- return unittest.findTestCases(sys.modules[__name__]) -- --if __name__ == '__main__': -- unittest.main(defaultTest='test_suite') -diff --git a/supervisor/tests/test_states.py b/supervisor/tests/test_states.py -index ba8e58f..41fed7b 100644 ---- a/supervisor/tests/test_states.py -+++ b/supervisor/tests/test_states.py -@@ -50,10 +50,3 @@ class TopLevelEventListenerStateTests(unittest.TestCase): - def test_getEventListenerStateDescription_returns_None_when_not_found(self): - self.assertEqual(states.getEventListenerStateDescription(3.14159), - None) -- -- --def test_suite(): -- return unittest.findTestCases(sys.modules[__name__]) -- --if __name__ == '__main__': -- unittest.main(defaultTest='test_suite') -diff --git a/supervisor/tests/test_supervisorctl.py b/supervisor/tests/test_supervisorctl.py -index 3c0e097..af2149b 100644 ---- a/supervisor/tests/test_supervisorctl.py -+++ b/supervisor/tests/test_supervisorctl.py -@@ -2067,10 +2067,3 @@ class DummyPlugin: - - def do_help(self, arg): - self.helped = True -- --def test_suite(): -- return unittest.findTestCases(sys.modules[__name__]) -- --if __name__ == '__main__': -- unittest.main(defaultTest='test_suite') -- -diff --git a/supervisor/tests/test_supervisord.py b/supervisor/tests/test_supervisord.py -index 3d7b4ff..4099bba 100644 ---- a/supervisor/tests/test_supervisord.py -+++ b/supervisor/tests/test_supervisord.py -@@ -834,10 +834,3 @@ class SupervisordTests(unittest.TestCase): - self.assertEqual(supervisord.ticks[3600], 3600) - self.assertEqual(len(L), 6) - self.assertEqual(L[-1].__class__, events.Tick3600Event) -- --def test_suite(): -- return unittest.findTestCases(sys.modules[__name__]) -- --if __name__ == '__main__': -- unittest.main(defaultTest='test_suite') -- -diff --git a/supervisor/tests/test_templating.py b/supervisor/tests/test_templating.py -index 29311a7..8970c4f 100644 ---- a/supervisor/tests/test_templating.py -+++ b/supervisor/tests/test_templating.py -@@ -1785,12 +1785,3 @@ def normalize_xml(s): - s = re.sub(r"(?s)\s+<", "<", s) - s = re.sub(r"(?s)>\s+", ">", s) - return s -- --def test_suite(): -- return unittest.findTestCases(sys.modules[__name__]) -- --def main(): -- unittest.main(defaultTest='test_suite') -- --if __name__ == '__main__': -- main() -diff --git a/supervisor/tests/test_web.py b/supervisor/tests/test_web.py -index 8bae3ed..f31972d 100644 ---- a/supervisor/tests/test_web.py -+++ b/supervisor/tests/test_web.py -@@ -177,9 +177,3 @@ class StatusViewTests(unittest.TestCase): - - class DummyContext: - pass -- --def test_suite(): -- return unittest.findTestCases(sys.modules[__name__]) -- --if __name__ == '__main__': -- unittest.main(defaultTest='test_suite') -diff --git a/supervisor/tests/test_xmlrpc.py b/supervisor/tests/test_xmlrpc.py -index 3d49ce0..8cee058 100644 ---- a/supervisor/tests/test_xmlrpc.py -+++ b/supervisor/tests/test_xmlrpc.py -@@ -917,4 +917,3 @@ class DummyConnection: - - def close(self): - self.closed = True -- --- -2.49.0 - From 38e12ad6a750b7733032a97a30c1144bc56d5627 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Sep 2025 14:14:04 +0000 Subject: [PATCH 07/77] gcsfuse: 3.3.0 -> 3.4.0 --- pkgs/by-name/gc/gcsfuse/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix index c56fb4a298ba..d90ca354dbf8 100644 --- a/pkgs/by-name/gc/gcsfuse/package.nix +++ b/pkgs/by-name/gc/gcsfuse/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gcsfuse"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - hash = "sha256-uHLfK6z2Ck38kxGtz91yyWV9YUW/Bft7S/MOUEHMf3o="; + hash = "sha256-PdYHsHIlq77QnsjD1z3KliW3JHLZ0M26I4Z7v0SuvlU="; }; - vendorHash = "sha256-M4hI9ciDe49siQhFVRFTXNfQBMt9aBulu9+HvCQeVHA="; + vendorHash = "sha256-w5EOHPOJLfINILrP3ipZwYUAcAJIlGw1HlVAUAzW3x4="; subPackages = [ "." From 66e27d0d7d1048d72bcbd077989bcf40b70a6ff8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Sep 2025 14:57:50 +0000 Subject: [PATCH 08/77] weaviate: 1.32.8 -> 1.33.0 --- pkgs/by-name/we/weaviate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix index 4baa798c4c7b..903712e8cb5f 100644 --- a/pkgs/by-name/we/weaviate/package.nix +++ b/pkgs/by-name/we/weaviate/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.32.8"; + version = "1.33.0"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-RJnvPqOyK8IMIu0C5NZFW7fyuVxbiEYbBUyp6gBwYB4="; + hash = "sha256-vFjP/GesZg2G57zyF3LLDla9W+4gQyeAI3vAvSw+wls="; }; - vendorHash = "sha256-5Xv1YvNEti1fzlu6Ev65dQfXyyFusvsnlRQUSCRjc4s="; + vendorHash = "sha256-sMpYk2uXXt8oJ7HC3n9Gqa1cOvspxt0oof3E1fbRgco="; subPackages = [ "cmd/weaviate-server" ]; From 18e80a8dd1fe5f42413ffc8ebeb7818854065359 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Sep 2025 20:50:43 +0000 Subject: [PATCH 09/77] spire: 1.13.0 -> 1.13.1 --- pkgs/by-name/sp/spire/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spire/package.nix b/pkgs/by-name/sp/spire/package.nix index 7f6c2984ccd4..2275712444c6 100644 --- a/pkgs/by-name/sp/spire/package.nix +++ b/pkgs/by-name/sp/spire/package.nix @@ -6,7 +6,7 @@ buildGoModule (finalAttrs: { pname = "spire"; - version = "1.13.0"; + version = "1.13.1"; outputs = [ "out" @@ -18,10 +18,10 @@ buildGoModule (finalAttrs: { owner = "spiffe"; repo = "spire"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-hUvzC3gaNpp5yvIOoWG72WcC8yy5yLgf5RRzP+hPXrA="; + sha256 = "sha256-1i2zT2oTJXMmISzUc4ixlZQjtjCcqUEi6RzgF9Zwm9s="; }; - vendorHash = "sha256-qhYuE/rlaGJyOxt4e0a1QzAySF0wWOFoNdLAe2nKQbw="; + vendorHash = "sha256-tho3Qm9uHiiSNFmBZGZFgxhAKD4HKWsIUmiqkWlToQk="; ldflags = [ "-s" From c7ca30f9c550e73a7ff99ce1dc4a6e8c3322081e Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 10 Oct 2025 22:58:03 +0200 Subject: [PATCH 10/77] properties-cpp: 0.0.3 -> 0.0.4 Includes fix for CMake 4 compatibility --- pkgs/by-name/pr/properties-cpp/package.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/pr/properties-cpp/package.nix b/pkgs/by-name/pr/properties-cpp/package.nix index d5182ee63985..46b608a71189 100644 --- a/pkgs/by-name/pr/properties-cpp/package.nix +++ b/pkgs/by-name/pr/properties-cpp/package.nix @@ -14,25 +14,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "properties-cpp"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lib-cpp/properties-cpp"; rev = finalAttrs.version; - hash = "sha256-C/BDEuKNMQHOjATO5aWBptjIlgfv6ykzjFAsHb6uP3Q="; + hash = "sha256-rxv2SPTXubaIBlDZixBZ88wqM7pxY03dVhRVImcDZtA="; }; - postPatch = '' - # GTest needs C++17 - # Remove when https://gitlab.com/ubports/development/core/lib-cpp/properties-cpp/-/merge_requests/3 merged & in release - substituteInPlace CMakeLists.txt \ - --replace-fail 'std=c++14' 'std=c++17' - '' - + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' - sed -i "/add_subdirectory(tests)/d" CMakeLists.txt - ''; - strictDeps = true; nativeBuildInputs = [ From 50b8dffd71238ad46a0db216f39c79618d6d6c9f Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 10 Oct 2025 23:01:07 +0200 Subject: [PATCH 11/77] libqtdbustest: 0.3.2 -> 0.4.0 Includes fix for CMake 4 compatibility --- .../libraries/libqtdbustest/default.nix | 12 ++++++++---- .../less-pedantic-process-finding.patch | 15 --------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/libqtdbustest/default.nix b/pkgs/development/libraries/libqtdbustest/default.nix index 9fc5901af252..097efcf8eb26 100644 --- a/pkgs/development/libraries/libqtdbustest/default.nix +++ b/pkgs/development/libraries/libqtdbustest/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitLab, fetchpatch, + gitUpdater, testers, cmake, cmake-extras, @@ -17,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libqtdbustest"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/libqtdbustest"; rev = finalAttrs.version; - hash = "sha256-yqqyKxsbqiVTrkas79YoPMi28dKFNntiE7+dx1v+Qh4="; + hash = "sha256-49YIkaQ2ceJxaPLkzOg+L3bwiPzoB36xU7skRh4vYQg="; }; patches = [ @@ -90,11 +91,14 @@ stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; meta = with lib; { description = "Library for testing DBus interactions using Qt"; - homepage = "https://launchpad.net/libqtdbustest"; + homepage = "https://gitlab.com/ubports/development/core/libqtdbustest"; license = licenses.lgpl3Only; platforms = platforms.unix; teams = [ teams.lomiri ]; diff --git a/pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch b/pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch index dc8bcd7763f9..b853d6064af9 100644 --- a/pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch +++ b/pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch @@ -70,18 +70,3 @@ diff '--color=auto' -ur '--color=never' a/tests/libqtdbustest/TestQProcessDBusSe + "python3", QStringList() << "-m" << "dbusmock" << "not.test.name" << "/test/object" << "test.Interface"); - -diff '--color=auto' -ur '--color=never' a/tests/libqtdbustest/TestSuicidalProcess.cpp b/tests/libqtdbustest/TestSuicidalProcess.cpp ---- a/tests/libqtdbustest/TestSuicidalProcess.cpp 2023-01-20 21:36:16.948292559 +0100 -+++ b/tests/libqtdbustest/TestSuicidalProcess.cpp 2023-01-20 21:55:07.219951081 +0100 -@@ -51,9 +51,7 @@ - pgrep.waitForFinished(); - pgrep.waitForReadyRead(); - -- EXPECT_TRUE(QString::fromUtf8(pgrep.readAll().trimmed()) -- .toStdString() -- .find("sleep 5") != std::string::npos); -+ EXPECT_TRUE(pgrep.readAll().contains("sleep 5")); - } - - } // namespace From 7c6118b52e2bfcb15a6830116317ca65ecff615a Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 10 Oct 2025 23:02:02 +0200 Subject: [PATCH 12/77] lomiri.geonames: Fix CMake 4 compatibility --- .../1001-geonames-cmake4-compat.patch | 37 +++++++++++++++++++ .../lomiri/development/geonames/default.nix | 6 +++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/desktops/lomiri/development/geonames/1001-geonames-cmake4-compat.patch diff --git a/pkgs/desktops/lomiri/development/geonames/1001-geonames-cmake4-compat.patch b/pkgs/desktops/lomiri/development/geonames/1001-geonames-cmake4-compat.patch new file mode 100644 index 000000000000..e338b8824a9d --- /dev/null +++ b/pkgs/desktops/lomiri/development/geonames/1001-geonames-cmake4-compat.patch @@ -0,0 +1,37 @@ +From 3dea0cc91b579de5e2c9db811f2e9e34079d3733 Mon Sep 17 00:00:00 2001 +From: Mike Gabriel +Date: Mon, 1 Sep 2025 13:22:26 +0200 +Subject: [PATCH] {CMakeLists.txt,cmake/GtkDocScanGObjWrapper.cmake}: Bump + cmake_minimum_required() to version 3.10. + +--- + CMakeLists.txt | 2 +- + cmake/GtkDocScanGObjWrapper.cmake | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5fbff8a..e7b863e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.10) + project(geonames VERSION 0.3.1 LANGUAGES C) + + include(GNUInstallDirs) +diff --git a/cmake/GtkDocScanGObjWrapper.cmake b/cmake/GtkDocScanGObjWrapper.cmake +index b187ebb..b026ed0 100644 +--- a/cmake/GtkDocScanGObjWrapper.cmake ++++ b/cmake/GtkDocScanGObjWrapper.cmake +@@ -20,7 +20,7 @@ + + # This is needed for find_package(PkgConfig) to work correctly -- + # CMAKE_MINIMUM_REQUIRED_VERSION needs to be defined. +-cmake_minimum_required(VERSION 3.2) ++cmake_minimum_required(VERSION 3.10) + + if(NOT APPLE) + # We use pkg-config to find glib et al +-- +GitLab + diff --git a/pkgs/desktops/lomiri/development/geonames/default.nix b/pkgs/desktops/lomiri/development/geonames/default.nix index dd6c19d142cb..97d195b3dff9 100644 --- a/pkgs/desktops/lomiri/development/geonames/default.nix +++ b/pkgs/desktops/lomiri/development/geonames/default.nix @@ -42,6 +42,12 @@ stdenv.mkDerivation (finalAttrs: { "devdoc" ]; + patches = [ + # Fix compat with CMake 4 + # Remove when https://gitlab.com/ubports/development/core/geonames/-/merge_requests/4 merged & in release + ./1001-geonames-cmake4-compat.patch + ]; + postPatch = '' patchShebangs src/generate-locales.sh tests/setup-test-env.sh ''; From c2b0633149e78da3c24b4bd9e50753b69205773c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 10 Oct 2025 23:02:56 +0200 Subject: [PATCH 13/77] lomiri.lomiri-settings-components: 1.1.2 -> 1.1.3 Includes fix for CMake 4 compatibility --- .../lomiri/qml/lomiri-settings-components/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix b/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix index f07fe1731d68..15ca36fbe5fd 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-settings-components"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-settings-components"; rev = finalAttrs.version; - hash = "sha256-H7G3dzzitdyahB/MwgtfRBpo+qMOhmQSzN4EGYculks="; + hash = "sha256-WKLdTiTVfgX9IAVPsRGx7GWBbYMI9iICXevzrfuHPGc="; }; postPatch = '' From 5bdcd060ed65318bb981b18b98cc16bd17f2ac03 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 10 Oct 2025 23:06:31 +0200 Subject: [PATCH 14/77] process-cpp: Fix CMake 4 compatibility --- pkgs/by-name/pr/process-cpp/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/pr/process-cpp/package.nix b/pkgs/by-name/pr/process-cpp/package.nix index eb9638e74ab1..a23b2cf8cee8 100644 --- a/pkgs/by-name/pr/process-cpp/package.nix +++ b/pkgs/by-name/pr/process-cpp/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitLab, + fetchpatch2, testers, gitUpdater, cmake, @@ -30,6 +31,16 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; + patches = [ + # Fix compat with CMake 4 + # Remove when version > 3.0.2 + (fetchpatch2 { + name = "0001-process-cpp-Bump-cmake_minimum_required-to-version-3.10.patch"; + url = "https://gitlab.com/ubports/development/core/lib-cpp/process-cpp/-/commit/c374b62cb79d668505c1c8dc55edddc938a573ba.diff"; + hash = "sha256-2H6f+EAR7p4mb0ReNl8LaosPVF/CNRm+PiYV7tkOQ/w="; + }) + ]; + postPatch = '' substituteInPlace data/process-cpp.pc.in \ --replace-fail 'libdir=''${exec_prefix}' 'libdir=''${prefix}' \ From a34175fb6d87d726605f2773977d100a4d6cccb9 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 10 Oct 2025 23:10:45 +0200 Subject: [PATCH 15/77] lomiri.lomiri-api: 0.2.2 -> 0.2.3 Includes fix for CMake 4 compatibility --- pkgs/desktops/lomiri/development/lomiri-api/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lomiri/development/lomiri-api/default.nix b/pkgs/desktops/lomiri/development/lomiri-api/default.nix index 147f4aa7d161..cc10b36f2a7d 100644 --- a/pkgs/desktops/lomiri/development/lomiri-api/default.nix +++ b/pkgs/desktops/lomiri/development/lomiri-api/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-api"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-api"; tag = finalAttrs.version; - hash = "sha256-+ttmtvt18NMKYfGntEXgBOSJ3lW9Bf55327XYIzxMh8="; + hash = "sha256-ypz15XX0ESkOWI6G+a9/36bRg5gBG0X4Y/EvB/m7qm8="; }; outputs = [ @@ -40,13 +40,13 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs $(find test -name '*.py') substituteInPlace data/liblomiri-api.pc.in \ - --replace "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" '@CMAKE_INSTALL_FULL_LIBDIR@' + --replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" '@CMAKE_INSTALL_FULL_LIBDIR@' # Variable is queried via pkg-config by reverse dependencies # TODO This is likely not supposed to be the regular Qt QML import prefix # but otherwise i.e. lomiri-notifications cannot be found in lomiri substituteInPlace CMakeLists.txt \ - --replace 'SHELL_PLUGINDIR ''${CMAKE_INSTALL_LIBDIR}/lomiri/qml' 'SHELL_PLUGINDIR ${qtbase.qtQmlPrefix}' + --replace-fail 'SHELL_PLUGINDIR ''${CMAKE_INSTALL_LIBDIR}/lomiri/qml' 'SHELL_PLUGINDIR ${qtbase.qtQmlPrefix}' ''; strictDeps = true; From 162ef50d68313707f3aaf1203d281723dd9df740 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 10 Oct 2025 23:18:05 +0200 Subject: [PATCH 16/77] lomiri.lomiri-thumbnailer: 3.0.4 -> 3.0.5 Includes fix for CMake 4 compatibility --- ...umbnailer-qt-Honour-CMAKE_INSTALL_DO.patch | 25 ---- .../1002-Re-enable-documentation.patch | 97 ------------- ...umbnailer-qt-examples-Drop-qt5_use_m.patch | 25 ---- .../1004-Re-enable-coverge-reporting.patch | 131 ------------------ ...Make-GTest-available-to-example-test.patch | 38 ----- .../services/lomiri-thumbnailer/default.nix | 19 +-- 6 files changed, 2 insertions(+), 333 deletions(-) delete mode 100644 pkgs/desktops/lomiri/services/lomiri-thumbnailer/1001-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DO.patch delete mode 100644 pkgs/desktops/lomiri/services/lomiri-thumbnailer/1002-Re-enable-documentation.patch delete mode 100644 pkgs/desktops/lomiri/services/lomiri-thumbnailer/1003-doc-liblomiri-thumbnailer-qt-examples-Drop-qt5_use_m.patch delete mode 100644 pkgs/desktops/lomiri/services/lomiri-thumbnailer/1004-Re-enable-coverge-reporting.patch delete mode 100644 pkgs/desktops/lomiri/services/lomiri-thumbnailer/1005-Make-GTest-available-to-example-test.patch diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1001-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DO.patch b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1001-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DO.patch deleted file mode 100644 index e055fff09940..000000000000 --- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1001-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DO.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e8893fcae7e732c9e15ccd6d54a62b5b3862e445 Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Thu, 16 Jan 2025 17:12:36 +0100 -Subject: [PATCH 1/5] doc/liblomiri-thumbnailer-qt: Honour CMAKE_INSTALL_DOCDIR - ---- - doc/liblomiri-thumbnailer-qt/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt -index 91e12a0..3e96f80 100644 ---- a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt -+++ b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt -@@ -28,7 +28,7 @@ add_doxygen( - ) - - install(DIRECTORY ${PROJECT_BINARY_DIR}/doc/liblomiri-thumbnailer-qt/html -- DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/doc/liblomiri-thumbnailer-qt) -+ DESTINATION ${CMAKE_INSTALL_DOCDIR}) - - add_subdirectory(examples) - --- -2.47.0 - diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1002-Re-enable-documentation.patch b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1002-Re-enable-documentation.patch deleted file mode 100644 index 2dd982961dce..000000000000 --- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1002-Re-enable-documentation.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 37687a195052186432923276bc2c2358b3622ab1 Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Thu, 16 Jan 2025 17:12:44 +0100 -Subject: [PATCH 2/5] Re-enable documentation - ---- - CMakeLists.txt | 6 +++++- - debian/liblomiri-thumbnailer-qt-doc.install | 1 + - ...lomiri-thumbnailer-qt-doc.install.disabled | 1 - - doc/liblomiri-thumbnailer-qt/CMakeLists.txt | 21 ++++++++----------- - 4 files changed, 15 insertions(+), 14 deletions(-) - create mode 100644 debian/liblomiri-thumbnailer-qt-doc.install - delete mode 100644 debian/liblomiri-thumbnailer-qt-doc.install.disabled - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 464ac70..cade10f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -184,7 +184,11 @@ if (${BUILD_TESTING}) - endif() - add_subdirectory(include) - add_subdirectory(man) --#add_subdirectory(doc) -+ -+option(ENABLE_DOC "Build documentation" ON) -+if(ENABLE_DOC) -+ add_subdirectory(doc) -+endif() - - #enable_coverage_report( - # TARGETS -diff --git a/debian/liblomiri-thumbnailer-qt-doc.install b/debian/liblomiri-thumbnailer-qt-doc.install -new file mode 100644 -index 0000000..ff56aee ---- /dev/null -+++ b/debian/liblomiri-thumbnailer-qt-doc.install -@@ -0,0 +1 @@ -+usr/share/doc/lomiri-thumbnailer/* -diff --git a/debian/liblomiri-thumbnailer-qt-doc.install.disabled b/debian/liblomiri-thumbnailer-qt-doc.install.disabled -deleted file mode 100644 -index db055cf..0000000 ---- a/debian/liblomiri-thumbnailer-qt-doc.install.disabled -+++ /dev/null -@@ -1 +0,0 @@ --usr/share/doc/liblomiri-thumbnailer-qt/* -diff --git a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt -index 3e96f80..fe98e4c 100644 ---- a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt -+++ b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt -@@ -1,35 +1,32 @@ --include(UseDoxygen OPTIONAL) -+find_package(DoxygenBuilder REQUIRED) - - file(GLOB libthumbnailer_headers "${PROJECT_SOURCE_DIR}/include/lomiri/thumbnailer/qt/*.h") - - add_doxygen( - liblomiri-thumbnailer-qt-doc -+ PROJECT_NAME -+ "Thumbnailer Qt API" - INPUT - ${CMAKE_CURRENT_SOURCE_DIR}/tutorial.dox - ${libthumbnailer_headers} -- OUTPUT_DIRECTORY -- ${CMAKE_BINARY_DIR}/doc/liblomiri-thumbnailer-qt -+ EXAMPLE_PATH -+ ${CMAKE_CURRENT_SOURCE_DIR} - STRIP_FROM_PATH - "${CMAKE_SOURCE_DIR}/src" - STRIP_FROM_INC_PATH - "${CMAKE_SOURCE_DIR}/include" -+ DOXYFILE_IN -+ ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in - EXCLUDE_PATTERNS - */internal/* - EXCLUDE_SYMBOLS - *::internal* - *::Priv -- EXAMPLE_PATH -- ${CMAKE_CURRENT_SOURCE_DIR} -- DOXYFILE_IN -- ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in -- PROJECT_NAME -- "Thumbnailer Qt API" -+ INSTALL -+ ${CMAKE_INSTALL_DOCDIR} - ALL - ) - --install(DIRECTORY ${PROJECT_BINARY_DIR}/doc/liblomiri-thumbnailer-qt/html -- DESTINATION ${CMAKE_INSTALL_DOCDIR}) -- - add_subdirectory(examples) - - list(APPEND UNIT_TEST_TARGETS qt_example_test) --- -2.47.0 - diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1003-doc-liblomiri-thumbnailer-qt-examples-Drop-qt5_use_m.patch b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1003-doc-liblomiri-thumbnailer-qt-examples-Drop-qt5_use_m.patch deleted file mode 100644 index 1ea1d9799e6e..000000000000 --- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1003-doc-liblomiri-thumbnailer-qt-examples-Drop-qt5_use_m.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 010d19f85f4f8d73f96f054e5d293951fae1f9de Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Thu, 16 Jan 2025 17:12:45 +0100 -Subject: [PATCH 3/5] doc/liblomiri-thumbnailer-qt/examples: Drop - qt5_use_modules usage - -Leftover from a0d81863f3f48717507cfa181030a8ffb0c4e881 ---- - doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt -index db8139f..825a821 100644 ---- a/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt -+++ b/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt -@@ -1,6 +1,5 @@ - include_directories(${CMAKE_BINARY_DIR}/tests ${CMAKE_SOURCE_DIR}/tests) - add_executable(qt_example_test qt_example_test.cpp) --qt5_use_modules(qt_example_test Core Gui Network Test) - target_link_libraries(qt_example_test - gtest - Qt5::Core --- -2.47.0 - diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1004-Re-enable-coverge-reporting.patch b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1004-Re-enable-coverge-reporting.patch deleted file mode 100644 index d507346eb23c..000000000000 --- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1004-Re-enable-coverge-reporting.patch +++ /dev/null @@ -1,131 +0,0 @@ -From ffec02835aa44e93c96c48b7a33be3f51a3571a1 Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Thu, 16 Jan 2025 17:12:46 +0100 -Subject: [PATCH 4/5] Re-enable coverge reporting - ---- - CMakeLists.txt | 51 +++++++++++++-------- - doc/CMakeLists.txt | 6 ++- - doc/liblomiri-thumbnailer-qt/CMakeLists.txt | 8 ++-- - tests/CMakeLists.txt | 2 - - 4 files changed, 40 insertions(+), 27 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cade10f..cbfd9c0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -134,7 +134,14 @@ endif() - - include(CTest) - --#include(EnableCoverageReport) -+if (cmake_build_type_lower MATCHES coverage) -+ find_package(CoverageReport REQUIRED) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs" ) -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs" ) -+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -coverage" ) -+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -coverage" ) -+endif() -+ - - include(cmake/UseGSettings.cmake) - -@@ -169,6 +176,8 @@ include_directories(${TAGLIB_DEPS_INCLUDE_DIRS}) - include_directories(include) - include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) - -+set(UNIT_TEST_TARGETS "") -+ - add_subdirectory(src) - add_subdirectory(data) - add_subdirectory(plugins/Lomiri/Thumbnailer.0.1) -@@ -190,22 +199,24 @@ if(ENABLE_DOC) - add_subdirectory(doc) - endif() - --#enable_coverage_report( --# TARGETS --# recovery_test # Need to turn on coverage for this, to get the helper template instrumented. --# testutils --# test-seq --# thumbnailer-admin --# thumbnailer-qml --# thumbnailer-qml-static --# lomiri-thumbnailer-qt --# thumbnailer-service --# thumbnailer-static --# vs-thumb --# vs-thumb-static --# FILTER --# ${CMAKE_SOURCE_DIR}/tests/* --# ${CMAKE_BINARY_DIR}/* --# TESTS --# ${UNIT_TEST_TARGETS} --#) -+if (cmake_build_type_lower MATCHES coverage) -+ enable_coverage_report( -+ TARGETS -+ recovery_test # Need to turn on coverage for this, to get the helper template instrumented. -+ testutils -+ test-seq -+ lomiri-thumbnailer-admin -+ LomiriThumbnailer-qml -+ thumbnailer-qml-static -+ lomiri-thumbnailer-qt -+ thumbnailer-service -+ thumbnailer-static -+ vs-thumb -+ vs-thumb-static -+ FILTER -+ ${CMAKE_SOURCE_DIR}/tests/* -+ ${CMAKE_BINARY_DIR}/* -+ TESTS -+ ${UNIT_TEST_TARGETS} -+ ) -+endif() -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index 11f4449..249f5e0 100644 ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -1,4 +1,6 @@ - add_subdirectory(liblomiri-thumbnailer-qt) - --list(APPEND UNIT_TEST_TARGETS qt_example_test) --set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE) -+if(BUILD_TESTING) -+ list(APPEND UNIT_TEST_TARGETS qt_example_test) -+ set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE) -+endif() -diff --git a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt -index fe98e4c..078be07 100644 ---- a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt -+++ b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt -@@ -27,7 +27,9 @@ add_doxygen( - ALL - ) - --add_subdirectory(examples) -+if(BUILD_TESTING) -+ add_subdirectory(examples) - --list(APPEND UNIT_TEST_TARGETS qt_example_test) --set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE) -+ list(APPEND UNIT_TEST_TARGETS qt_example_test) -+ set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE) -+endif() -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 03a4900..97cb3a1 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -42,8 +42,6 @@ set(slow_test_dirs - stress - ) - --set(UNIT_TEST_TARGETS "") -- - foreach(dir ${unit_test_dirs}) - add_subdirectory(${dir}) - list(APPEND UNIT_TEST_TARGETS "${dir}_test") --- -2.47.0 - diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1005-Make-GTest-available-to-example-test.patch b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1005-Make-GTest-available-to-example-test.patch deleted file mode 100644 index 0fd3ba976fee..000000000000 --- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1005-Make-GTest-available-to-example-test.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d9152f5e1f77a6c3bbc759eec58811410de7b85a Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Thu, 16 Jan 2025 17:12:49 +0100 -Subject: [PATCH 5/5] Make GTest available to example test - ---- - CMakeLists.txt | 2 ++ - tests/CMakeLists.txt | 1 - - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cbfd9c0..0663b44 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -189,6 +189,8 @@ if (${BUILD_TESTING}) - find_package(Qt5QuickTest REQUIRED) - find_package(Qt5Network REQUIRED) - -+ find_package(GMock REQUIRED) -+ - add_subdirectory(tests) - endif() - add_subdirectory(include) -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 97cb3a1..92eae14 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -3,7 +3,6 @@ - - set(old_cxx_flags ${CMAKE_CXX_FLAGS}) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wno-old-style-cast -Wno-missing-field-initializers") --find_package(GMock) - set(CMAKE_CXX_FLAGS ${old_cxx_flags}) - - set(TESTDATADIR ${CMAKE_CURRENT_SOURCE_DIR}/media) --- -2.47.0 - diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix index 51e08f5d25cf..86e46dc8bc24 100644 --- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-thumbnailer"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-thumbnailer"; tag = finalAttrs.version; - hash = "sha256-pf/bzpooCcoIGb5JtSnowePcobcfVSzHyBaEkb51IOg="; + hash = "sha256-TfBGcHg9y9G2Rxs/OpZ8CcQrhK05gijZjVxOYSTkJJ8="; }; outputs = [ @@ -49,21 +49,6 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - # Fix compat with taglib 2.x - # Remove when version > 3.0.4 - (fetchpatch { - name = "0001-lomiri-thumbnailer-Fix-taglib-2.x-compat.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/b7f1055e36cd6e33314bb9f6648f93e977a33267.patch"; - hash = "sha256-9RHtxqsgdMkgIyswaeL5yS6+o/YvzT+HgRD8KL/RfNM="; - }) - - # Remove when https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/merge_requests/23 merged & in release - ./1001-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DO.patch - ./1002-Re-enable-documentation.patch - ./1003-doc-liblomiri-thumbnailer-qt-examples-Drop-qt5_use_m.patch - ./1004-Re-enable-coverge-reporting.patch - ./1005-Make-GTest-available-to-example-test.patch - # In aarch64 lomiri-gallery-app VM tests, default 10s timeout for thumbnail extractor is often too tight # Raise to 20s to work around this (too much more will run into D-Bus' call timeout) ./2001-Raise-default-extraction-timeout.patch From 8d9d7b6332b340aae5ac12383a100fdba2850bbe Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 10 Oct 2025 23:30:08 +0200 Subject: [PATCH 17/77] lomiri.gmenuharness: Fix CMake 4 compatibility --- pkgs/desktops/lomiri/development/gmenuharness/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/lomiri/development/gmenuharness/default.nix b/pkgs/desktops/lomiri/development/gmenuharness/default.nix index d44ba3c2c48f..a9a61fb09939 100644 --- a/pkgs/desktops/lomiri/development/gmenuharness/default.nix +++ b/pkgs/desktops/lomiri/development/gmenuharness/default.nix @@ -35,6 +35,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.com/ubports/development/core/gmenuharness/-/commit/70e9ed85792a6ac1950faaf26391ce91e69486ab.patch"; hash = "sha256-jeue0qrl2JZCt/Yfj4jT210wsF/E+MlbtNT/yFTcw5I="; }) + (fetchpatch { + name = "0002-gmenuharness-CMakeLists.txt-Bump-cmake_minimum_required-to-version-3.10.patch"; + url = "https://gitlab.com/ubports/development/core/gmenuharness/-/commit/42d04e0d484b3715e7b9935e3ef3e2fa6c33b409.patch"; + hash = "sha256-Gyk8TxIfEWsqL9CGymmnVA/Xj4/+J1PRNmWikNEcRJ8="; + }) ]; postPatch = '' From 66e75c60ec33e2fd74f6751284ec17b04eb7b64b Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 12 Oct 2025 01:08:38 +0200 Subject: [PATCH 18/77] python313Packages.sphinx-intl: fix build --- pkgs/development/python-modules/sphinx-intl/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sphinx-intl/default.nix b/pkgs/development/python-modules/sphinx-intl/default.nix index d99b107cc747..d7a25e8ab7a2 100644 --- a/pkgs/development/python-modules/sphinx-intl/default.nix +++ b/pkgs/development/python-modules/sphinx-intl/default.nix @@ -6,6 +6,7 @@ babel, click, setuptools, + setuptools-scm, sphinx, pytestCheckHook, mock, @@ -23,7 +24,10 @@ buildPythonPackage rec { hash = "sha256-5Ro+UG9pwwp656fYyCsna6P4s9Gb86Tu3Qm2WUI7tsE="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ babel From a38b1883dac276e4837472b0d4adadad4e6c1cdd Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sun, 12 Oct 2025 12:59:17 +0300 Subject: [PATCH 19/77] xalan-c: fix CMake 4 issues Signed-off-by: Alexander V. Nikolaev --- pkgs/by-name/xa/xalanc/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/xa/xalanc/package.nix b/pkgs/by-name/xa/xalanc/package.nix index 06bd0ba59abf..5a98de1b8b3d 100644 --- a/pkgs/by-name/xa/xalanc/package.nix +++ b/pkgs/by-name/xa/xalanc/package.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation { ./0001-clang19-gcc15-compat.patch ]; + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail 'cmake_minimum_required(VERSION 3.2.0)' 'cmake_minimum_required(VERSION 3.10.0)' + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ xercesc From 101d3d6966858333baea7c5c255a4eaa2c16d2a5 Mon Sep 17 00:00:00 2001 From: leiserfg Date: Sun, 12 Oct 2025 17:55:41 +0200 Subject: [PATCH 20/77] glslviewer: fix build with cmake 4 --- pkgs/by-name/gl/glslviewer/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/gl/glslviewer/package.nix b/pkgs/by-name/gl/glslviewer/package.nix index cc43264d1093..71b4724cd8a3 100644 --- a/pkgs/by-name/gl/glslviewer/package.nix +++ b/pkgs/by-name/gl/glslviewer/package.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { ffmpeg ]; + cmakeFlags = [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.20" ]; meta = with lib; { description = "Live GLSL coding renderer"; homepage = "https://patriciogonzalezvivo.com/2015/glslViewer/"; From 24c7e1f96053b25e95198e6cc8a3a41f8031b110 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 30 Sep 2025 17:05:35 +0200 Subject: [PATCH 21/77] plausible: Fix RiscV cross-compile --- pkgs/by-name/pl/plausible/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pl/plausible/package.nix b/pkgs/by-name/pl/plausible/package.nix index 9313ae32117a..b1acaae50a50 100644 --- a/pkgs/by-name/pl/plausible/package.nix +++ b/pkgs/by-name/pl/plausible/package.nix @@ -12,6 +12,7 @@ brotli, tailwindcss_3, esbuild, + buildPackages, }: let @@ -158,8 +159,10 @@ beamPackages.mixRelease rec { cp --no-preserve=mode -r ${assets} assets cp -r ${tracker} tracker + # Fix cross-compilation with buildPackages + # since tailwindcss_3 is not available for RiscV cat >> config/config.exs < Date: Mon, 13 Oct 2025 17:51:39 +0000 Subject: [PATCH 22/77] atmos: 1.189.0 -> 1.194.0 --- pkgs/by-name/at/atmos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/at/atmos/package.nix b/pkgs/by-name/at/atmos/package.nix index 1bd1d43c2228..80e4cd80f986 100644 --- a/pkgs/by-name/at/atmos/package.nix +++ b/pkgs/by-name/at/atmos/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "atmos"; - version = "1.189.0"; + version = "1.194.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = "atmos"; tag = "v${finalAttrs.version}"; - hash = "sha256-udreQcDKZYnOLxeEUQfC+OsLg1VdwXP9R7hDKD6YEkw="; + hash = "sha256-xWKdKhuSGwVnRuIaphZ+/5MAoo8tbbbN/WB5OvZYD+w="; }; - vendorHash = "sha256-RnmYUEgVQyZXvPPIXxS8cCkpKkQTGxQzawfDN4zVLHw="; + vendorHash = "sha256-wFYR53mDaoiidE/IkSf6eDat3yTHPqxswd0iPBP2GUE="; ldflags = [ "-s" From c2bffe30d62f637f3b3f2a118180ba41b98eb003 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Tue, 14 Oct 2025 14:26:46 +0200 Subject: [PATCH 23/77] flatcc: fix build with cmake4 --- pkgs/by-name/fl/flatcc/package.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/by-name/fl/flatcc/package.nix b/pkgs/by-name/fl/flatcc/package.nix index 7c13f453f423..b0878e74b08a 100644 --- a/pkgs/by-name/fl/flatcc/package.nix +++ b/pkgs/by-name/fl/flatcc/package.nix @@ -24,6 +24,24 @@ stdenv.mkDerivation rec { url = "https://github.com/dvidelabs/flatcc/commit/5885e50f88248bc7ed398880c887ab23db89f05a.patch"; hash = "sha256-z2HSxNXerDFKtMGu6/vnzGRlqfz476bFMjg4DVfbObQ"; }) + # Bump cmake to 2.8.12, required fox 3.16 patch + (fetchpatch { + name = "bump-cmake-version.patch"; + url = "https://github.com/dvidelabs/flatcc/commit/5f07eda43caabd81a2bfa2857af0e3f26dc6d4ee.patch?full_index=1"; + hash = "sha256-eRlkQw+YGRgCUjrlYB3I8w+/cPuJhgEfNUW/+TZhHlI="; + }) + # Bump min. CMake to 3.16 and fix custom build rules + (fetchpatch { + name = "fix-cmake-version.patch"; + url = "https://github.com/dvidelabs/flatcc/commit/385c27b23236dff7ad4fa35c59fd4f9143dcaae6.patch?full_index=1"; + hash = "sha256-ORDby2LRRQdFrNc1owHKxo0TfMIxISj5SuD5oqvDFFo="; + excludes = [ + "README.md" + "CHANGELOG.md" + "test/doublevec_test/CMakeLists.txt" + "test/monster_test_cpp/CMakeLists.txt" + ]; + }) ]; nativeBuildInputs = [ cmake ]; From 557e76198ee4810c41def17c8f1c243028cbae7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Oct 2025 12:54:07 +0000 Subject: [PATCH 24/77] syslogng: 4.10.1 -> 4.10.2 --- pkgs/by-name/sy/syslogng/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sy/syslogng/package.nix b/pkgs/by-name/sy/syslogng/package.nix index 34c6e072b72b..602eb80a297b 100644 --- a/pkgs/by-name/sy/syslogng/package.nix +++ b/pkgs/by-name/sy/syslogng/package.nix @@ -65,13 +65,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "syslog-ng"; - version = "4.10.1"; + version = "4.10.2"; src = fetchFromGitHub { owner = "syslog-ng"; repo = "syslog-ng"; tag = "syslog-ng-${finalAttrs.version}"; - hash = "sha256-Iha0HExkB0oM8IxzgMjnqwY4AlrK8ifL6DU3MxgGdXQ="; + hash = "sha256-hUaDeJBW3jgXRD9uy4yzQsMm0QpprNeQZL8jjP2NOGs="; fetchSubmodules = true; }; nativeBuildInputs = [ From 63a1cb9a9d2c650c50b8891fc8d006e59e1a3102 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 14 Oct 2025 17:09:58 +0200 Subject: [PATCH 25/77] ctodo: Fix cmake build Signed-off-by: Matthias Beyer --- pkgs/by-name/ct/ctodo/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ct/ctodo/package.nix b/pkgs/by-name/ct/ctodo/package.nix index c70ac00b5b4a..de52369f8e70 100644 --- a/pkgs/by-name/ct/ctodo/package.nix +++ b/pkgs/by-name/ct/ctodo/package.nix @@ -24,6 +24,12 @@ stdenv.mkDerivation rec { readline ]; + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail \ + 'cmake_minimum_required(VERSION 2.6)' \ + 'cmake_minimum_required(VERSION 3.5)' + ''; + meta = with lib; { homepage = "http://ctodo.apakoh.dk/"; description = "Simple ncurses-based task list manager"; From 512b70f0f3745719c1f07d9484d40c7e0b3f2410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 13 Oct 2025 21:01:54 -0700 Subject: [PATCH 26/77] browsr: 1.21.0 -> 1.22.1 Diff: https://github.com/juftin/browsr/compare/v1.21.0...v1.22.1 Changelog: https://github.com/juftin/browsr/releases/tag/v1.22.1 --- pkgs/by-name/br/browsr/package.nix | 36 +++++++++++++++++------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/br/browsr/package.nix b/pkgs/by-name/br/browsr/package.nix index 7cef53974cd7..15a8007156e6 100644 --- a/pkgs/by-name/br/browsr/package.nix +++ b/pkgs/by-name/br/browsr/package.nix @@ -1,28 +1,38 @@ { lib, - python3, + python3Packages, fetchFromGitHub, + fetchpatch, extras ? [ "all" ], }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "browsr"; - version = "1.21.0"; + version = "1.22.1"; pyproject = true; src = fetchFromGitHub { owner = "juftin"; repo = "browsr"; tag = "v${version}"; - hash = "sha256-76OzJOunZRVSGalQiyX+TSukD8rRIFHxA713NqOn3PY="; + hash = "sha256-eISOADs++ZF62qkWbhFZu6JkEVtTytg3q5nbwS2m+8g="; }; - nativeBuildInputs = with python3.pkgs; [ + patches = [ + # https://github.com/juftin/browsr/pull/55 + (fetchpatch { + name = "textual-6-compat.patch"; + url = "https://github.com/juftin/browsr/commit/ab958ac982e14e836a0e44080a53c920ad50b256.patch"; + hash = "sha256-vAJ+M6Eg7N2NV7Cb2DWPYqLJIeq/DY1COECEQOnkpXE="; + }) + ]; + + build-system = with python3Packages; [ hatchling ]; - propagatedBuildInputs = - with python3.pkgs; + dependencies = + with python3Packages; [ art click @@ -38,7 +48,7 @@ python3.pkgs.buildPythonApplication rec { ] ++ lib.attrVals extras optional-dependencies; - optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3Packages; { all = [ pyarrow textual-universal-directorytree.optional-dependencies.remote @@ -51,13 +61,15 @@ python3.pkgs.buildPythonApplication rec { ]; }; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python3Packages; [ + pytest-cov-stub pytest-textual-snapshot pytestCheckHook ]; pythonRelaxDeps = [ "art" + "click" "pandas" "pymupdf" "pyperclip" @@ -71,18 +83,12 @@ python3.pkgs.buildPythonApplication rec { "browsr" ]; - pytestFlags = [ - "--snapshot-update" - ]; - disabledTests = [ # Tests require internet access "test_github_screenshot" "test_github_screenshot_license" "test_textual_app_context_path_github" "test_mkdocs_screenshot" - # Different output - "test_textual_app_context_path" ]; meta = { From 17eb6dcb27d2d6ed3e65609e8a32253ed64b1e3e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 14 Oct 2025 12:15:05 +0200 Subject: [PATCH 27/77] workflows: move eval from push to queue Running eval in the merge queue prevents eval failures after merging multiple PRs with semantic merge conflicts. It's also the base for allowing more sophisticated checks about rebuild counts in the merge queue later. When branches are directly pushed to, such as for periodic merges, this will not run Eval immediately. However, the next PR will run it as part of its Eval step and will cache the results. Any further PR will then benefit from the same caching again. This also avoids running Eval twice when pushing to staging-next or haskell-updates, where a PR is open at the same time. Here, the PR's Eval still runs on the push, of course. --- .github/workflows/eval.yml | 2 +- .github/workflows/merge-group.yml | 31 +++++++++++++++++++ .github/workflows/push.yml | 50 ------------------------------- .github/workflows/test.yml | 20 +------------ 4 files changed, 33 insertions(+), 70 deletions(-) delete mode 100644 .github/workflows/push.yml diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 9d99c888bec7..60634e8e571c 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -139,7 +139,7 @@ jobs: if: inputs.targetSha env: MATRIX_SYSTEM: ${{ matrix.system }} - # This should be very quick, because it pulls the eval results from Cachix. + # This is very quick, because it pulls the eval results from Cachix. run: | nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.singleSystem \ --argstr evalSystem "$MATRIX_SYSTEM" \ diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml index 0d21b768f6e0..6ae96f0900f7 100644 --- a/.github/workflows/merge-group.yml +++ b/.github/workflows/merge-group.yml @@ -17,6 +17,21 @@ on: permissions: {} jobs: + prepare: + runs-on: ubuntu-24.04-arm + outputs: + systems: ${{ steps.systems.outputs.systems }} + steps: + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 + with: + sparse-checkout: | + ci/supportedSystems.json + + - name: Load supported systems + id: systems + run: | + echo "systems=$(jq -c > "$GITHUB_OUTPUT" + lint: name: Lint uses: ./.github/workflows/lint.yml @@ -26,6 +41,21 @@ jobs: mergedSha: ${{ inputs.mergedSha || github.event.merge_group.head_sha }} targetSha: ${{ inputs.targetSha || github.event.merge_group.base_sha }} + eval: + name: Eval + needs: [prepare] + uses: ./.github/workflows/eval.yml + # The eval workflow requests these permissions so we must explicitly allow them, + # even though they are unused when working with the merge queue. + permissions: + # compare + statuses: write + secrets: + CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} + with: + mergedSha: ${{ inputs.mergedSha || github.event.merge_group.head_sha }} + systems: ${{ needs.prepare.outputs.systems }} + # This job's only purpose is to create the target for the "Required Status Checks" branch ruleset. # It "needs" all the jobs that should block the Merge Queue. unlock: @@ -33,6 +63,7 @@ jobs: # Modify this list to add or remove jobs from required status checks. needs: - lint + - eval runs-on: ubuntu-24.04-arm permissions: statuses: write diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml deleted file mode 100644 index d76b7f3867bd..000000000000 --- a/.github/workflows/push.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: Push - -on: - push: - branches: - - master - - staging - - release-* - - staging-* - - haskell-updates - workflow_call: - inputs: - mergedSha: - required: true - type: string - secrets: - CACHIX_AUTH_TOKEN: - required: true - -permissions: {} - -jobs: - prepare: - runs-on: ubuntu-24.04-arm - outputs: - systems: ${{ steps.systems.outputs.systems }} - steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - with: - sparse-checkout: | - ci/supportedSystems.json - - - name: Load supported systems - id: systems - run: | - echo "systems=$(jq -c > "$GITHUB_OUTPUT" - - eval: - name: Eval - needs: [prepare] - uses: ./.github/workflows/eval.yml - # Those are not actually used on push, but will throw an error if not set. - permissions: - # compare - statuses: write - secrets: - CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} - with: - mergedSha: ${{ inputs.mergedSha || github.sha }} - systems: ${{ needs.prepare.outputs.systems }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0806b61c34c9..0d5f20e3b57b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,6 +48,7 @@ jobs: })).map(file => file.filename) if (files.some(file => [ + '.github/workflows/eval.yml', '.github/workflows/lint.yml', '.github/workflows/merge-group.yml', '.github/workflows/test.yml', @@ -65,12 +66,6 @@ jobs: '.github/workflows/test.yml', ].includes(file))) core.setOutput('pr', true) - if (files.some(file => [ - '.github/workflows/eval.yml', - '.github/workflows/push.yml', - '.github/workflows/test.yml', - ].includes(file))) core.setOutput('push', true) - merge-group: if: needs.prepare.outputs.merge-group name: Merge Group @@ -98,16 +93,3 @@ jobs: secrets: CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }} - - push: - if: needs.prepare.outputs.push - name: Push - needs: [prepare] - uses: ./.github/workflows/push.yml - # Those are not actually used on the push or pull_request events, but will throw an error if not set. - permissions: - statuses: write - secrets: - CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} - with: - mergedSha: ${{ needs.prepare.outputs.mergedSha }} From 593e2467a4d57d64befc7fcd84d644426df50ede Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 14 Oct 2025 12:19:22 +0200 Subject: [PATCH 28/77] workflows/eval: remove separate attrpaths step This was only separate to work around possible delays from the target branch's eval workflow. With the switch to the merge queue, this delay is impossible - the relevant target commit will only appear once Eval has completed in the merge queue, so Eval will be guaranteed to have finished. By running attrpaths and outpaths in the same step, we share ~10 seconds of eval time, traversing through all of Nixpkgs. --- .github/workflows/eval.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 60634e8e571c..daa587908f98 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -115,26 +115,6 @@ jobs: # If it uses too much memory, slightly decrease chunkSize. # Note: Keep the same further down in sync! - # Running the attrpath generation step separately from the outpath step afterwards. - # The idea is that, *if* Eval on the target branch has not finished, yet, we will - # generate the attrpaths in the meantime - and the separate command command afterwards - # will check cachix again for whether Eval has finished. If no Eval result from the - # target branch can be found the second time, we proceed to run it in here. Attrpaths - # generation takes roughly 30 seconds, so for every normal use-case this should be more - # than enough of a head start for Eval on the target branch to finish. - # This edge-case, that Eval on the target branch is delayed is unlikely to happen anyway: - # For a commit to become the target commit of a PR, it must *already* be on the branch. - # Normally, CI should always start running on that push event *before* it starts running - # on the PR. - - name: Evaluate the ${{ matrix.system }} attribute paths at the target commit - if: inputs.targetSha - env: - MATRIX_SYSTEM: ${{ matrix.system }} - run: | - nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.attrpathsSuperset \ - --argstr evalSystem "$MATRIX_SYSTEM" \ - --argstr nixPath "nixVersions.latest" - - name: Evaluate the ${{ matrix.system }} output paths at the target commit if: inputs.targetSha env: From 7ed2c7e297db3cd90e7e3e952e5068eb24ec6aef Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 14 Oct 2025 12:31:58 +0200 Subject: [PATCH 29/77] workflows/eval: run Lix in the merge queue This change runs Lix on the target commit and Nix on the merged commit. This does two things for us at once: - We test both Lix and Nix. - We ensure that both Lix and Nix produce the same output hashes. If Lix and Nix were to produce different output hashes at some point, this would show up as rebuilds in every PR. --- .github/workflows/eval.yml | 9 +++++++-- .github/workflows/merge-group.yml | 2 ++ .github/workflows/pr.yml | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index daa587908f98..f2c7a2c13568 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -11,6 +11,9 @@ on: systems: required: true type: string + defaultVersion: + required: true + type: string testVersions: required: false default: false @@ -105,7 +108,7 @@ jobs: - name: Evaluate the ${{ matrix.system }} output paths at the merge commit env: MATRIX_SYSTEM: ${{ matrix.system }} - MATRIX_VERSION: ${{ matrix.version || 'nixVersions.latest' }} + MATRIX_VERSION: ${{ matrix.version || inputs.defaultVersion }} run: | nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A eval.singleSystem \ --argstr evalSystem "$MATRIX_SYSTEM" \ @@ -119,12 +122,14 @@ jobs: if: inputs.targetSha env: MATRIX_SYSTEM: ${{ matrix.system }} + # This must match the default version set in the Merge Queue. + VERSION: lixPackageSets.latest.lix # This is very quick, because it pulls the eval results from Cachix. run: | nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.singleSystem \ --argstr evalSystem "$MATRIX_SYSTEM" \ --arg chunkSize 8000 \ - --argstr nixPath "nixVersions.latest" \ + --argstr nixPath "$VERSION" \ --out-link target - name: Compare outpaths against the target branch diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml index 6ae96f0900f7..6298aaa4424d 100644 --- a/.github/workflows/merge-group.yml +++ b/.github/workflows/merge-group.yml @@ -55,6 +55,8 @@ jobs: with: mergedSha: ${{ inputs.mergedSha || github.event.merge_group.head_sha }} systems: ${{ needs.prepare.outputs.systems }} + # This must match the version in Eval's target step. + defaultVersion: lixPackageSets.latest.lix # This job's only purpose is to create the target for the "Required Status Checks" branch ruleset. # It "needs" all the jobs that should block the Merge Queue. diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 9f4a2ba4d0b4..a9d40fcdcf5d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -86,6 +86,7 @@ jobs: mergedSha: ${{ needs.prepare.outputs.mergedSha }} targetSha: ${{ needs.prepare.outputs.targetSha }} systems: ${{ needs.prepare.outputs.systems }} + defaultVersion: nixVersions.latest testVersions: ${{ contains(fromJSON(needs.prepare.outputs.touched), 'pinned') && !contains(fromJSON(needs.prepare.outputs.headBranch).type, 'development') }} labels: From 6800c926756798ab9c76b18b76964a8daa981cf3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Oct 2025 19:45:51 +0000 Subject: [PATCH 30/77] phpExtensions.spx: 0.4.20 -> 0.4.21 --- pkgs/development/php-packages/spx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix index bfea69412d59..2b941d458943 100644 --- a/pkgs/development/php-packages/spx/default.nix +++ b/pkgs/development/php-packages/spx/default.nix @@ -6,7 +6,7 @@ }: let - version = "0.4.20"; + version = "0.4.21"; in buildPecl { inherit version; @@ -16,7 +16,7 @@ buildPecl { owner = "NoiseByNorthwest"; repo = "php-spx"; rev = "v${version}"; - hash = "sha256-2MOl9waWY3zK5NzQ19TJKK8kE7xC4K+e9AwV+wyAHZc="; + hash = "sha256-3rVnKUZZXLxoKCW717pCiPOVWDudQpoN8lC1jQzpwuw="; }; configureFlags = [ From 8636dbdf65163aeceba296e131c84e1fa1c0ecd6 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 14 Oct 2025 21:14:39 +0100 Subject: [PATCH 31/77] trackballs: 1.3.4 -> 1.3.5 (including cmake-4 fixes) Changes: https://github.com/trackballs/trackballs/releases/tag/v1.3.5 --- pkgs/by-name/tr/trackballs/package.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/tr/trackballs/package.nix b/pkgs/by-name/tr/trackballs/package.nix index fa1f14d7d06c..a4735dbcff34 100644 --- a/pkgs/by-name/tr/trackballs/package.nix +++ b/pkgs/by-name/tr/trackballs/package.nix @@ -16,19 +16,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "trackballs"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "trackballs"; repo = "trackballs"; tag = "v${finalAttrs.version}"; - hash = "sha256-JKSiNe5mu8rRztUhduGFY6IsSMx6VyBqKcGO5EssI+8="; + hash = "sha256-Zy4o/khWAdy27P6WIU7gouNTYXLgN5ursSoSDDboXAk="; }; - postPatch = '' - substituteInPlace src/glHelp.h --replace-fail _TTF_Font TTF_Font - ''; - nativeBuildInputs = [ cmake ]; buildInputs = [ zlib From d6c630f2bbac2486fcef6f2f781ee586a57adc99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Oct 2025 20:16:43 +0000 Subject: [PATCH 32/77] firefly-iii-data-importer: 1.8.2 -> 1.8.4 --- pkgs/by-name/fi/firefly-iii-data-importer/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix index 50282d109aa5..766e6d422f4d 100644 --- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix +++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii-data-importer"; - version = "1.8.2"; + version = "1.8.4"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "data-importer"; tag = "v${finalAttrs.version}"; - hash = "sha256-Bi1LwKC2LFs1AzrZflaKFk6/DiPiSQn5pHHrh9QkqVw="; + hash = "sha256-xo1CgsPdqSw7VFlPx5aidB7h7fwot95XYlPxyW7S8yw="; }; buildInputs = [ php84 ]; @@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-qSH1aA1FdN+LmtQcJdY0JWmpkF3txHojMfev+mFMBfk="; + vendorHash = "sha256-6sTCXSMAgMQH7tQjl3UvPgqRShdEUV1Xi4R/M/j2Xxc="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-n7puQeAAmyDNkAHQK3xlQvm43W1IIyKu47fVR1a2YrA="; + hash = "sha256-gYCjxZP7pytYYgJEvW78SmzX9jZAjkAMlRv9doc+JqE="; }; composerRepository = php84.mkComposerRepository { From 0429b886ebcd2d31b6922fb175c337b89c0e6b4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Oct 2025 20:30:38 +0000 Subject: [PATCH 33/77] esp-generate: 0.5.0 -> 0.6.0 --- pkgs/by-name/es/esp-generate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/es/esp-generate/package.nix b/pkgs/by-name/es/esp-generate/package.nix index ad17d5fc3c19..09e252140c63 100644 --- a/pkgs/by-name/es/esp-generate/package.nix +++ b/pkgs/by-name/es/esp-generate/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "esp-generate"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "esp-rs"; repo = "esp-generate"; rev = "v${version}"; - hash = "sha256-rvgmmG0LhRb+eRdqmlCf514lzV0QGWPaJ8pnlTnxfvo="; + hash = "sha256-4yvJgYMaASCHHz86Fh73yd2vSo/0cIjVkwZMh55ZWKc="; }; - cargoHash = "sha256-ai8FUKHK/iHeUEgklZEDAMKoorXVDxGSZVrB7LahVV8="; + cargoHash = "sha256-OS2ZAXdOh+oL/ImIuEuo+gBsK9wk4X1vgoJbnHTJ2f4="; meta = { description = "Template generation tool to create no_std applications targeting Espressif's chips"; From 29ab95fee5b7849280db4e00ad35b94508c3e91f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Oct 2025 20:46:40 +0000 Subject: [PATCH 34/77] pfetch: 1.9.3 -> 1.9.4 --- pkgs/by-name/pf/pfetch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pf/pfetch/package.nix b/pkgs/by-name/pf/pfetch/package.nix index 0e00b882c059..700c6778e6a3 100644 --- a/pkgs/by-name/pf/pfetch/package.nix +++ b/pkgs/by-name/pf/pfetch/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "pfetch"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "Un1q32"; repo = "pfetch"; tag = version; - hash = "sha256-2rBuqqS4jzefueVploU5bs2ZytDvYv5jeSK5jOyz86Y="; + hash = "sha256-lEtRPM/uSt3vb/zhAx8Jiz3F2BhvOr17DHXaCPQlddA="; }; dontBuild = true; From 54892f54880b5c97c590d5595965cd4065eae816 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Oct 2025 21:26:26 +0000 Subject: [PATCH 35/77] python3Packages.pylint-odoo: 9.3.18 -> 9.3.21 --- pkgs/development/python-modules/pylint-odoo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint-odoo/default.nix b/pkgs/development/python-modules/pylint-odoo/default.nix index 01f41b00b9ab..c9a6d80ed969 100644 --- a/pkgs/development/python-modules/pylint-odoo/default.nix +++ b/pkgs/development/python-modules/pylint-odoo/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { pname = "pylint-odoo"; - version = "9.3.18"; + version = "9.3.21"; pyproject = true; src = fetchFromGitHub { owner = "OCA"; repo = "pylint-odoo"; tag = "v${version}"; - hash = "sha256-8nrAwjfz28INoLD4xuQ/R5lYodZjw/PqBdZAF+wBXN0="; + hash = "sha256-qNZHk8bl1mxaLzS55oV29iKGDfIKumQgME1V9PIx4vQ="; }; pythonRelaxDeps = [ From 834ad07c6cfec943dd80c10fe8fee9f85168b70e Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 14 Oct 2025 11:16:35 +0200 Subject: [PATCH 36/77] pnmixer: fix build with CMake 4 And fix compatibility with https://cmake.org/cmake/help/v4.1/policy/CMP0065.html --- .../pn/pnmixer/fix-cmake-version.patch | 33 +++++++++++++++++++ pkgs/by-name/pn/pnmixer/package.nix | 5 +++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/by-name/pn/pnmixer/fix-cmake-version.patch diff --git a/pkgs/by-name/pn/pnmixer/fix-cmake-version.patch b/pkgs/by-name/pn/pnmixer/fix-cmake-version.patch new file mode 100644 index 000000000000..6b3b16291624 --- /dev/null +++ b/pkgs/by-name/pn/pnmixer/fix-cmake-version.patch @@ -0,0 +1,33 @@ +From 3a4a988f6c69abece44fe2c77eab5f0a9ae7bbd2 Mon Sep 17 00:00:00 2001 +From: Stefan Frijters +Date: Mon, 13 Oct 2025 10:53:14 +0200 +Subject: [PATCH] Update minimum CMake version + +And fix compatibility with https://cmake.org/cmake/help/v4.1/policy/CMP0065.html +--- + CMakeLists.txt | 2 +- + src/CMakeLists.txt | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 10192bf..1bb3e0c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.10) + project(PNMixer) + + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index eb04c2b..8630a21 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -56,6 +56,7 @@ target_link_libraries(pnmixer "${PNMixer_DEPS_LDFLAGS}") + target_link_libraries(pnmixer m) + target_compile_options(pnmixer PUBLIC "${PNMixer_DEPS_CFLAGS}") + target_compile_definitions(pnmixer PUBLIC -DHAVE_CONFIG_H) ++set_property(TARGET pnmixer PROPERTY ENABLE_EXPORTS 1) + + install(TARGETS pnmixer DESTINATION "${CMAKE_INSTALL_BINDIR}") + diff --git a/pkgs/by-name/pn/pnmixer/package.nix b/pkgs/by-name/pn/pnmixer/package.nix index 06204e425d25..fe9a05624a17 100644 --- a/pkgs/by-name/pn/pnmixer/package.nix +++ b/pkgs/by-name/pn/pnmixer/package.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { sha256 = "0416pa933ddf4b7ph9zxhk5jppkk7ppcq1aqph6xsrfnka4yb148"; }; + patches = [ + # https://github.com/nicklan/pnmixer/pull/197 + ./fix-cmake-version.patch + ]; + nativeBuildInputs = [ cmake pkg-config From f7c69f0d5f123477a956f60f85a0b1a956e06020 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 14 Oct 2025 11:16:44 +0200 Subject: [PATCH 37/77] pnmixer: use finalAttrs pattern --- pkgs/by-name/pn/pnmixer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pn/pnmixer/package.nix b/pkgs/by-name/pn/pnmixer/package.nix index fe9a05624a17..a8f50dc158bc 100644 --- a/pkgs/by-name/pn/pnmixer/package.nix +++ b/pkgs/by-name/pn/pnmixer/package.nix @@ -13,14 +13,14 @@ pcre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pnmixer"; version = "0.7.2"; src = fetchFromGitHub { owner = "nicklan"; repo = "pnmixer"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0416pa933ddf4b7ph9zxhk5jppkk7ppcq1aqph6xsrfnka4yb148"; }; From d44cf28a95922338ef59445fc82dc145e9bfd7dd Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 14 Oct 2025 11:16:52 +0200 Subject: [PATCH 38/77] pnmixer: remove 'with lib' --- pkgs/by-name/pn/pnmixer/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pn/pnmixer/package.nix b/pkgs/by-name/pn/pnmixer/package.nix index a8f50dc158bc..83299045eaf6 100644 --- a/pkgs/by-name/pn/pnmixer/package.nix +++ b/pkgs/by-name/pn/pnmixer/package.nix @@ -44,15 +44,15 @@ stdenv.mkDerivation (finalAttrs: { pcre ]; - meta = with lib; { + meta = { homepage = "https://github.com/nicklan/pnmixer"; description = "ALSA volume mixer for the system tray"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ campadrenalin romildo ]; mainProgram = "pnmixer"; }; -} +}) From ac4d61cf19151a702a4d223f2d375bfa9affd632 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 14 Oct 2025 11:17:14 +0200 Subject: [PATCH 39/77] pnmixer: use hash instead of sha256 and tag instead of rev in fetcher --- pkgs/by-name/pn/pnmixer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pn/pnmixer/package.nix b/pkgs/by-name/pn/pnmixer/package.nix index 83299045eaf6..e5ea31043a16 100644 --- a/pkgs/by-name/pn/pnmixer/package.nix +++ b/pkgs/by-name/pn/pnmixer/package.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "nicklan"; repo = "pnmixer"; - rev = "v${finalAttrs.version}"; - sha256 = "0416pa933ddf4b7ph9zxhk5jppkk7ppcq1aqph6xsrfnka4yb148"; + tag = "v${finalAttrs.version}"; + hash = "sha256-iITliZrWZd0NvFgFzO49c94ry4T9J3jPIq61MZK6JhA="; }; patches = [ From 4facfedabfe4fee513de3520a02194cf6ae932be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Oct 2025 23:47:33 +0000 Subject: [PATCH 40/77] kew: 3.5.2 -> 3.5.3 --- pkgs/by-name/ke/kew/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix index c63c19e72355..8dc3fe52ff43 100644 --- a/pkgs/by-name/ke/kew/package.nix +++ b/pkgs/by-name/ke/kew/package.nix @@ -33,13 +33,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "kew"; - version = "3.5.2"; + version = "3.5.3"; src = fetchFromGitHub { owner = "ravachol"; repo = "kew"; tag = "v${finalAttrs.version}"; - hash = "sha256-vcH3TdZqEtkP7iN+KhlarGAORdHk16DgNI1mXlrizow="; + hash = "sha256-7bO9IvSTJJKiNYQzcTSI2Ugjhw1ibbyE5/fe6EDYqvI="; }; postPatch = '' From 0d80184198a113ea01b1c4bd9066f5fc78068c41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 00:30:28 +0000 Subject: [PATCH 41/77] scooter: 0.8.1 -> 0.8.2 --- pkgs/by-name/sc/scooter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/scooter/package.nix b/pkgs/by-name/sc/scooter/package.nix index 9378ae247e5d..cdb4399de160 100644 --- a/pkgs/by-name/sc/scooter/package.nix +++ b/pkgs/by-name/sc/scooter/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "scooter"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "thomasschafer"; repo = "scooter"; rev = "v${version}"; - hash = "sha256-i3FSuIEUzKyb6tIzYYOlBwlPtTrdlBsVLNsplzqNhkc="; + hash = "sha256-Fgq1FJIvgnbBGkFrFCzjIPjyTyCxxknRGtzBGUuZfIY="; }; - cargoHash = "sha256-jaNkjr5uMAf4uShIj2iA5CK/7x/s41BETteshmlZkzA="; + cargoHash = "sha256-kPJvwZhpE8k4Kv+Jai/Fp+b/YI8F7cR8acM1sc2fkf4="; # Ensure that only the `scooter` package is built (excluding `xtask`) cargoBuildFlags = [ From d9700f4e703847fe5ccdc0f85db5a62db2d02fb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 00:32:43 +0000 Subject: [PATCH 42/77] hyprshell: 4.7.1 -> 4.7.2 --- pkgs/by-name/hy/hyprshell/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hy/hyprshell/package.nix b/pkgs/by-name/hy/hyprshell/package.nix index 84ef7a83046f..6b305826956f 100644 --- a/pkgs/by-name/hy/hyprshell/package.nix +++ b/pkgs/by-name/hy/hyprshell/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hyprshell"; - version = "4.7.1"; + version = "4.7.2"; src = fetchFromGitHub { owner = "H3rmt"; repo = "hyprshell"; tag = "v${finalAttrs.version}"; - hash = "sha256-SRw1X2oC7V/h2Tqo/wTXcu6d1kKVMPrW2HGsNGE4nCA="; + hash = "sha256-6WC7vcPdtKR4iw5VHF88i/NQ+EBfvGxex8AvJONnG5w="; }; - cargoHash = "sha256-ULuztkKukOyfQkiGZY7HtWn5nSs2PWX8B86FQP/z7RU="; + cargoHash = "sha256-g23W5cgGxWNyJ4uew2x12vgF5Bvaid1+phV2fxyHbas="; nativeBuildInputs = [ wrapGAppsHook4 From 96b9dde1666ae7bff7a3771830617d895ba0da40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 01:11:12 +0000 Subject: [PATCH 43/77] sentry-native: 0.11.2 -> 0.11.3 --- pkgs/by-name/se/sentry-native/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix index fbf37efcec93..aa009698916a 100644 --- a/pkgs/by-name/se/sentry-native/package.nix +++ b/pkgs/by-name/se/sentry-native/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; tag = version; - hash = "sha256-t1wv6/HFOo6UVkrurIg/GbqZTfZBrfrdIEKyqg86M/4="; + hash = "sha256-I+vWQWxFpvLnfW7S3YufjM0CD8YgaLy/FL6xGndiXwE="; }; nativeBuildInputs = [ From 89d9e5f3ba2fe34fc4bab092dd37068886b79f5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 01:29:16 +0000 Subject: [PATCH 44/77] all-the-package-names: 2.0.2228 -> 2.0.2235 --- pkgs/by-name/al/all-the-package-names/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix index ebbf35413cbc..edf22fb4eccd 100644 --- a/pkgs/by-name/al/all-the-package-names/package.nix +++ b/pkgs/by-name/al/all-the-package-names/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "all-the-package-names"; - version = "2.0.2228"; + version = "2.0.2235"; src = fetchFromGitHub { owner = "nice-registry"; repo = "all-the-package-names"; tag = "v${version}"; - hash = "sha256-Qq5dHI6Z33MbGvOKSzONeYgb/u0kgH3PFPV9zhfjkyY="; + hash = "sha256-I2E1V296tljsvtpfU5xlUkKNEeEZb4qtM1WDLXQZHbg="; }; - npmDepsHash = "sha256-NxyOqp3chgionveBfCVN5VnMF7cLZhmV15Ff5n91lQQ="; + npmDepsHash = "sha256-p1IBNK6dRBnEUEZ4bIMoGcVSPoecnKWgRtuUJTYW7q8="; passthru.updateScript = nix-update-script { }; From e52918f73bd88be3d4cd991324f1e3bc175fe851 Mon Sep 17 00:00:00 2001 From: botnk Date: Wed, 15 Oct 2025 01:33:24 +0000 Subject: [PATCH 45/77] shader-slang: 2025.18.2 -> 2025.19 Changelog: https://github.com/shader-slang/slang/releases/tag/v2025.19 --- pkgs/by-name/sh/shader-slang/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix index e6fd7ceecce5..699824fb99cc 100644 --- a/pkgs/by-name/sh/shader-slang/package.nix +++ b/pkgs/by-name/sh/shader-slang/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shader-slang"; - version = "2025.18.2"; + version = "2025.19"; src = fetchFromGitHub { owner = "shader-slang"; repo = "slang"; tag = "v${finalAttrs.version}"; - hash = "sha256-9upf/4Ix4ReV4OlkPMzLMJo4DlAXydQLSEp+GM+tN2g="; + hash = "sha256-WG+yW76iFrrYFldCp85LcbwQ8cz61NkAvdlvIfaPgac="; fetchSubmodules = true; }; From 120e6a290408d559730b863a33a8fb47e41f355a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 02:16:50 +0000 Subject: [PATCH 46/77] nelm: 1.13.0 -> 1.13.2 --- pkgs/by-name/ne/nelm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/nelm/package.nix b/pkgs/by-name/ne/nelm/package.nix index 05bf37f3b047..d31162a9ef91 100644 --- a/pkgs/by-name/ne/nelm/package.nix +++ b/pkgs/by-name/ne/nelm/package.nix @@ -9,16 +9,16 @@ }: buildGoModule (finalAttrs: { pname = "nelm"; - version = "1.13.0"; + version = "1.13.2"; src = fetchFromGitHub { owner = "werf"; repo = "nelm"; tag = "v${finalAttrs.version}"; - hash = "sha256-uDCumcUNIMcvqYrV6iDMs4PSxuLodGzR/JyllwT6xn0="; + hash = "sha256-g/JnFD1TPVKllY1yrODJ9P0bJe2357B11XAn9tQPLE8="; }; - vendorHash = "sha256-XzDIufMdDIaDfXrDutUak5/0nUo11RkD63c+Fpk76Xw="; + vendorHash = "sha256-yd9qSQi7ktbI9b5eaTc98TjhxDsBVvh9qrf3+F2Twu4="; subPackages = [ "cmd/nelm" ]; From 83b3fedcb48b9a95ff348a3dec03776a4af6b726 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 02:39:40 +0000 Subject: [PATCH 47/77] vacuum-go: 0.18.5 -> 0.18.6 --- pkgs/by-name/va/vacuum-go/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index e5f6bb56ceea..76d774d12bd7 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -7,14 +7,14 @@ buildGoModule (finalAttrs: { pname = "vacuum-go"; - version = "0.18.5"; + version = "0.18.6"; src = fetchFromGitHub { owner = "daveshanley"; repo = "vacuum"; # using refs/tags because simple version gives: 'the given path has multiple possibilities' error tag = "v${finalAttrs.version}"; - hash = "sha256-vsdSRsfGXjWlYxl3a6cGWJ7IadLP7KIM3lFkUlboTj4="; + hash = "sha256-9qRdikwZcTEZEQON2/n3dy9FA34Bu8YTfNfssOcUwgg="; }; vendorHash = "sha256-+GkxN20mZD/ZBTCjmjiDcEAJix2Ssn9HsNrUtQkrI18="; From 2b92df8a7b5e1c478347b3e362b6d81d47be0ec0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 03:33:27 +0000 Subject: [PATCH 48/77] home-assistant-custom-components.oref_alert: 3.2.4 -> 4.0.0 --- .../home-assistant/custom-components/oref_alert/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix index 3169b45ac856..7bd737681d52 100644 --- a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix +++ b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix @@ -13,13 +13,13 @@ buildHomeAssistantComponent rec { owner = "amitfin"; domain = "oref_alert"; - version = "3.2.4"; + version = "4.0.0"; src = fetchFromGitHub { owner = "amitfin"; repo = "oref_alert"; tag = "v${version}"; - hash = "sha256-+kZOwepyfehETfRDeA4w0eTaGSvkXNzG5rL2wdAKOy8="; + hash = "sha256-WMWt2QjwWDIfNbD6/YGc91GASmjNhzfLREMHvc2eOdE="; }; dependencies = [ From 473fc1f22dd26ff0268c55f20910d0b050787a64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 04:42:22 +0000 Subject: [PATCH 49/77] tokyonight-gtk-theme: 0-unstable-2025-09-09 -> 0-unstable-2025-10-14 --- pkgs/by-name/to/tokyonight-gtk-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix index 216cef87e8b0..d7570353e5cb 100644 --- a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix +++ b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix @@ -71,13 +71,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2025-09-09"; + version = "0-unstable-2025-10-14"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Tokyonight-GTK-Theme"; - rev = "93295bf8688724ea8c529c4fe3fa3fda1ebda2c6"; - hash = "sha256-Cf6kBU4GVdZvuKtYrRFsn3QZjRTLiJ+Aod4uA9t7qj4="; + rev = "9d67b24f1d326816a645ba47933f9986a1ff8a23"; + hash = "sha256-KsVa5tAi8mPmfSxtO34swNErRgAprBV6xr1+2rkCXCI="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From b59cd913347a3c4d335506511a3617ef66a60b7a Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Wed, 15 Oct 2025 08:06:23 +0200 Subject: [PATCH 50/77] claude-code: 2.0.14 -> 2.0.15 https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md --- .../vscode/extensions/anthropic.claude-code/default.nix | 4 ++-- pkgs/by-name/cl/claude-code/package-lock.json | 4 ++-- pkgs/by-name/cl/claude-code/package.nix | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 983376d01fb0..09478151f196 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-code"; publisher = "anthropic"; - version = "2.0.14"; - hash = "sha256-+3GkCBfAAIaORU+qKGv6OmN2w9aXt3QKMgWtyLMJUS0="; + version = "2.0.15"; + hash = "sha256-TKN0IR/0pzbcusO1J9n7sodqbrmzw4u4EEXkmFKb3co="; }; meta = { diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 3c76d6cb7b1c..4d7863b7ee79 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,12 +1,12 @@ { "name": "@anthropic-ai/claude-code", - "version": "2.0.14", + "version": "2.0.15", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.0.14", + "version": "2.0.15", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 077af090e2eb..00e4ac745194 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,14 +7,14 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "2.0.14"; + version = "2.0.15"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-U/wd00eva/qbSS4LpW1L7nmPW4dT9naffeMkHQ5xr5o="; + hash = "sha256-wMRW3rp/AimeqC6XcO+ouI39ZdcFMKF4wmA4EnCTQ3g="; }; - npmDepsHash = "sha256-ugI5JSCxEneQmIMF2rzOWihMw9RuZjNco4YRNmaQ69A="; + npmDepsHash = "sha256-g03tfNJjx/KIUu14/mqranKR4G8mo9ig74iRgCdiJuE="; postPatch = '' cp ${./package-lock.json} package-lock.json From ac24a9cde52ed7bbb491ca8a837facce7847800f Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Tue, 14 Oct 2025 23:44:05 -0700 Subject: [PATCH 51/77] gappa: 1.6.0 -> 1.6.1 --- pkgs/by-name/ga/gappa/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gappa/package.nix b/pkgs/by-name/ga/gappa/package.nix index 0d853df0ca2c..d5e7039469bb 100644 --- a/pkgs/by-name/ga/gappa/package.nix +++ b/pkgs/by-name/ga/gappa/package.nix @@ -5,7 +5,7 @@ gmp, mpfr, boost, - version ? "1.6.0", + version ? "1.6.1", }: stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://gappa.gitlabpages.inria.fr/releases/gappa-${version}.tar.gz"; - hash = "sha256-aNht0Ttv+gzS9eLzu4PQitRK/zQN9QQ4YOEjQ2d9xIM="; + hash = "sha256-1ux5ImKR8edXyvL21w3jY2o4/fATEjO2SMzS8B0o8Ok="; }; buildInputs = [ From 69ae0e586f19d6fbd629d80bdccbdca2221b159d Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Tue, 14 Oct 2025 23:46:41 -0700 Subject: [PATCH 52/77] gappa: add nix-update-script and versionCheckHook --- pkgs/by-name/ga/gappa/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/ga/gappa/package.nix b/pkgs/by-name/ga/gappa/package.nix index d5e7039469bb..46830b039f15 100644 --- a/pkgs/by-name/ga/gappa/package.nix +++ b/pkgs/by-name/ga/gappa/package.nix @@ -6,6 +6,8 @@ mpfr, boost, version ? "1.6.1", + versionCheckHook, + nix-update-script, }: stdenv.mkDerivation { @@ -26,6 +28,11 @@ stdenv.mkDerivation { buildPhase = "./remake"; installPhase = "./remake install"; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://gappa.gitlabpages.inria.fr/"; description = "Verifying and formally proving properties on numerical programs dealing with floating-point or fixed-point arithmetic"; From e9daeacc1ad0f100f5a3c590adb3a33f901136b1 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Tue, 14 Oct 2025 23:50:45 -0700 Subject: [PATCH 53/77] gappa: cleanup --- pkgs/by-name/ga/gappa/package.nix | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ga/gappa/package.nix b/pkgs/by-name/ga/gappa/package.nix index 46830b039f15..6df1dded2850 100644 --- a/pkgs/by-name/ga/gappa/package.nix +++ b/pkgs/by-name/ga/gappa/package.nix @@ -5,28 +5,42 @@ gmp, mpfr, boost, - version ? "1.6.1", versionCheckHook, nix-update-script, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "gappa"; - inherit version; + version = "1.6.1"; src = fetchurl { - url = "https://gappa.gitlabpages.inria.fr/releases/gappa-${version}.tar.gz"; + url = "https://gappa.gitlabpages.inria.fr/releases/gappa-${finalAttrs.version}.tar.gz"; hash = "sha256-1ux5ImKR8edXyvL21w3jY2o4/fATEjO2SMzS8B0o8Ok="; }; + strictDeps = true; + buildInputs = [ gmp mpfr boost.dev ]; - buildPhase = "./remake"; - installPhase = "./remake install"; + buildPhase = '' + runHook preBuild + + ./remake + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + ./remake install + + runHook postInstall + ''; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; @@ -44,4 +58,4 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ vbgl ]; platforms = lib.platforms.all; }; -} +}) From 376783063bd25b7c32658ce916a31282b6d56c8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 06:54:15 +0000 Subject: [PATCH 54/77] forecast: 0-unstable-2025-10-07 -> 0-unstable-2025-10-09 --- pkgs/by-name/fo/forecast/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix index 987744b3dfb6..10484c3b568b 100644 --- a/pkgs/by-name/fo/forecast/package.nix +++ b/pkgs/by-name/fo/forecast/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage { pname = "forecast"; - version = "0-unstable-2025-10-07"; + version = "0-unstable-2025-10-09"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "forecast"; - rev = "e384cacb53dc58656f56659409060fc16f6a2351"; - hash = "sha256-BkL4B4RXcntDUjDy5UPUaxSglzcM3h3kKq5LsCtCukw="; + rev = "f4dca2317007bc3316b22456e36a76d50500ccc8"; + hash = "sha256-zbL4a5haggMJEN7vbe+v026Qo4BFZvtoH8QaZPmpcBw="; }; - cargoHash = "sha256-aiKxgUnW711c2vhXDKVt0USTUZD6CyWB3tT6UzjqNSg="; + cargoHash = "sha256-di7zjwI0/6NB2cAih3d7iqwSb+o/607jbgJN1MtbZX8="; nativeBuildInputs = [ libcosmicAppHook From cea7911fa6a34049de1b7a3cba5f7ba799d0f9db Mon Sep 17 00:00:00 2001 From: Gavin John Date: Sun, 11 May 2025 00:25:34 -0700 Subject: [PATCH 55/77] direwolf: move to by-name --- .../di/direwolf/package.nix} | 21 +++++++++---------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 10 insertions(+), 15 deletions(-) rename pkgs/{applications/radio/direwolf/default.nix => by-name/di/direwolf/package.nix} (72%) diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/by-name/di/direwolf/package.nix similarity index 72% rename from pkgs/applications/radio/direwolf/default.nix rename to pkgs/by-name/di/direwolf/package.nix index ef11484bb423..f917882ff15c 100644 --- a/pkgs/applications/radio/direwolf/default.nix +++ b/pkgs/by-name/di/direwolf/package.nix @@ -7,7 +7,8 @@ alsa-lib, gpsd, gpsdSupport ? false, - hamlib, + hamlib_4, + hamlib ? hamlib_4, hamlibSupport ? true, perl, portaudio, @@ -64,23 +65,21 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace conf/CMakeLists.txt \ - --replace /etc/udev/rules.d/ $out/lib/udev/rules.d/ + --replace-fail /etc/udev/rules.d/ $out/lib/udev/rules.d/ substituteInPlace src/symbols.c \ - --replace /usr/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt \ - --replace /opt/local/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt + --replace-fail /usr/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt \ + --replace-fail /opt/local/share/direwolf/symbols-new.txt $out/share/direwolf/symbols-new.txt substituteInPlace src/decode_aprs.c \ - --replace /usr/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt \ - --replace /opt/local/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt + --replace-fail /usr/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt \ + --replace-fail /opt/local/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt substituteInPlace cmake/cpack/direwolf.desktop.in \ - --replace 'Terminal=false' 'Terminal=true' \ - --replace 'Exec=@APPLICATION_DESKTOP_EXEC@' 'Exec=direwolf' - substituteInPlace src/dwgpsd.c \ - --replace 'GPSD_API_MAJOR_VERSION > 11' 'GPSD_API_MAJOR_VERSION > 14' + --replace-fail 'Terminal=false' 'Terminal=true' \ + --replace-fail 'Exec=@APPLICATION_DESKTOP_EXEC@' 'Exec=direwolf' '' + lib.optionalString extraScripts '' patchShebangs scripts/dwespeak.sh substituteInPlace scripts/dwespeak.sh \ - --replace espeak ${espeak}/bin/espeak + --replace-fail espeak ${espeak}/bin/espeak ''; doInstallCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5077b829332..a2c59749b7bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10959,10 +10959,6 @@ with pkgs; dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; - direwolf = callPackage ../applications/radio/direwolf { - hamlib = hamlib_4; - }; - djv = callPackage ../by-name/dj/djv/package.nix { openexr = openexr_2; }; djview4 = djview; From 1479999a571653df6620ec816fc1ed57cffd677b Mon Sep 17 00:00:00 2001 From: Gavin John Date: Sun, 11 May 2025 00:26:04 -0700 Subject: [PATCH 56/77] direwolf: use tag instead of rev --- pkgs/by-name/di/direwolf/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/di/direwolf/package.nix b/pkgs/by-name/di/direwolf/package.nix index f917882ff15c..977c4b9d5cf3 100644 --- a/pkgs/by-name/di/direwolf/package.nix +++ b/pkgs/by-name/di/direwolf/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "wb2osz"; repo = "direwolf"; - rev = version; + tag = version; hash = "sha256-Vbxc6a6CK+wrBfs15dtjfRa1LJDKKyHMrg8tqsF7EX4="; }; From efacf1489adec94ba242fe8e18e56e0aa720ad77 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Sun, 11 May 2025 00:27:18 -0700 Subject: [PATCH 57/77] direwolf: switch to finalAttrs --- pkgs/by-name/di/direwolf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/direwolf/package.nix b/pkgs/by-name/di/direwolf/package.nix index 977c4b9d5cf3..e3861bd4fceb 100644 --- a/pkgs/by-name/di/direwolf/package.nix +++ b/pkgs/by-name/di/direwolf/package.nix @@ -19,14 +19,14 @@ extraScripts ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "direwolf"; version = "1.7"; src = fetchFromGitHub { owner = "wb2osz"; repo = "direwolf"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Vbxc6a6CK+wrBfs15dtjfRa1LJDKKyHMrg8tqsF7EX4="; }; @@ -94,4 +94,4 @@ stdenv.mkDerivation rec { sarcasticadmin ]; }; -} +}) From 675ddbb87b74deae60fddbd9c5a19a50bcb475fe Mon Sep 17 00:00:00 2001 From: Gavin John Date: Sun, 11 May 2025 00:27:47 -0700 Subject: [PATCH 58/77] direwolf: remove with lib --- pkgs/by-name/di/direwolf/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/di/direwolf/package.nix b/pkgs/by-name/di/direwolf/package.nix index e3861bd4fceb..40f60ec32dec 100644 --- a/pkgs/by-name/di/direwolf/package.nix +++ b/pkgs/by-name/di/direwolf/package.nix @@ -84,12 +84,12 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; - meta = with lib; { + meta = { description = "Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway"; homepage = "https://github.com/wb2osz/direwolf/"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ lasandell sarcasticadmin ]; From 47d72b163e77086a72eb9ca1c29c915694ad02fc Mon Sep 17 00:00:00 2001 From: Gavin John Date: Sun, 11 May 2025 00:28:01 -0700 Subject: [PATCH 59/77] direwolf: add pandapip1 to maintainers --- pkgs/by-name/di/direwolf/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/di/direwolf/package.nix b/pkgs/by-name/di/direwolf/package.nix index 40f60ec32dec..3e19b823592a 100644 --- a/pkgs/by-name/di/direwolf/package.nix +++ b/pkgs/by-name/di/direwolf/package.nix @@ -92,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ lasandell sarcasticadmin + pandapip1 ]; }; }) From 6e885aa09c4f7b0cc35308926457776cfa54e9bd Mon Sep 17 00:00:00 2001 From: Gavin John Date: Sun, 11 May 2025 00:29:00 -0700 Subject: [PATCH 60/77] direwolf: add nix-update-script --- pkgs/by-name/di/direwolf/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/di/direwolf/package.nix b/pkgs/by-name/di/direwolf/package.nix index 3e19b823592a..0413e7ea9963 100644 --- a/pkgs/by-name/di/direwolf/package.nix +++ b/pkgs/by-name/di/direwolf/package.nix @@ -16,6 +16,7 @@ espeak, udev, udevCheckHook, + nix-update-script, extraScripts ? false, }: @@ -84,6 +85,8 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway"; homepage = "https://github.com/wb2osz/direwolf/"; From dd9b2be8ea067a2357b20faef7c210bf35e2ec8a Mon Sep 17 00:00:00 2001 From: Gavin John Date: Sun, 11 May 2025 00:51:45 -0700 Subject: [PATCH 61/77] direwolf: add meta.mainProgram --- pkgs/by-name/di/direwolf/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/di/direwolf/package.nix b/pkgs/by-name/di/direwolf/package.nix index 0413e7ea9963..348a1d65cc41 100644 --- a/pkgs/by-name/di/direwolf/package.nix +++ b/pkgs/by-name/di/direwolf/package.nix @@ -90,6 +90,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway"; homepage = "https://github.com/wb2osz/direwolf/"; + mainProgram = "direwolf"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ From d7fbda50e00b1b34f1ddcd4dee46afcaa62eb206 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Mon, 12 May 2025 09:01:41 -0700 Subject: [PATCH 62/77] direwolf: add versionCheckHook --- pkgs/by-name/di/direwolf/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/di/direwolf/package.nix b/pkgs/by-name/di/direwolf/package.nix index 348a1d65cc41..b25d6eed655f 100644 --- a/pkgs/by-name/di/direwolf/package.nix +++ b/pkgs/by-name/di/direwolf/package.nix @@ -16,6 +16,7 @@ espeak, udev, udevCheckHook, + versionCheckHook, nix-update-script, extraScripts ? false, }: @@ -59,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { perl espeak ]; + nativeInstallCheckInputs = [ versionCheckHook ]; preConfigure = lib.optionals (!extraScripts) '' echo "" > scripts/CMakeLists.txt @@ -85,6 +87,8 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; + versionCheckProgramArg = [ "-u" ]; + passthru.updateScript = nix-update-script { }; meta = { From 25e32a44f52eabce8e005cba315d4cb52e96a069 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Sun, 11 May 2025 01:03:55 -0700 Subject: [PATCH 63/77] direwolf-unstable: init at 1.7-unstable-2025-04-29 --- pkgs/by-name/di/direwolf-unstable/package.nix | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/di/direwolf-unstable/package.nix diff --git a/pkgs/by-name/di/direwolf-unstable/package.nix b/pkgs/by-name/di/direwolf-unstable/package.nix new file mode 100644 index 000000000000..7a9352f7ffb4 --- /dev/null +++ b/pkgs/by-name/di/direwolf-unstable/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchFromGitHub, + direwolf, + nix-update-script, + hamlibSupport ? true, + gpsdSupport ? true, + extraScripts ? false, +}: + +(direwolf.override { + inherit hamlibSupport gpsdSupport extraScripts; +}).overrideAttrs + (oldAttrs: { + version = "1.7-unstable-2025-04-29"; + + src = fetchFromGitHub { + owner = "wb2osz"; + repo = "direwolf"; + rev = "486b3cf1f685502af7dc87b0f9c9cead6800d47b"; + hash = "sha256-VFBkOWHGZP7GjekHL3GY3BGkVXQbtyD1YPmu0xaQ1ME="; + }; + + postPatch = + builtins.replaceStrings + [ + "decode_aprs.c" + "tocalls.txt" + "--replace-fail /etc/udev/rules.d/" + ] + [ + "deviceid.c" + "tocalls.yaml" + "--replace-fail /usr/lib/udev/rules.d/ $out/lib/udev/rules.d/ --replace-fail /etc/udev/rules.d/" + ] + oldAttrs.postPatch; + + dontVersionCheck = true; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=dev" ]; }; + }) From 9d2ea77076beea788ca8de42a78fd51953cd6e1c Mon Sep 17 00:00:00 2001 From: Kiyotoko Date: Wed, 15 Oct 2025 10:07:08 +0200 Subject: [PATCH 64/77] vscode-extensions.oracle.oracle-java: init at 24.1.2 --- .../editors/vscode/extensions/default.nix | 2 ++ .../extensions/oracle.oracle-java/default.nix | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 828eff8aef60..1c3c62270a7b 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3676,6 +3676,8 @@ let oops418.nix-env-picker = callPackage ./oops418.nix-env-picker { }; + oracle.oracle-java = callPackage ./oracle.oracle-java { }; + ph-hawkins.arc-plus = callPackage ./ph-hawkins.arc-plus { }; phind.phind = buildVscodeMarketplaceExtension { diff --git a/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix b/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix new file mode 100644 index 000000000000..5fc3cec8a9c9 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix @@ -0,0 +1,22 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension rec { + mktplcRef = { + name = "oracle-java"; + publisher = "oracle"; + version = "24.1.2"; + hash = "sha256-sw+FJbpdkHABKgnRsA5tS6FYEjBD0/iVRCHHzf49Xx4="; + }; + + meta = { + changelog = "https://github.com/oracle/javavscode/releases/tag/v${mktplcRef.version}"; + description = "Java Platform Extension for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=oracle.oracle-java"; + homepage = "https://github.com/oracle/javavscode/"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.kiyotoko ]; + }; +} From 4940592b94d08dc024219b447712ba36465066c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 08:14:26 +0000 Subject: [PATCH 65/77] eigenwallet: 3.1.1 -> 3.1.3 --- pkgs/by-name/ei/eigenwallet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ei/eigenwallet/package.nix b/pkgs/by-name/ei/eigenwallet/package.nix index 30b015c2f6dc..75b897afdc2f 100644 --- a/pkgs/by-name/ei/eigenwallet/package.nix +++ b/pkgs/by-name/ei/eigenwallet/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { name = "eigenwallet"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb"; - hash = "sha256-QkfJ8ixt2HzWmRNltoZhis/EJ546DQgthWqVyqGpvvA="; + hash = "sha256-HQqkoyzKqy4eaCfEwwkRUjgex834kkt2OR3Ib16bE0Y="; }; nativeBuildInputs = [ From fc714e340c9ed730ad1d590f75184619147fc9c0 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 10 Oct 2025 23:45:54 +0200 Subject: [PATCH 66/77] lomiri.trust-store: Fix CMake 4 compatibility --- pkgs/desktops/lomiri/development/trust-store/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/desktops/lomiri/development/trust-store/default.nix b/pkgs/desktops/lomiri/development/trust-store/default.nix index f3526e8f4102..f9ec48f3163a 100644 --- a/pkgs/desktops/lomiri/development/trust-store/default.nix +++ b/pkgs/desktops/lomiri/development/trust-store/default.nix @@ -56,6 +56,14 @@ stdenv.mkDerivation (finalAttrs: { # Fix compatibility with glog 0.7.x # Remove when https://gitlab.com/ubports/development/core/trust-store/-/merge_requests/18 merged & in release ./1001-treewide-Switch-to-glog-CMake-module.patch + + # Fix compatibility with CMake 4 and beyond (for now) + # Remove when version > 2.0.2 + (fetchpatch { + name = "1002-trust-store-CMakeLists.txt-Bump-minimum-version-to-3.10.patch"; + url = "https://gitlab.com/ubports/development/core/trust-store/-/commit/64bc51f45e1407f16d389120508c2bcddf9e0d5b.patch"; + hash = "sha256-+ZkTQd6wphd29dTmEIBI7nADFjPQD5012/FVFOtdGbI="; + }) ]; postPatch = '' From 4aff74ea960dbee21e6710836a9b058fc032ef37 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 10 Oct 2025 23:57:20 +0200 Subject: [PATCH 67/77] lomiri.qtmir: 0.8.0-unstable-2024-03-06 -> 0.8.0-unstable-2025-05-20 Includes fix for CMake 4 compatibility --- .../lomiri/development/qtmir/default.nix | 38 ++----------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/pkgs/desktops/lomiri/development/qtmir/default.nix b/pkgs/desktops/lomiri/development/qtmir/default.nix index 4de78fc2250a..0b2993ab0727 100644 --- a/pkgs/desktops/lomiri/development/qtmir/default.nix +++ b/pkgs/desktops/lomiri/development/qtmir/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, testers, cmake, cmake-extras, @@ -37,13 +36,13 @@ stdenv.mkDerivation (finalAttrs: { # Not regular qtmir, experimental support for Mir 2.x # Currently following https://gitlab.com/ubports/development/core/qtmir/-/tree/personal/sunweaver/debian-upstream pname = "qtmir-debian-upstream"; - version = "0.8.0-unstable-2024-03-06"; + version = "0.8.0-unstable-2025-05-20"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/qtmir"; - rev = "de639c3a482ac6c59b9be02abb839a8c96158041"; - hash = "sha256-AKSzkGl6bAoR4I2lolNRUp67VS/PiZnrPpCYtTlKWKc="; + rev = "b35762f5198873560138a810b387ae9401615c02"; + hash = "sha256-v5mdu3XLK4F5O56GDItyeCFsFMey4JaNWwXRlgjKFMA="; }; outputs = [ @@ -51,37 +50,6 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; - patches = [ - # Mir 2.15 compatibility patch - # Remove when https://gitlab.com/ubports/development/core/qtmir/-/merge_requests/70 merged into branch - (fetchpatch { - name = "0001-qtmir-Update-for-Mir-2.15-removals.patch"; - url = "https://gitlab.com/ubports/development/core/qtmir/-/commit/ead5cacd4d69094ab956627f4dd94ecaff1fd69e.patch"; - hash = "sha256-hUUUnYwhNH3gm76J21M8gA5okaRd/Go03ZFJ4qn0JUo="; - }) - - # Remove when https://gitlab.com/ubports/development/core/qtmir/-/merge_requests/72 merged in branch - (fetchpatch { - name = "0002-qtmir-Add-more-better-GNUInstallDirs-variables-usage.patch"; - url = "https://gitlab.com/ubports/development/core/qtmir/-/commit/87e2cd31052ce15e9625c1327807a320ee5d12af.patch"; - hash = "sha256-MTE9tHw+xJhraEO1up7dLg0UIcmfHXgWOeuyYrVu2wc="; - }) - - # Remove when https://gitlab.com/ubports/development/core/qtmir/-/merge_requests/73 merged in branch - (fetchpatch { - name = "0003-qtmir-CMakeLists-Only-require-test-dependencies-when-building-tests.patch"; - url = "https://gitlab.com/ubports/development/core/qtmir/-/commit/b7144e67bcbb4cfbd2283d5d05146fb22b7d8cd4.patch"; - hash = "sha256-Afbj40MopztchDnk6fphTYk86YrQkiK8L1e/oXiL1Mw="; - }) - - # Remove when https://gitlab.com/ubports/development/core/qtmir/-/merge_requests/74 merged in branch - (fetchpatch { - name = "0004-qtmir-CMakeLists-Drop-call-of-Qt-internal-macro.patch"; - url = "https://gitlab.com/ubports/development/core/qtmir/-/commit/8f9c599a4dbc4cf35e289157fd0c82df55b9f8d9.patch"; - hash = "sha256-SMAErXnlMtVleWRPgO4xuUI7gAAy6W18LxtgXgetRA4="; - }) - ]; - postPatch = '' # 10s timeout for Mir startup is too tight for VM tests on weaker hardwre (aarch64) substituteInPlace src/platforms/mirserver/qmirserver_p.cpp \ From efe67b91064955da22435939daee0842832e8910 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 11 Oct 2025 00:19:30 +0200 Subject: [PATCH 68/77] lomiri.teleports.passthru.tdlib: Fix CMake 4 compatibility And make it separately buildable. --- .../lomiri/applications/teleports/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/lomiri/applications/teleports/default.nix b/pkgs/desktops/lomiri/applications/teleports/default.nix index fa5a9417819f..07818bcf22e5 100644 --- a/pkgs/desktops/lomiri/applications/teleports/default.nix +++ b/pkgs/desktops/lomiri/applications/teleports/default.nix @@ -37,6 +37,15 @@ let rev = "3179d35694a28267a0b6273fc9b5bdce3b6b1235"; hash = "sha256-XvqqDXaFclWK/XpIxOqAXQ9gcc/dTljl841CN0KrlyA="; }; + + # CMake 4 compat + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)' 'cmake_minimum_required(VERSION 3.10 FATAL_ERROR)' + + substituteInPlace td/generate/tl-parser/CMakeLists.txt \ + --replace-fail 'cmake_minimum_required(VERSION 3.0 FATAL_ERROR)' 'cmake_minimum_required(VERSION 3.10 FATAL_ERROR)' + ''; } ); in @@ -101,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { quazip quickflux rlottie - tdlib-1811 + finalAttrs.passthru.tdlib ]; postInstall = '' @@ -115,6 +124,8 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { + tdlib = tdlib-1811; + updateScript = gitUpdater { rev-prefix = "v"; }; tests.vm = nixosTests.teleports; }; From d061af0b7e876c8536c12a050170e04a55dc3a00 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 11 Oct 2025 00:24:47 +0200 Subject: [PATCH 69/77] lomiri.lomiri-push-qml: 0-unstable-2022-09-15 -> 0.3.1 Includes fix for CMake 4 compatibility. Also add an updateScript. --- .../lomiri/qml/lomiri-push-qml/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix b/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix index e6d9ff6ba3a3..b7621ad5cde1 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, + gitUpdater, cmake, lomiri-api, lomiri-indicator-network, @@ -13,24 +13,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-push-qml"; - version = "0-unstable-2022-09-15"; + version = "0.3.1"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-push-qml"; - rev = "6f87ee5cf92e2af0e0ce672835e71704e236b8c0"; - hash = "sha256-ezLcQRJ7Sq/TVbeGJL3Vq2lzBe7StRRCrWXZs2CCUX8="; + tag = finalAttrs.version; + hash = "sha256-1HJkcAe5ixqmEACy4mSk5dSCPf4FsY3tzH6v09SSH+M="; }; - patches = [ - # Remove when https://gitlab.com/ubports/development/core/lomiri-push-qml/-/merge_requests/6 merged - (fetchpatch { - name = "0001-lomiri-push-qml-Stop-using-qt5_use_modules.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-push-qml/-/commit/a4268c98b9f50fdd52da69c173d377f78ea93104.patch"; - hash = "sha256-OijTB5+I9/wabT7dX+DkvoEROKzAUIKhBZkkhqq5Oig="; - }) - ]; - postPatch = '' # Queries QMake for QML install location, returns QtBase build path substituteInPlace src/*/PushNotifications/CMakeLists.txt \ @@ -64,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: { export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Lomiri Push Notifications QML plugin"; homepage = "https://gitlab.com/ubports/development/core/lomiri-push-qml"; From 338973affa344c347e3a42de2710bc41817d2d38 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 11 Oct 2025 00:27:17 +0200 Subject: [PATCH 70/77] libsForQt5.quickflux: Fix CMake 4 compatibility --- pkgs/development/libraries/quickflux/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/quickflux/default.nix b/pkgs/development/libraries/quickflux/default.nix index be38b2f1b01a..47595751bf6b 100644 --- a/pkgs/development/libraries/quickflux/default.nix +++ b/pkgs/development/libraries/quickflux/default.nix @@ -29,6 +29,11 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace CMakeLists.txt \ --replace-fail 'quickflux STATIC' 'quickflux' \ --replace-fail 'DESTINATION include' 'DESTINATION ''${CMAKE_INSTALL_INCLUDEDIR}' + + # Fix CMake 4 compat + # https://github.com/benlau/quickflux/pull/37 + substituteInPlace CMakeLists.txt \ + --replace-fail 'cmake_minimum_required(VERSION 3.0.0)' 'cmake_minimum_required(VERSION 3.10)' ''; strictDeps = true; From 9e32dc6ddb6c513a6567ff366baeadd5133162af Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 11 Oct 2025 15:03:13 +0200 Subject: [PATCH 71/77] lomiri.teleports: Fix CMake 4 compatibility --- .../lomiri/applications/teleports/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/desktops/lomiri/applications/teleports/default.nix b/pkgs/desktops/lomiri/applications/teleports/default.nix index 07818bcf22e5..590e7f2a6b5e 100644 --- a/pkgs/desktops/lomiri/applications/teleports/default.nix +++ b/pkgs/desktops/lomiri/applications/teleports/default.nix @@ -68,6 +68,19 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-zxxFvoj6jluGPCA9GQsxuYYweaSOVrkD01hZwCtq52U="; }) + # Fix CMake 4 compatibility + # Remove when version > 1.21 + (fetchpatch { + name = "0002-teleports-CMakeLists.txt-Support-building-with-CMake-4.patch"; + url = "https://gitlab.com/ubports/development/apps/teleports/-/commit/ffb4e745889a473a208a86a29b7e439129930b01.patch"; + hash = "sha256-EdcCHH/0Zq8wcF6UPyvy16wntDeSqTV9LWQat91LNRo="; + }) + (fetchpatch { + name = "0003-teleports-libs-qtdlib-CMakeLists.txt-Support-building-with-CMake-4.patch"; + url = "https://gitlab.com/ubports/development/apps/teleports/-/commit/fe7f0cb304ddaefae9f97917d3edc89de5f21b1f.patch"; + hash = "sha256-yIc/l6iHb5qWI0QZOx8Hhd0lgEYyPozL+AjrmF2L89k="; + }) + # Remove when https://gitlab.com/ubports/development/apps/teleports/-/merge_requests/586 merged & in release ./1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch ]; From 0a063b383957cc921017cbf75852a76c79f40857 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 09:22:42 +0000 Subject: [PATCH 72/77] siyuan: 3.3.4 -> 3.3.5 --- pkgs/by-name/si/siyuan/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index ccbf4fc9bd6e..da9f0ed4387f 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -35,20 +35,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.3.4"; + version = "3.3.5"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-jC7zYP5sMJCoT7lLyHPHxiikw3Nsz/LYkR664xSPuR4="; + hash = "sha256-6CKY5rIPI+8uKh1vjw9nBI01J8o7U4vlxEPJS7xaAVg="; }; kernel = buildGoModule { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-ZcL9DuwiGjzRHBhzHpoAHeAmR6Mm9HymkjJCoA4+MRw="; + vendorHash = "sha256-kDWOkAY6GiSp/oLkyLya2VYWmLz4fPxZPRKGlb2B8M4="; patches = [ (replaceVars ./set-pandoc-path.patch { From cad80497fe23fa165c4bf83983f30a794ad217db Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 15 Oct 2025 11:27:16 +0200 Subject: [PATCH 73/77] welle-io: backport cmake 3.16 upgrade patch --- pkgs/applications/radio/welle-io/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index 7437974e5ba0..ba6a49a7e710 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, pkg-config, wrapQtAppsHook, @@ -32,6 +33,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-+xjwvxFrv++XF6Uhm/ZwkseuToz3LtqCfTD18GiwNyw="; }; + patches = [ + # https://github.com/AlbrechtL/welle.io/pull/853 + (fetchpatch { + name = "cmake3_16.patch"; + url = "https://github.com/AlbrechtL/welle.io/commit/c7581c251b5fe2408b45365e0f2c5efc7f01fd19.patch"; + hash = "sha256-e282lwCstwsRFGCtFT39CBn1jTvkA9bxa5t6Nk8mc98="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config From 96eb5206741f9a1a1f2bf0744d5d3aca271e11b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 09:43:12 +0000 Subject: [PATCH 74/77] nom: 2.16.2 -> 2.18.0 --- pkgs/by-name/no/nom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix index 55ab4ab6e061..42d2bcb886b1 100644 --- a/pkgs/by-name/no/nom/package.nix +++ b/pkgs/by-name/no/nom/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "nom"; - version = "2.16.2"; + version = "2.18.0"; src = fetchFromGitHub { owner = "guyfedwards"; repo = "nom"; tag = "v${version}"; - hash = "sha256-4CpvhcMP71dC1nDpvM9P6ZIeE2d2J90MNMWFYXTVaY4="; + hash = "sha256-xIe7CgGzNNYzhkazjrejvZGfuLL4RqFCfXOUtFEgLCA="; }; vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw="; From 1b94f25a881380f29e7ac76110e01a68d8133c6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Oct 2025 09:58:01 +0000 Subject: [PATCH 75/77] linuxKernel.kernels.linux_zen: 6.17.1 -> 6.17.2 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 2d9fc1c0c368..8c8b0afeeacd 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -16,9 +16,9 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.17.1"; # zen + version = "6.17.2"; # zen suffix = "zen1"; # zen - sha256 = "0610gcmzmvc70nw7n225avf1spahzffc6ajq18ibidra1k5q2msj"; # zen + sha256 = "0xb0x8726znk7v39incvdsmqh0plfzyjj4sg0dmbjqlgi2kh560r"; # zen isLqx = false; }; # ./update-zen.py lqx From 6ef09c0005e5f5974cdd70d8d2422dca89ecd92d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 15 Oct 2025 12:08:34 +0200 Subject: [PATCH 76/77] dbus-cpp: Changes to tests - Apply a patch that should make a possibly-flaky test more verbose, to ease with debugging. - Disable the executor test suite, due to a spurious memory corruption in Executor.TimeoutsAreHandledCorrectly. --- pkgs/by-name/db/dbus-cpp/package.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/by-name/db/dbus-cpp/package.nix b/pkgs/by-name/db/dbus-cpp/package.nix index 64c051d6c136..a3323397ad35 100644 --- a/pkgs/by-name/db/dbus-cpp/package.nix +++ b/pkgs/by-name/db/dbus-cpp/package.nix @@ -2,10 +2,12 @@ stdenv, lib, fetchFromGitLab, + fetchpatch2, gitUpdater, testers, boost186, cmake, + ctestCheckHook, dbus, doxygen, graphviz, @@ -35,6 +37,16 @@ stdenv.mkDerivation (finalAttrs: { "examples" ]; + patches = [ + # Provide more information when there's an issue in AsyncExecutionLoadTest.RepeatedlyInvokingAnAsyncFunctionWorks + # Remove when version > 5.0.5 + (fetchpatch2 { + name = "0001-dbus-cpp-tests-async_execution_load_test-Print-received-error-on-DBus-method-failure.name"; + url = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/commit/8390ce83153c2ae29f21afd2bf5e79e88c59e6d9.diff"; + hash = "sha256-js2nXT7eG9dcX+yoFMNRVlamQxsbJclmKTX6/5RxxM4="; + }) + ]; + postPatch = '' substituteInPlace doc/CMakeLists.txt \ --replace-fail 'DESTINATION share/''${CMAKE_PROJECT_NAME}/doc' 'DESTINATION ''${CMAKE_INSTALL_DOCDIR}' @@ -71,6 +83,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeCheckInputs = [ + ctestCheckHook dbus ]; @@ -87,6 +100,12 @@ stdenv.mkDerivation (finalAttrs: { # DBus, parallelism messes with communication enableParallelChecking = false; + disabledTests = [ + # Possible memory corruption in Executor.TimeoutsAreHandledCorrectly + # https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/10 + "executor_test" + ]; + preFixup = '' moveToOutput libexec/examples $examples ''; From 7946583a79ececa2215634517aab294554b07a94 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Wed, 15 Oct 2025 12:33:20 +0100 Subject: [PATCH 77/77] nixos/a2boot: add to module-list.nix --- nixos/modules/module-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c1e41909951d..871244a929c0 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1054,6 +1054,7 @@ ./services/monitoring/zabbix-agent.nix ./services/monitoring/zabbix-proxy.nix ./services/monitoring/zabbix-server.nix + ./services/network-filesystems/a2boot.nix ./services/network-filesystems/cachefilesd.nix ./services/network-filesystems/ceph.nix ./services/network-filesystems/davfs2.nix