From 8af12908c217bba4b30bea5690e8dba9938739ac Mon Sep 17 00:00:00 2001 From: NullCube Date: Thu, 24 Apr 2025 17:19:37 -0700 Subject: [PATCH 001/116] nixos/anubis: add missing botPolicy option implementation --- nixos/modules/services/networking/anubis.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/anubis.nix b/nixos/modules/services/networking/anubis.nix index d44619446b7c..968595d303d1 100644 --- a/nixos/modules/services/networking/anubis.nix +++ b/nixos/modules/services/networking/anubis.nix @@ -55,7 +55,7 @@ let type = types.str; }; - botPolicy = lib.mkOption { + botPolicy = mkDefaultOption "botPolicy" { default = null; description = '' Anubis policy configuration in Nix syntax. Set to `null` to use the baked-in policy which should be @@ -265,7 +265,18 @@ in wants = [ "network-online.target" ]; environment = lib.mapAttrs (lib.const (lib.generators.mkValueStringDefault { })) ( - lib.filterAttrs (_: v: v != null) instance.settings + lib.filterAttrs (_: v: v != null) ( + instance.settings + // { + POLICY_FNAME = + if instance.settings.POLICY_FNAME != null then + instance.settings.POLICY_FNAME + else if instance.botPolicy != null then + jsonFormat.generate "${instanceName name}-botPolicy.json" instance.botPolicy + else + null; + } + ) ); serviceConfig = { From 8dd9c9197acde02ee76ebd0b426e8d1ecaf5127e Mon Sep 17 00:00:00 2001 From: NullCube Date: Thu, 24 Apr 2025 18:12:03 -0700 Subject: [PATCH 002/116] nixos/tests/anubis: add testing for anubis botPolicy option --- nixos/tests/anubis.nix | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/nixos/tests/anubis.nix b/nixos/tests/anubis.nix index 973c1b3f369f..761c31d6b8c6 100644 --- a/nixos/tests/anubis.nix +++ b/nixos/tests/anubis.nix @@ -11,9 +11,13 @@ { config, pkgs, ... }: { services.anubis = { - defaultOptions.settings = { - DIFFICULTY = 3; - USER_DEFINED_DEFAULT = true; + defaultOptions = { + # Get default botPolicy + botPolicy = lib.importJSON "${config.services.anubis.package.src}/data/botPolicies.json"; + settings = { + DIFFICULTY = 3; + USER_DEFINED_DEFAULT = true; + }; }; instances = { "".settings = { @@ -38,11 +42,34 @@ group = "nginx"; settings.TARGET = "unix:///run/nginx/nginx.sock"; }; + + "botPolicy-default" = { + botPolicy = null; + settings.TARGET = "http://localhost:8080"; + }; + + "botPolicy-file" = { + settings = { + TARGET = "http://localhost:8080"; + POLICY_FNAME = "/etc/anubis-botPolicy.json"; + }; + }; }; }; + # Empty json for testing + environment.etc."anubis-botPolicy.json".text = lib.generators.toJSON { } { + bots = [ + { + name = "allow-all"; + user_agent_regex = ".*"; + action = "ALLOW"; + } + ]; + }; + # support - users.users.nginx.extraGroups = [ config.users.groups.anubis.name ]; + users.users.nginx.extraGroups = [ config.services.anubis.defaultOptions.group ]; services.nginx = { enable = true; recommendedProxySettings = true; @@ -115,5 +142,10 @@ # Make sure defaults don't overwrite themselves machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "DIFFICULTY=5"') machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "DIFFICULTY=3"') + + # Check correct BotPolicy settings are applied + machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "POLICY_FNAME=/nix/store"') + machine.fail('cat /run/current-system/etc/systemd/system/anubis-botPolicy-default.service | grep "POLICY_FNAME="') + machine.succeed('cat /run/current-system/etc/systemd/system/anubis-botPolicy-file.service | grep "POLICY_FNAME=/etc/anubis-botPolicy.json"') ''; } From e77030d05d25a75d033505e031b4f541d9a6db77 Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Sat, 30 Aug 2025 09:08:43 +0200 Subject: [PATCH 003/116] syslogng: fix gRPC plugins missing symbols --- pkgs/by-name/sy/syslogng/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/syslogng/package.nix b/pkgs/by-name/sy/syslogng/package.nix index 91739e82fe0b..ca2de5eceddf 100644 --- a/pkgs/by-name/sy/syslogng/package.nix +++ b/pkgs/by-name/sy/syslogng/package.nix @@ -35,8 +35,7 @@ gperf, withGrpc ? true, grpc, - # see https://github.com/syslog-ng/syslog-ng/pull/5263 - protobuf_29, + protobuf, }: let python-deps = @@ -111,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { rdkafka ] ++ (lib.optionals withGrpc [ - protobuf_29 + protobuf grpc ]); From 435c50e2963b8655a11ace25c92ec835efb22dbf Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 31 Aug 2025 16:00:41 +0400 Subject: [PATCH 004/116] python3Packages.webssh: fix build --- .../python-modules/webssh/default.nix | 26 +++++++++++++------ .../webssh/remove-typo-in-test-case.patch | 18 ------------- 2 files changed, 18 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/python-modules/webssh/remove-typo-in-test-case.patch diff --git a/pkgs/development/python-modules/webssh/default.nix b/pkgs/development/python-modules/webssh/default.nix index ae4043556e20..858f46195257 100644 --- a/pkgs/development/python-modules/webssh/default.nix +++ b/pkgs/development/python-modules/webssh/default.nix @@ -5,24 +5,23 @@ fetchPypi, paramiko, pytestCheckHook, + setuptools, tornado, }: buildPythonPackage rec { pname = "webssh"; version = "1.6.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-K85buvIGrTRZEMfk3IAks8QY5oHJ9f8JjxgCvv924QA="; }; - patches = [ - ./remove-typo-in-test-case.patch - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ paramiko tornado ]; @@ -31,13 +30,24 @@ buildPythonPackage rec { pythonImportsCheck = [ "webssh" ]; - meta = with lib; { + disabledTests = [ + # https://github.com/huashengdun/webssh/issues/412 + "test_get_pkey_obj_with_encrypted_ed25519_key" + "test_get_pkey_obj_with_encrypted_new_rsa_key" + "test_get_pkey_obj_with_plain_new_dsa_key" + # BrokenPipeError: [Errno 32] Broken pipe + "test_app_post_form_with_large_body_size_by_multipart_form" + "test_app_post_form_with_large_body_size_by_urlencoded_form" + ]; + + __darwinAllowLocalNetworking = true; + + meta = { description = "Web based SSH client"; mainProgram = "wssh"; homepage = "https://github.com/huashengdun/webssh/"; changelog = "https://github.com/huashengdun/webssh/releases/tag/v${version}"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; - broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/webssh/remove-typo-in-test-case.patch b/pkgs/development/python-modules/webssh/remove-typo-in-test-case.patch deleted file mode 100644 index ac7bd94e5b39..000000000000 --- a/pkgs/development/python-modules/webssh/remove-typo-in-test-case.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- - tests/test_handler.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test_handler.py b/tests/test_handler.py -index a9ad924..950e672 100644 ---- a/tests/test_handler.py -+++ b/tests/test_handler.py -@@ -336,5 +336,5 @@ class TestIndexHandler(unittest.TestCase): - ssh.exec_command.return_value = (stdin, stdout, stderr) - - encoding = IndexHandler.get_default_encoding(handler, ssh) -- self.assertEquals("utf-8", encoding) -+ self.assertEqual("utf-8", encoding) - --- -2.44.0 - From fdea13debab9b70afce0e6795046cbdecbe74090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sun, 31 Aug 2025 23:50:10 +0200 Subject: [PATCH 005/116] beeper-bridge-manager: add python3 runtime dependency --- pkgs/by-name/be/beeper-bridge-manager/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/be/beeper-bridge-manager/package.nix b/pkgs/by-name/be/beeper-bridge-manager/package.nix index 879143264f92..fa3abec3cbb2 100644 --- a/pkgs/by-name/be/beeper-bridge-manager/package.nix +++ b/pkgs/by-name/be/beeper-bridge-manager/package.nix @@ -2,6 +2,8 @@ lib, buildGoModule, fetchFromGitHub, + makeWrapper, + python3, }: buildGoModule rec { @@ -15,8 +17,17 @@ buildGoModule rec { hash = "sha256-bNnansZNshWp70LQQsa6+bS+LJxpCzdTkL2pX+ksrP0="; }; + nativeBuildInputs = [ + makeWrapper + ]; + vendorHash = "sha256-yTNUxwnulQ+WbHdQbeNDghH4RPXurQMIgKDyXfrMxG8="; + postInstall = '' + wrapProgram $out/bin/bbctl \ + --prefix PATH : ${python3}/bin + ''; + meta = { description = "Tool for running self-hosted bridges with the Beeper Matrix server"; homepage = "https://github.com/beeper/bridge-manager"; From 775d1c06c32da00a188671dd0e6eac7ab5c32009 Mon Sep 17 00:00:00 2001 From: kyehn Date: Tue, 2 Sep 2025 11:53:28 +0800 Subject: [PATCH 006/116] tradcpp: 0.5.2 -> 0.5.3 --- pkgs/by-name/tr/tradcpp/aarch64.patch | 12 ------------ pkgs/by-name/tr/tradcpp/package.nix | 20 +++++++++----------- 2 files changed, 9 insertions(+), 23 deletions(-) delete mode 100644 pkgs/by-name/tr/tradcpp/aarch64.patch diff --git a/pkgs/by-name/tr/tradcpp/aarch64.patch b/pkgs/by-name/tr/tradcpp/aarch64.patch deleted file mode 100644 index ef7ad9828ace..000000000000 --- a/pkgs/by-name/tr/tradcpp/aarch64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff a/config.h b/config.h ---- a/config.h -+++ b/config.h -@@ -124,6 +124,8 @@ - #define CONFIG_CPU "__ppc64__" - #elif defined(__ARM__) - #define CONFIG_CPU "__ARM__" -+#elif defined(__aarch64__) -+#define CONFIG_CPU "__aarch64__" - #else - /* let it go */ - #endif diff --git a/pkgs/by-name/tr/tradcpp/package.nix b/pkgs/by-name/tr/tradcpp/package.nix index bba9e0501e90..f3bbd64eec14 100644 --- a/pkgs/by-name/tr/tradcpp/package.nix +++ b/pkgs/by-name/tr/tradcpp/package.nix @@ -2,26 +2,24 @@ lib, stdenv, fetchurl, - autoconf, + autoreconfHook, }: stdenv.mkDerivation rec { pname = "tradcpp"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://ftp.netbsd.org/pub/NetBSD/misc/dholland/${pname}-${version}.tar.gz"; - sha256 = "1h2bwxwc13rz3g2236l89hm47f72hn3m4h7wjir3j532kq0m68bc"; + url = "https://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-${version}.tar.gz"; + hash = "sha256-4XufQs90s2DVaRvFn7U/N+QVgcRbdfzWS7ll5eL+TF4="; }; - strictDeps = true; # tradcpp only comes with BSD-make Makefile; the patch adds configure support - nativeBuildInputs = [ autoconf ]; - preConfigure = "autoconf"; - patches = [ - ./tradcpp-configure.patch - ./aarch64.patch - ]; + patches = [ ./tradcpp-configure.patch ]; + + strictDeps = true; + + nativeBuildInputs = [ autoreconfHook ]; meta = with lib; { description = "Traditional (K&R-style) C macro preprocessor"; From 29df84dada573e306eb797b5fbf6b554064cefc1 Mon Sep 17 00:00:00 2001 From: kyehn Date: Tue, 2 Sep 2025 11:54:30 +0800 Subject: [PATCH 007/116] tradcpp: use finalAttrs --- pkgs/by-name/tr/tradcpp/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/tr/tradcpp/package.nix b/pkgs/by-name/tr/tradcpp/package.nix index f3bbd64eec14..b9a4fea05586 100644 --- a/pkgs/by-name/tr/tradcpp/package.nix +++ b/pkgs/by-name/tr/tradcpp/package.nix @@ -5,12 +5,12 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tradcpp"; version = "0.5.3"; src = fetchurl { - url = "https://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-${version}.tar.gz"; + url = "https://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-${finalAttrs.version}.tar.gz"; hash = "sha256-4XufQs90s2DVaRvFn7U/N+QVgcRbdfzWS7ll5eL+TF4="; }; @@ -27,5 +27,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; license = licenses.bsd2; }; - -} +}) From ab8dc3437df350bebb20d524ac762b46c6ad1950 Mon Sep 17 00:00:00 2001 From: kyehn Date: Tue, 2 Sep 2025 11:55:02 +0800 Subject: [PATCH 008/116] tradcpp: remove with lib --- pkgs/by-name/tr/tradcpp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/tradcpp/package.nix b/pkgs/by-name/tr/tradcpp/package.nix index b9a4fea05586..e7afc2c7675b 100644 --- a/pkgs/by-name/tr/tradcpp/package.nix +++ b/pkgs/by-name/tr/tradcpp/package.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook ]; - meta = with lib; { + meta = { description = "Traditional (K&R-style) C macro preprocessor"; mainProgram = "tradcpp"; - platforms = platforms.all; - license = licenses.bsd2; + platforms = lib.platforms.all; + license = lib.licenses.bsd2; }; }) From 4b09d9ceb7cce20ca43ea15679648ad31842b954 Mon Sep 17 00:00:00 2001 From: andre4ik3 Date: Tue, 2 Sep 2025 05:23:31 +0000 Subject: [PATCH 009/116] webtunnel: 0-unstable-2024-07-06 -> 0.0.3, build on all golang platforms --- pkgs/by-name/we/webtunnel/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/we/webtunnel/package.nix b/pkgs/by-name/we/webtunnel/package.nix index a0dea74b358f..0ddaeef6860b 100644 --- a/pkgs/by-name/we/webtunnel/package.nix +++ b/pkgs/by-name/we/webtunnel/package.nix @@ -3,16 +3,18 @@ buildGoModule, fetchFromGitLab, }: -buildGoModule { + +buildGoModule rec { pname = "webtunnel"; - version = "0-unstable-2024-07-06"; # package is not versioned upstream + version = "0.0.3"; + src = fetchFromGitLab { domain = "gitlab.torproject.org"; group = "tpo"; owner = "anti-censorship/pluggable-transports"; repo = "webtunnel"; - rev = "e64b1b3562f3ab50d06141ecd513a21ec74fe8c6"; - hash = "sha256-25ZtoCe1bcN6VrSzMfwzT8xSO3xw2qzE4Me3Gi4GbVs="; + rev = "v${version}"; + hash = "sha256-HB95GCIJeO5fKUW23VHrtNZdc9x9fk2vnmI9JogDWSQ="; }; vendorHash = "sha256-3AAPySLAoMimXUOiy8Ctl+ghG5q+3dWRNGXHpl9nfG0="; @@ -22,7 +24,5 @@ buildGoModule { homepage = "https://community.torproject.org/relay/setup/webtunnel/"; maintainers = [ lib.maintainers.gbtb ]; license = lib.licenses.mit; - platforms = lib.platforms.linux; }; - } From aff7d45061fccae6a3668ab36ed44f2f40527056 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 27 Aug 2025 15:59:06 +0200 Subject: [PATCH 010/116] ma: 11 -> 13 Upstream changelog (from README): 13 - Fix quoting issue with plumbing (thanks to "sterni"). 12 - Selection of word under the mouse cursor does not include "," or ";". - Selecting an initial position when opening a fresh window tries harder to make the selection visible. - C-r selects to end of file. - ESC now records the position after a button press moves the insertion point (this is more according to how I understand the behaviour in sam/acme). - B3 on address that involves search starts the search at the insertion point, not at the start of the file. --- pkgs/by-name/ma/ma/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/ma/package.nix b/pkgs/by-name/ma/ma/package.nix index 738b6efc091b..ec177d76958d 100644 --- a/pkgs/by-name/ma/ma/package.nix +++ b/pkgs/by-name/ma/ma/package.nix @@ -7,15 +7,15 @@ stdenv.mkDerivation { pname = "ma"; - version = "11"; + version = "13"; src = fetchurl { - url = "https://web.archive.org/web/20250511210225/http://call-with-current-continuation.org/ma/ma.tar.gz"; - hash = "sha256-1UVxXbN2jSNm13BjyoN3jbKtkO3DUEEHaDOC2Ibbxf4="; + url = "https://web.archive.org/web/20250829110226/http://call-with-current-continuation.org/ma/ma.tar.gz"; + hash = "sha256-QNt4ctcu4/xJY2eud+kp5paPUnLsRhK7D2nJ0LBIvIo="; }; postPatch = '' - substituteInPlace ./build --replace-fail gcc ${lib.getExe stdenv.cc} + substituteInPlace ./build --replace-fail cc ${lib.getExe stdenv.cc} ''; buildInputs = [ @@ -43,6 +43,7 @@ stdenv.mkDerivation { description = "Minimalistic variant of the Acme editor"; homepage = "http://call-with-current-continuation.org/ma/ma.html"; mainProgram = "ma"; + maintainers = [ lib.maintainers.sternenseemann ]; # Per the README: # > All of MA's source code is hereby placed in the public domain license = lib.licenses.publicDomain; From 64958a23d49bd23d075a6f48afcc1d495a55cc82 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 3 Sep 2025 16:30:49 +0200 Subject: [PATCH 011/116] python3Packages.wn: fix build, add missing test deps https://hydra.nixos.org/build/305658569 --- pkgs/development/python-modules/wn/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/wn/default.nix b/pkgs/development/python-modules/wn/default.nix index 6637038c34a5..fed2a7662bee 100644 --- a/pkgs/development/python-modules/wn/default.nix +++ b/pkgs/development/python-modules/wn/default.nix @@ -3,10 +3,12 @@ buildPythonPackage, fetchPypi, pytestCheckHook, + pytest-benchmark, pythonOlder, hatchling, httpx, tomli, + starlette, }: buildPythonPackage rec { @@ -28,7 +30,17 @@ buildPythonPackage rec { tomli ]; - nativeCheckInputs = [ pytestCheckHook ]; + optional-dependencies.web = [ + starlette + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-benchmark + ] + ++ optional-dependencies.web; + + pytestFlags = [ "--benchmark-disable" ]; preCheck = '' export HOME=$(mktemp -d) From 1fb65454b1f88cd00da1c1e93b00eeecc00f5598 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Thu, 4 Sep 2025 17:36:23 +0200 Subject: [PATCH 012/116] opentelemetry-cpp: 1.20.0 -> 1.22.0, opentelemetry-proto: 1.5.0 -> 1.7.0 --- pkgs/by-name/op/opentelemetry-cpp/package.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix index 0210970b3bd1..ea9ed98849cf 100644 --- a/pkgs/by-name/op/opentelemetry-cpp/package.nix +++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix @@ -21,19 +21,19 @@ let opentelemetry-proto = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-proto"; - rev = "v1.5.0"; - hash = "sha256-PkG0npG3nKQwq6SxWdIliIQ/wrYAOG9qVb26IeVkBfc="; + rev = "v1.7.0"; + hash = "sha256-3SFf/7fStrglxcpwEya7hDp8Sr3wBG9OYyBoR78IUgs="; }; in stdenv.mkDerivation (finalAttrs: { pname = "opentelemetry-cpp"; - version = "1.20.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-ibLuHIg01wGYPhLRz+LVYA34WaWzlUlNtg7DSONLe9g="; + hash = "sha256-vprHCexKtXvbiHz7JfuTbVFyLy0VL1s4e/hNyaN3nY0="; }; patches = [ @@ -85,11 +85,6 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; - postInstall = '' - substituteInPlace $out/lib/cmake/opentelemetry-cpp/opentelemetry-cpp*-target.cmake \ - --replace-quiet "\''${_IMPORT_PREFIX}/include" "$dev/include" - ''; - passthru.updateScript = nix-update-script { }; meta = { From 50de12a00864e2cd303a16528cabd8ca7c50a714 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 Sep 2025 17:31:59 +0000 Subject: [PATCH 013/116] questdb: 9.0.2 -> 9.0.3 --- pkgs/by-name/qu/questdb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/questdb/package.nix b/pkgs/by-name/qu/questdb/package.nix index 7b392c8e3c84..90d33fe895fb 100644 --- a/pkgs/by-name/qu/questdb/package.nix +++ b/pkgs/by-name/qu/questdb/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "questdb"; - version = "9.0.2"; + version = "9.0.3"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-uLkBjG6aBUaV273hX2Q/ZHWAroyzuK1mSxHzopa/Zgo="; + hash = "sha256-/EkqBK/mero219VUylNLVGD1ZzxBMAYpJ7NcU7BC+aw="; }; nativeBuildInputs = [ From 69318ec93e2100985bc41de5ada77f0bb5a3da88 Mon Sep 17 00:00:00 2001 From: kyehn Date: Fri, 5 Sep 2025 22:24:30 +0800 Subject: [PATCH 014/116] tortoisehg: 6.9 -> 7.0.1 --- pkgs/by-name/to/tortoisehg/package.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/to/tortoisehg/package.nix b/pkgs/by-name/to/tortoisehg/package.nix index 5457a5cdfa7b..e44d4d6fdda8 100644 --- a/pkgs/by-name/to/tortoisehg/package.nix +++ b/pkgs/by-name/to/tortoisehg/package.nix @@ -6,16 +6,21 @@ qt5, }: -python3Packages.buildPythonApplication rec { +let + version = "7.0.1"; +in +python3Packages.buildPythonApplication { pname = "tortoisehg"; - version = "6.9"; - format = "setuptools"; + inherit version; + pyproject = true; src = fetchurl { url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz"; - hash = "sha256-j+HuAq/elnXIOoX4eoqMeOyGq3qjbdoJw6pcZsSa+AI="; + hash = "sha256-rCDLZ2ppD3Y71c31UNir/1pW1QBJViMP9JdoJiWf0nk="; }; + build-system = with python3Packages; [ setuptools ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; @@ -39,6 +44,7 @@ python3Packages.buildPythonApplication rec { # Convenient alias postInstall = '' ln -s $out/bin/thg $out/bin/tortoisehg + install -D --mode=0644 contrib/thg.desktop --target-directory $out/share/applications/ ''; # In python3Packages.buildPythonApplication doCheck is always true, and we From 02794ad4d56af7586773b1e022f6cc3714ea311b Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Wed, 3 Sep 2025 22:33:03 +0200 Subject: [PATCH 015/116] floorp-bin: init at 12.1.4 Fixes #438494. Fixes #431292. It's a -bin variant of floorp, which previously we built from source. Upstream became pretty much unfeasible to build from source starting with the 12.x release line, so let's replace it with a `-bin` variant. Long-term this makes it also a lot easier on maintenance and Hydra, both resource and time-wise. Signed-off-by: Christoph Heiss --- .../fl/floorp-bin-unwrapped/package.nix | 139 ++++++++++++++++++ .../fl/floorp-bin-unwrapped/sources.json | 21 +++ .../by-name/fl/floorp-bin-unwrapped/update.sh | 44 ++++++ pkgs/by-name/fl/floorp-bin/package.nix | 8 + 4 files changed, 212 insertions(+) create mode 100644 pkgs/by-name/fl/floorp-bin-unwrapped/package.nix create mode 100644 pkgs/by-name/fl/floorp-bin-unwrapped/sources.json create mode 100755 pkgs/by-name/fl/floorp-bin-unwrapped/update.sh create mode 100644 pkgs/by-name/fl/floorp-bin/package.nix diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/package.nix b/pkgs/by-name/fl/floorp-bin-unwrapped/package.nix new file mode 100644 index 000000000000..10514ec51d32 --- /dev/null +++ b/pkgs/by-name/fl/floorp-bin-unwrapped/package.nix @@ -0,0 +1,139 @@ +{ + lib, + stdenv, + fetchurl, + wrapGAppsHook3, + autoPatchelfHook, + alsa-lib, + curl, + dbus-glib, + gtk3, + libXtst, + libva, + pciutils, + pipewire, + adwaita-icon-theme, + patchelfUnstable, # have to use patchelfUnstable to support --no-clobber-old-sections + undmg, + writeText, +}: + +let + inherit (lib.importJSON ./sources.json) version sources; + + binaryName = "floorp"; + policies = { + DisableAppUpdate = true; + }; + + policiesJson = writeText "floorp-policies.json" (builtins.toJSON { inherit policies; }); + +in +stdenv.mkDerivation (finalAttrs: { + pname = "floorp-bin-unwrapped"; + inherit version; + + src = fetchurl { + inherit (sources.${stdenv.hostPlatform.system}) url sha256; + }; + + sourceRoot = lib.optional stdenv.hostPlatform.isDarwin "."; + + nativeBuildInputs = [ + wrapGAppsHook3 + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + autoPatchelfHook + patchelfUnstable + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + undmg + ]; + + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + gtk3 + adwaita-icon-theme + alsa-lib + dbus-glib + libXtst + ]; + + runtimeDependencies = [ + curl + pciutils + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + libva.out + ]; + + appendRunpaths = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + "${pipewire}/lib" + ]; + + # Firefox uses "relrhack" to manually process relocations from a fixed offset + patchelfFlags = [ "--no-clobber-old-sections" ]; + + # don't break code signing + dontFixup = stdenv.hostPlatform.isDarwin; + + installPhase = '' + runHook preInstall + '' + + ( + if stdenv.hostPlatform.isDarwin then + '' + # it's disabled, so remove these unused files + rm -v \ + Floorp.app/Contents/Resources/updater.ini \ + Floorp.app/Contents/Library/LaunchServices/org.mozilla.updater + rm -rvf Floorp.app/Contents/MacOS/updater.app + + mkdir -p $out/Applications + mv Floorp.app $out/Applications/ + '' + else + '' + # it's disabled, so remove these unused files + rm -v updater icons/updater.png updater.ini update-settings.ini + + mkdir -p "$prefix/lib" "$prefix/bin" + cp -r . "$prefix/lib/floorp-bin-${finalAttrs.version}" + ln -s "$prefix/lib/floorp-bin-${finalAttrs.version}/floorp" "$out/bin/${binaryName}" + + # See: https://github.com/mozilla/policy-templates/blob/master/README.md + mkdir -p "$out/lib/floorp-bin-${finalAttrs.version}/distribution"; + ln -s ${policiesJson} "$out/lib/floorp-bin-${finalAttrs.version}/distribution/policies.json"; + '' + ) + + '' + runHook postInstall + ''; + + passthru = { + inherit binaryName; + applicationName = "Floorp"; + libName = "floorp-bin-${finalAttrs.version}"; + ffmpegSupport = true; + gssSupport = true; + gtk3 = gtk3; + updateScript = ./update.sh; + }; + + meta = { + changelog = "https://blog.floorp.app/en/release/${finalAttrs.version}.html"; + description = "Fork of Firefox that seeks balance between versatility, privacy and web openness"; + homepage = "https://floorp.app/"; + # https://github.com/Floorp-Projects/Floorp#-floorp-license-notices- + license = with lib.licenses; [ + mpl20 + mit + ]; + platforms = builtins.attrNames sources; + hydraPlatforms = [ ]; + maintainers = with lib.maintainers; [ + christoph-heiss + ]; + mainProgram = "floorp"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json new file mode 100644 index 000000000000..1d0457e61e1c --- /dev/null +++ b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json @@ -0,0 +1,21 @@ +{ + "version": "12.1.4", + "sources": { + "aarch64-linux": { + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.1.4/floorp-linux-aarch64.tar.xz", + "sha256": "3221bc1299edacf061f0c66a3543532fd67ef0b7f998f4c41b4c7f062f79685b" + }, + "x86_64-linux": { + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.1.4/floorp-linux-amd64.tar.xz", + "sha256": "86a5d86a52f3778ca3d3b7b250c3e36820ab792232e8dd8cd4482586e9c1f2f1" + }, + "aarch64-darwin": { + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.1.4/floorp-macOS-universal.dmg", + "sha256": "482723722b6bab68ce5353d49502b1db6d3d43d3f918de273ef8de77c5d7f03a" + }, + "x86_64-darwin": { + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.1.4/floorp-macOS-universal.dmg", + "sha256": "482723722b6bab68ce5353d49502b1db6d3d43d3f918de273ef8de77c5d7f03a" + } + } +} diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh b/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh new file mode 100755 index 000000000000..5be8138e7af5 --- /dev/null +++ b/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq gnused gawk + +set -e + +dirname="$(dirname "$0")" +currentVersion=$(nix eval --raw -f . floorp-bin-unwrapped.version) + +owner=Floorp-Projects +repo=Floorp + +release=$(curl -s "https://api.github.com/repos/$owner/$repo/releases/latest") + +latestTag=$(jq -r ".tag_name" <<<"$release") +latestVersion="$(expr "$latestTag" : 'v\(.*\)')" + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "Floorp is up-to-date: ${currentVersion}" + exit 0 +fi + +jq ' + { + version: .tag_name[1:], + sources: ( + .assets + | map( + select(.name | (endswith(".tar.xz") or endswith(".dmg"))) + | {url: .browser_download_url, sha256: (.digest | split(":").[1])} + ) + | map( + if .url | contains("linux-aarch64") then + {key: "aarch64-linux", value: .} + elif .url | contains("linux-amd64") then + {key: "x86_64-linux", value: .} + elif .url | contains("macOS-universal") then + [{key: "aarch64-darwin", value: .}, {key: "x86_64-darwin", value: .}] + else null end + ) + | flatten + | from_entries + ) + } +' <<<"$release" > "$dirname/sources.json" diff --git a/pkgs/by-name/fl/floorp-bin/package.nix b/pkgs/by-name/fl/floorp-bin/package.nix new file mode 100644 index 000000000000..0928354e1a39 --- /dev/null +++ b/pkgs/by-name/fl/floorp-bin/package.nix @@ -0,0 +1,8 @@ +{ + wrapFirefox, + floorp-bin-unwrapped, +}: + +wrapFirefox floorp-bin-unwrapped { + pname = "floorp-bin"; +} From 6a1ef1c2b8611cf9fb9e7fd81eb920f66af3500d Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sat, 6 Sep 2025 22:27:46 +0200 Subject: [PATCH 016/116] floorp: drop Will be replaced with a -bin build, which becomes necessary due to upstream becoming unfeasible to build from source starting with the 12.x release line. An appropriate `throw` is also added, to advise users to upgrade to the new -bin variant. Signed-off-by: Christoph Heiss --- doc/release-notes/rl-2511.section.md | 2 + nixos/tests/all-tests.nix | 4 - .../networking/browsers/floorp/default.nix | 77 ------------------- .../networking/browsers/floorp/update.sh | 38 --------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 12 --- 6 files changed, 4 insertions(+), 131 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/floorp/default.nix delete mode 100755 pkgs/applications/networking/browsers/floorp/update.sh diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index a1af41f0d054..f50b0c4cc787 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -90,6 +90,8 @@ - `python3Packages.triton` no longer takes an `enableRocm` argument and supports ROCm in all build configurations via runtime binding. In most cases no action will be needed. If triton is unable to find the HIP SDK add `rocmPackages.clr` as a build input or set the environment variable `HIP_PATH="${rocmPackages.clr}"`. +- `floorp` has been replaced with a binary build, available as `floorp-bin`. Due to major changes in the upstream project structure and build system, building Floorp from source has become unfeasible. No configuration or state migration is necessary. + - `inspircd` has been updated to the v4 release series. Please refer to the upstream documentation for [general information](https://docs.inspircd.org/4/overview/#v4-overview) and a list of [breaking changes](https://docs.inspircd.org/4/breaking-changes/). - `lima` package now only includes the guest agent for the host's architecture by default. If your guest VM's architecture differs from your Lima host's, you'll need to enable the `lima-additional-guestagents` package by setting `withAdditionalGuestAgents = true` when overriding lima with this input. diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a50c15852666..153a95f0ca3b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -560,10 +560,6 @@ in flannel = runTestOn [ "x86_64-linux" ] ./flannel.nix; flaresolverr = runTest ./flaresolverr.nix; flood = runTest ./flood.nix; - floorp = runTest { - imports = [ ./firefox.nix ]; - _module.args.firefoxPackage = pkgs.floorp; - }; fluent-bit = runTest ./fluent-bit.nix; fluentd = runTest ./fluentd.nix; fluidd = runTest ./fluidd.nix; diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix deleted file mode 100644 index 8587583633e8..000000000000 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - buildMozillaMach, - nixosTests, -}: - -( - (buildMozillaMach rec { - pname = "floorp"; - packageVersion = "11.30.0"; - applicationName = "Floorp"; - binaryName = "floorp"; - branding = "browser/branding/official"; - requireSigning = false; - allowAddonSideload = true; - - # Must match the contents of `browser/config/version.txt` in the source tree - version = "128.14.0"; - - src = fetchFromGitHub { - owner = "Floorp-Projects"; - repo = "Floorp"; - fetchSubmodules = true; - rev = "v${packageVersion}"; - hash = "sha256-4IAN0S9JWjaGXtnRUJz3HqUm+ZWL7KmryLu8ojSXiqg="; - }; - - extraConfigureFlags = [ - "--with-app-basename=${applicationName}" - "--with-unsigned-addon-scopes=app,system" - "--enable-proxy-bypass-protection" - ]; - - extraPostPatch = '' - # Fix .desktop files for PWAs generated by Floorp - # The executable path returned by Services.dirsvc.get() is absolute and - # thus is the full /nix/store/[..] path. To avoid breaking PWAs with each - # update, rely on `floorp` being in $PATH, as before. - substituteInPlace floorp/browser/base/content/modules/ssb/LinuxSupport.mjs \ - --replace-fail 'Services.dirsvc.get("XREExeF",Ci.nsIFile).path' '"floorp"' - ''; - - updateScript = ./update.sh; - - meta = { - description = "Fork of Firefox that seeks balance between versatility, privacy and web openness"; - homepage = "https://floorp.app/"; - maintainers = with lib.maintainers; [ christoph-heiss ]; - platforms = lib.platforms.unix; - broken = stdenv.buildPlatform.is32bit; - # since Firefox 60, build on 32-bit platforms fails with "out of memory". - # not in `badPlatforms` because cross-compilation on 64-bit machine might work. - maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) - license = lib.licenses.mpl20; - mainProgram = "floorp"; - }; - tests = { - inherit (nixosTests) floorp; - }; - }).override - { - # Upstream build configuration can be found at - # .github/workflows/src/linux/shared/mozconfig_linux_base - privacySupport = true; - webrtcSupport = true; - enableOfficialBranding = false; - geolocationSupport = true; - # https://github.com/NixOS/nixpkgs/issues/418473 - ltoSupport = false; - } -).overrideAttrs - (prev: { - MOZ_DATA_REPORTING = ""; - MOZ_TELEMETRY_REPORTING = ""; - }) diff --git a/pkgs/applications/networking/browsers/floorp/update.sh b/pkgs/applications/networking/browsers/floorp/update.sh deleted file mode 100755 index 4f367f29e776..000000000000 --- a/pkgs/applications/networking/browsers/floorp/update.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl nix-prefetch-github jq gnused - -set -e - -owner=Floorp-Projects -repo=Floorp -dirname="$(dirname "$0")" - -updateVersion() { - sed -i "s/packageVersion = \"[0-9.]*\";/packageVersion = \"$1\";/g" "$dirname/default.nix" -} - -updateBaseVersion() { - local base - base=$(curl -s "https://raw.githubusercontent.com/$owner/$repo/v$1/browser/config/version.txt") - sed -i "s/version = \"[0-9.]*\";/version = \"$base\";/g" "$dirname/default.nix" -} - -updateHash() { - local hash - hash=$(nix-prefetch-github --fetch-submodules --rev "v$1" $owner $repo | jq -r .hash) - sed -i "s|hash = \"[a-zA-Z0-9\/+-=]*\";|hash = \"$hash\";|g" "$dirname/default.nix" -} - -currentVersion=$(cd "$dirname" && nix eval --raw -f ../../../../.. floorp.version) - -latestTag=$(curl -s https://api.github.com/repos/Floorp-Projects/Floorp/releases/latest | jq -r ".tag_name") -latestVersion="$(expr "$latestTag" : 'v\(.*\)')" - -if [[ "$currentVersion" == "$latestVersion" ]]; then - echo "Floorp is up-to-date: ${currentVersion}" - exit 0 -fi - -updateVersion "$latestVersion" -updateBaseVersion "$latestVersion" -updateHash "$latestVersion" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b15a1d6370c6..a9413028bbd4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -908,6 +908,8 @@ mapAliases { flashrom-stable = flashprog; # Added 2024-03-01 flatbuffers_2_0 = flatbuffers; # Added 2022-05-12 flatcam = throw "flatcam has been removed because it is unmaintained since 2022 and doesn't support Python > 3.10"; # Added 2025-01-25 + floorp = throw "floorp has been replaced with floorp-bin, as building from upstream sources has become unfeasible starting with version 12.x"; # Added 2025-09-06 + floorp-unwrapped = throw "floorp-unwrapped has been replaced with floorp-bin-unwrapped, as building from upstream sources has become unfeasible starting with version 12.x"; # Added 2025-09-06 flow-editor = flow-control; # Added 2025-03-05 flut-renamer = throw "flut-renamer is unmaintained and has been removed"; # Added 2025-08-26 flutter313 = throw "flutter313 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 766a29d55138..42ea4c52447e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11658,18 +11658,6 @@ with pkgs; ]; }; - floorp-unwrapped = import ../applications/networking/browsers/floorp { - inherit - stdenv - lib - fetchFromGitHub - buildMozillaMach - nixosTests - ; - }; - - floorp = wrapFirefox floorp-unwrapped { }; - formiko = with python3Packages; callPackage ../applications/editors/formiko { From ceace706028362cb49819038a7ab4b3fab708b73 Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Sun, 7 Sep 2025 01:32:24 +0200 Subject: [PATCH 017/116] indilib, indi-3rdparty: 2.1.4 -> 2.1.5.1 Changelogs: https://github.com/indilib/indi/releases/tag/v2.1.5 https://github.com/indilib/indi/releases/tag/v2.1.5.1 https://github.com/indilib/indi-3rdparty/releases/tag/v2.1.5 https://github.com/indilib/indi-3rdparty/releases/tag/v2.1.5.1 --- .../science/astronomy/indilib/default.nix | 4 +-- .../astronomy/indilib/indi-3rdparty.nix | 28 +++++++++++++------ 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index f69b2931fe73..7b23f4a00e6f 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "indilib"; - version = "2.1.4"; + version = "2.1.5.1"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${finalAttrs.version}"; - hash = "sha256-ceDuWnIeHTpXyQRXDEQxCDM1pdfz5rEDMyJIcCu6OaM="; + hash = "sha256-mbY3iDLRcQ+pis26u6pHzB43ureaKH7KYPkV0CwHU/E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index e7f5a5d6ba48..bf7716531095 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -47,7 +47,7 @@ let owner = "indilib"; repo = "indi-3rdparty"; rev = "v${indilib.version}"; - hash = "sha256-zd88QHYhqxAQlzozXZMKXCFWKYqvGsPHhNxmkdexOOE="; + hash = "sha256-+WBQdu1iWleHf6xC4SK69y505wqZ36IUM4xnh1fnc6s="; }; buildIndi3rdParty = @@ -552,6 +552,14 @@ in indi-astarbox = buildIndi3rdParty { pname = "indi-astarbox"; buildInputs = [ indilib ]; + # TODO patch already upstream, remove with version > 2.1.5.1 + patches = [ + (fetchpatch { + url = "https://github.com/indilib/indi-3rdparty/commit/c347000ec227a5ef98911aab34c7b08a91509cba.patch"; + hash = "sha256-M3b4ySoGJRpfNmBaagjDaeEPKqwaVgRUWaQY626SGBI="; + stripLen = 1; + }) + ]; }; indi-astroasis = buildIndi3rdParty { @@ -688,6 +696,7 @@ in indi-fli = buildIndi3rdParty { pname = "indi-fli"; buildInputs = [ + libusb1 cfitsio indilib zlib @@ -705,6 +714,15 @@ in glib zlib ]; + # TODO patch already upstream, remove with version > 2.1.5.1 + patches = [ + (fetchpatch { + url = "https://github.com/indilib/indi-3rdparty/commit/c33c08b50093698e2aa73d73783d96f85df488a9.patch"; + hash = "sha256-EQ2G9gTexf9FESCAR28f2cwzvH4TOAA8bvyJCxFv/E8="; + stripLen = 1; + }) + ]; + }; indi-gphoto = buildIndi3rdParty { @@ -972,14 +990,6 @@ in indi-shelyak = buildIndi3rdParty { pname = "indi-shelyak"; buildInputs = [ indilib ]; - - patches = [ - (fetchpatch { - url = "https://github.com/indilib/indi-3rdparty/commit/db8106a9a03e0cfb700e02841d46f8b97b5513e0.patch"; - hash = "sha256-JJatmu/dxFEni6CdR6QUn7+EiPe18EwE7OmrCT8Nk2c="; - stripLen = 1; - }) - ]; }; indi-starbook = buildIndi3rdParty { From c22d15a3b2bb0133d0194803221fcf122248715f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Sep 2025 19:15:52 +0000 Subject: [PATCH 018/116] python3Packages.pycrdt: 0.12.27 -> 0.12.32 --- .../python-modules/pycrdt/Cargo.lock | 72 +++++++++---------- .../python-modules/pycrdt/default.nix | 4 +- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index 2638e4479b1a..57d7472fcb62 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -38,9 +38,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "bitflags" -version = "2.9.2" +version = "2.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a65b545ab31d687cff52899d4890855fec459eb6afe0da6417b8a18da87aa29" +checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394" [[package]] name = "bumpalo" @@ -50,9 +50,9 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "cfg-if" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" +checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" [[package]] name = "concurrent-queue" @@ -152,9 +152,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738" dependencies = [ "once_cell", "wasm-bindgen", @@ -178,9 +178,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "memchr" @@ -245,7 +245,7 @@ dependencies = [ [[package]] name = "pycrdt" -version = "0.12.27" +version = "0.12.32" dependencies = [ "pyo3", "serde_json", @@ -254,9 +254,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8970a78afe0628a3e3430376fc5fd76b6b45c4d43360ffd6cdd40bdde72b682a" +checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383" dependencies = [ "indoc", "libc", @@ -271,19 +271,18 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458eb0c55e7ece017adeba38f2248ff3ac615e53660d7c71a238d7d2a01c7598" +checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f" dependencies = [ - "once_cell", "target-lexicon", ] [[package]] name = "pyo3-ffi" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7114fe5457c61b276ab77c5055f206295b812608083644a5c5b2640c3102565c" +checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105" dependencies = [ "libc", "pyo3-build-config", @@ -291,9 +290,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8725c0a622b374d6cb051d11a0983786448f7785336139c3c94f5aa6bef7e50" +checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -303,9 +302,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4109984c22491085343c05b0dbc54ddc405c3cf7b4374fc533f5c3313a572ccc" +checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf" dependencies = [ "heck", "proc-macro2", @@ -366,9 +365,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.142" +version = "1.0.143" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7" +checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a" dependencies = [ "itoa", "memchr", @@ -410,18 +409,18 @@ checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" [[package]] name = "thiserror" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d76d3f064b981389ecb4b6b7f45a0bf9fdac1d5b9204c7bd6714fecc302850" +checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d29feb33e986b6ea906bd9c3559a856983f92371b3eaa5e83782a351623de0" +checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960" dependencies = [ "proc-macro2", "quote", @@ -448,20 +447,21 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b" dependencies = [ "cfg-if", "once_cell", "wasm-bindgen-macro", + "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +checksum = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb" dependencies = [ "bumpalo", "log", @@ -473,9 +473,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -483,9 +483,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa" dependencies = [ "proc-macro2", "quote", @@ -496,9 +496,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1" dependencies = [ "unicode-ident", ] diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index 8c753f1cd632..22c1301ee1d3 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pycrdt"; - version = "0.12.27"; + version = "0.12.32"; pyproject = true; src = fetchFromGitHub { owner = "y-crdt"; repo = "pycrdt"; tag = version; - hash = "sha256-HGNSgdWdYSVc1EcLNDneXqswUWGEgW685HtWYoSo65Q="; + hash = "sha256-kQuQwEuHRmg0aovXewvsfog+L/SsJSFhYYVAbK5pZHo="; }; postPatch = '' From 1fdec5ccddf4f5f5c26ab50f1dad3577bebd37df Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Tue, 9 Sep 2025 04:51:50 +0900 Subject: [PATCH 019/116] wleave: add updateScript Signed-off-by: Ludovico Piero --- pkgs/by-name/wl/wleave/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/wl/wleave/package.nix b/pkgs/by-name/wl/wleave/package.nix index d656610780dc..f9ffefb4e40d 100644 --- a/pkgs/by-name/wl/wleave/package.nix +++ b/pkgs/by-name/wl/wleave/package.nix @@ -10,6 +10,7 @@ glib, gtk4, gtk4-layer-shell, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "wleave"; @@ -62,6 +63,8 @@ rustPlatform.buildRustPackage rec { --zsh <(cat completions/_wleave) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Wayland-native logout script written in GTK4"; homepage = "https://github.com/AMNatty/wleave"; From 1a531f9924878cb28adc2a710f7174a7c70bd64f Mon Sep 17 00:00:00 2001 From: kyehn Date: Tue, 9 Sep 2025 06:22:34 +0800 Subject: [PATCH 020/116] learn6502: 0.2.0 -> 0.3.0 --- pkgs/by-name/le/learn6502/missing-hashes.json | 110 +++++++++--------- pkgs/by-name/le/learn6502/package.nix | 6 +- 2 files changed, 59 insertions(+), 57 deletions(-) diff --git a/pkgs/by-name/le/learn6502/missing-hashes.json b/pkgs/by-name/le/learn6502/missing-hashes.json index aaf3219ba641..e1f0bbcb42c7 100644 --- a/pkgs/by-name/le/learn6502/missing-hashes.json +++ b/pkgs/by-name/le/learn6502/missing-hashes.json @@ -1,81 +1,83 @@ { "@esbuild/aix-ppc64@npm:0.25.0": "468ba76b20f43118a11fd589ef162ff12c3c9f988a861045cc421b3100f9ade27103a0743fa9e9882c54dfe2ec647ca9b209cfc17ef61b5c9bc48be95e5856c1", - "@esbuild/aix-ppc64@npm:0.25.2": "e25252d47d27d5e15a09ba7e7e906fe35d90a363e1eec7bc1e054c066bea6f89364139385008f78e8b4523ebaecb1f7a678213c8fcc2cd0309d539bbc455fd05", + "@esbuild/aix-ppc64@npm:0.25.9": "b5c49f119424bb3f7be30b652ef87bf881824ace02cc2327ba6f7e0f86d04d2afe2087086985f4220dfdbb816acb67e6dfcf00da9eb8b028babfac43df3adac8", "@esbuild/android-arm64@npm:0.25.0": "599fcb6b815a9bc8f83687663653c15ceb1c0f9ea0587da03976972281cd040c23b551a9f772d459809c22f7e218e04f1b159f8da1298b9c79b822f5636eff59", - "@esbuild/android-arm64@npm:0.25.2": "b387ab30ec70902c81ca1231a7838ccc993ad8dff9561a5ec7d7d4e5f03426153d42e496985a02539bce55f6d1048156f36e24a29f61fa5fd8e0587f62696703", + "@esbuild/android-arm64@npm:0.25.9": "afe76da072b16e355f546d1d9023b814ead0487d9fa5e393eeb4bb3f6f76e5542e14b82396ca37c38e868ed64deef6b25f1c47e2564141fe5ecfe0eb7543f3f8", "@esbuild/android-arm@npm:0.25.0": "ff6124350b732afe0f59087d5a50afb0c05d0d3951b4fc0f7c52c19ccacef504d7998217d8d7594dcfd4872748350a49ba611e8f2de3fe9e47a3df4393cb67eb", - "@esbuild/android-arm@npm:0.25.2": "8e7efb22407ad9a985ff5a09dc0d2b895126c6ccca470db671ca0a3e3026f79666af20ce5d296311f5d056e95ca71e743feeae526f94dcaacb5a6969f9963283", + "@esbuild/android-arm@npm:0.25.9": "0d4c724b84043db6597736865a4fe86640c88f21dc0ebe93a2298b4a0e0f0a5d1530a821dd1c18a2b39a6ca9abe8ff714b8ed5de496045a67150ea47c86a39d7", "@esbuild/android-x64@npm:0.25.0": "7015f561e36c4fe142a4047184776344def5f25369c0bce8abd1de3d623d84cf7ddc09e5f7bac8294a8aea457ec23414e169648579382e6fd1aa39590ffe6e01", - "@esbuild/android-x64@npm:0.25.2": "66256eee6168c2f903c45c82863f1377f525dc7de0fc902fca412a44d0abbb8a25761fb9e10c8663b25b0f816d86b7e353d2b77ab39eae95234333f9d233ddc4", + "@esbuild/android-x64@npm:0.25.9": "9da8b1ede5670c2c9e644e0fedf1dd0747081272b296d3f80b53b44b637744d836efee00dc767b81940eb285524a5e3149d8045787f6281ee2bd53f61a9c8717", "@esbuild/darwin-arm64@npm:0.25.0": "ba18b48c2c652a930a436a872b40cb0999fc0c4788dcda908f467d47555b080043e9ba1f9a7f080eb8d91ea8a3a399216aeea95539829a58885c412131025597", - "@esbuild/darwin-arm64@npm:0.25.2": "36a568a779000133d077e2272181232f52939c3e0b0b986ad3f3fd6ab29628c148e88cd857f6de41a16e22e6a252bb16680f91c00c7d813690fa9bc060f58386", + "@esbuild/darwin-arm64@npm:0.25.9": "84a88a8f72fcc66381518d5821e4ed276aeea17c76559bee4fcb472b19456da630ad84d8d74b3e4c297ef7b1ec5bd5037d55ac6ef5c515a77fb94a1bd891dece", "@esbuild/darwin-x64@npm:0.25.0": "83470576dc815364e8f2a6f2ed9c62496fa8112ee4905ccc3b142e36d28c9c90310ad179055d87e2e880e1bf9a3be0e9eb2129d6a88fdacf38181bfab6cf75c0", - "@esbuild/darwin-x64@npm:0.25.2": "b761a20f8db7bf0499f6cba51c72104e733d9186d6f34a7f5e4590c02ecc2f9b84cd02c4e7bd3dade4156b7f92015cdbddc516dd1e4859233e3155cb0fecda58", + "@esbuild/darwin-x64@npm:0.25.9": "c500bcd0c1a8f66d19cf575299a7da7f29dbdb56beac95bb6ddc570291e3e9da4e7d31db6453fc19ea5ac7f85662f40c9a3965c3e1f49657efeb292a6f601a26", "@esbuild/freebsd-arm64@npm:0.25.0": "646f3abba09e87c4555359200af913bbda9fac43629f6ade6adefdbd0d915707a375314e1d25ed0d951e6024d7d19fe0ecdd10caf4ff6177f3f6450e7132a6a9", - "@esbuild/freebsd-arm64@npm:0.25.2": "8f869d6200dba388ac4c008c7a5b6522f44797370a12f94fd19e37b6cd76bdbdf48d0fa893b5ce200a538a151281e9f71e985f82ec8b8c96f16075e45266c718", + "@esbuild/freebsd-arm64@npm:0.25.9": "fb4951968ad62e5316ffd08c037bb2396e8119a0c2289e968421bb277bdbffe23d89c92dcd2d7eb680f31be2b05e36406211b141b9b89378b424e4b5193c3d7f", "@esbuild/freebsd-x64@npm:0.25.0": "4b769e23981e5ec010f9c4670b1194e26e8bf98cc0bb70962fe8c160da508b40561c0b97911072c5de82954a4164af9d885e45e597e39ae379b5cad2d0a8c69e", - "@esbuild/freebsd-x64@npm:0.25.2": "6cdfb6c6d6f6ead324a9ee75ab1068305672207cf1d3189bcf5599ec158e0eb07d74ff63597e389777163b4399da1cc6164b918a7ea9e798e7fd45eee6aad9bb", + "@esbuild/freebsd-x64@npm:0.25.9": "0c71856891d5cea255f9bcb4482c70347a39198da2769a273afbd16bc9db7176bc1d28c41dd569b8b8f98cfd14b10a728c79f54311037d702bb7dffd95f27740", "@esbuild/linux-arm64@npm:0.25.0": "508ca15315c4d7b7db28fc8e17247ebe5c816c270496d1354f0d97baafdf774ec055c2d9ac51e06fb02fed93ce4f94d109b92fe80a62e42bf51a2c5046fc76c8", - "@esbuild/linux-arm64@npm:0.25.2": "a0d51ec6e91e97461916eb6c25b12a8ea6b58ec2f3d91199c0c3f02ec569e98ff1389700250d4664d8394d3d5b5a051d695b34bfe77ab4a12985dfc18f315b73", + "@esbuild/linux-arm64@npm:0.25.9": "6c64bf50dfb709d4000b022558293764a20ff8ba0b6638e8abb3bd0806cab25ac971f1910eaf2a4d73f92080afdb296d57175b2199647de019c2f419365f839d", "@esbuild/linux-arm@npm:0.25.0": "3756d3974f5b5a6453f2ece2fa012f530b32b6af78cc0b6466bf0582b3da718803dae41bdb5cc4cdc360882bd791b63bb79e5f4a6f8c44ee053fc93b8dd6ea7f", - "@esbuild/linux-arm@npm:0.25.2": "5a4cf4045a2a5949dc8875dbad9a82fde7333d3f59b66d8cb614b34b76a7fb715a8d74e41f0788104bcef0436108ca548d71a543f582073e0458e20370dbb802", + "@esbuild/linux-arm@npm:0.25.9": "b9a473988dadbe98f1c6ade2597e5967371d929ac83bb9f888d726d4f0e5cc4b8fe5020332adb26d61748619bf3e62c831d9c80b3bf815a6dd90dab76283d533", "@esbuild/linux-ia32@npm:0.25.0": "d220829704167772688a93568738d0887fc45d88cce7a4f2e4de992f161e9aa679294bfdf2dd3d70fa6549b548a023d98a90f19270cd8ebd5b365efe04b7027c", - "@esbuild/linux-ia32@npm:0.25.2": "535c1755ed95a47b05b865361d2efbef3490f05815743c0d2372f55a2e14f0cc1d5ed6e5dd6f91c7aea871ea2f64cea021eea6e714027148489c54edc6e2b19f", + "@esbuild/linux-ia32@npm:0.25.9": "51f458a7038e2ee014b994f7f216821194b00716ae5abe78fe828d9cefd47575dc0ff703f95c18017e59b7bcb63c13ac6d551e8ab64522cce8af89bc33a689d6", "@esbuild/linux-loong64@npm:0.25.0": "e7f1a54ea77c9307f54d7172a03b1e77ec18b3f6622077fe3dcb4d53435ea47fc60e82b9da7b8efe375c0e46f4c07169686262af2eaea6557cf033c973f6fbcd", - "@esbuild/linux-loong64@npm:0.25.2": "8ff82f5cdd7a9490dfb3be64c990841d2a8e1a0ce83d76fa8d5e9b0ba7aa91ca725f338ff43b4d69a18744905f1730adf87a7f8359ae839030663e0bbe2807e2", + "@esbuild/linux-loong64@npm:0.25.9": "81478bff0f6d54e06fa96ec120c2dc92e47c3a1392397a121cf50a83496156f9abebd46f93e35a496f4f305c8af7cd430e4fe723474a2420cc21d39257852210", "@esbuild/linux-mips64el@npm:0.25.0": "d51dc06bc3da38fb046986019c6b1a8aa1b43a835089f1f8d8ce4242c9417e1d3d25fa593708cd61f66f8665be27829316b37ecf9e08dc48718aacc00608aac1", - "@esbuild/linux-mips64el@npm:0.25.2": "382520bf655329d04f65e041f9bf774d11a2232bdf5125934732db915c179b1172ec3429722d9f02f46ee5bad7b70372872bfd003d7c1cc5ec95b7ca6ec8a983", + "@esbuild/linux-mips64el@npm:0.25.9": "78709795d663461c54168719517c4c38b2a51861af0f97a91003ea6fe2c2b67dca77f57c2a2c4eb2c6481a8660b5fe477c72e46e90154cb72f1f235e683b2d0f", "@esbuild/linux-ppc64@npm:0.25.0": "a19514e5b21c5f70e6b5b6ccdacb09922e9c397e80e3b1ac8e55ed283f9f3a5325a9e4dcf284d033954f3c51a88411fa95473c83b2b69990e02e351fa971b63f", - "@esbuild/linux-ppc64@npm:0.25.2": "c5736195867e9c441cabd0a2cbaa62f91c4e4963ed7490018d09a932d549e1d281411ddf9dbd4a4b68f0c0298c1321ba15fd4e493cdc3dea3e14b7a6207b12f8", + "@esbuild/linux-ppc64@npm:0.25.9": "4a43e167f7f9659a5ca34678cb6fee53fbdba8b14a9a45f323abf33d9e141fd268984b0a18445db84cbada5ed2ac211ef318d5c44af0fbc0c7eea31c0c82321f", "@esbuild/linux-riscv64@npm:0.25.0": "4b275bb4d2442a68b62a93926a4da04bde06795fc7f5719555c7a9d2cf0e8a2cd6a50c0e574f1285e55e126f0be29cf6017d829c571c2fb31728fb1961c45f70", - "@esbuild/linux-riscv64@npm:0.25.2": "c72879775daded232fb2e36a6fe26058ec1ccd1f5dd6a76b4e8da700c6dd20cb15b684bce34569cadd41f25a0a53bd2037994279856bb3148f8c16055adcaf68", + "@esbuild/linux-riscv64@npm:0.25.9": "e71027660a884b5bbcb6e9e84ed439b3ef19466cd9f6d16c1bdfe2db6dbe9a40e8fc19ad429749102d1c15f015372f7f9f8ab7f82d506efffbd143fe8ab28aa9", "@esbuild/linux-s390x@npm:0.25.0": "7bd0fefc75c72d6d657aa9fec2322f1b8744936fc77da7e32027f0f1aff4b5fdaa8ae19a060fa4d465a79f14e13a4e10f3eeaf1ca64dc4c3cf08494b3e26100b", - "@esbuild/linux-s390x@npm:0.25.2": "d8810561312c4c7705f3c580ef8cd38e2768feb19ebf2899595a227f59dfb6ca35182f8ad7ca65d503cc5d9c688fe742002243387aa09b98b8c32aabc522ac4e", + "@esbuild/linux-s390x@npm:0.25.9": "7004c5852a3cbd1bd1d727e13b2f2be0747861ceab840ab8492ddff80b3d34dd41398681016cda3748c697e1b384bf4d4c1ad588538df38eba599ba935ecbd09", "@esbuild/linux-x64@npm:0.25.0": "f9562d7e1d25b9a69faa40aaa7dd607b820836f88733b26b27a48b14b8a526cc5ec033c1869386419bd609c96442974c339ccbb03b4a23ea205927b2243d3b6c", - "@esbuild/linux-x64@npm:0.25.2": "32c8a5f7d0640655ebf60f379ee2b037fe83f3f0edad911a9098505e6ac589c5f2873ff441017183626a19d334e3bb59f58411f2d5474eb7222917575593abea", + "@esbuild/linux-x64@npm:0.25.9": "3bab69aa63d5ef65e9eaa229963ee3a3c868a06badf019277af06d4f7c52ea3a30abafad361e5bcce71032abd8b6fb666607977a627fa2def8db6756cf99b2ee", "@esbuild/netbsd-arm64@npm:0.25.0": "4f2502bbcf5967cf2a07c712f9fd87a0ec1e60356ea115dc8b69ea7364e88edae5758bb7cba4049065bb8e78d69d0f6bce09f42f146a50b2dcc6069e14ba66d5", - "@esbuild/netbsd-arm64@npm:0.25.2": "0b7f77ec46163feac839b17b94e7db87edf61441bd9a67115722bf72781021c8220576a2e2c70bbca45b89a1e69a6b132f5489b59e84241b197272c1ee080304", + "@esbuild/netbsd-arm64@npm:0.25.9": "02b82c6773ad09082e3b18f01dbf4b9f72519a9e93995b479e4bd4bb28c8a4088972fd0e9304881d09775429dc388a3625249096426349dc3adc2208ee408a4a", "@esbuild/netbsd-x64@npm:0.25.0": "82e3e256ac495620890867e85b63f4327e3f5cd5876c868dd4690094c7e4c233bc2359835e512443b8a44f44fc15d98ef3e63914efae8128d3a348d0ebaa66ec", - "@esbuild/netbsd-x64@npm:0.25.2": "6d6686f5d2eb79b042bd4f38dc95e73a8e290a057be1b6afc42867830c9cf2313600b4fd53287f2f418c9f454bf5df02154b16dcfbfc33a6eb2ce9722a4eecc1", + "@esbuild/netbsd-x64@npm:0.25.9": "51a576cb8ad7f43e43f76b25273735646eefa0d2a5bdaa3bd6387ab89512940bee49e91f7051b3d08d143d5cd6b4501f72a9462f30e242f0dff931c4ebe40363", "@esbuild/openbsd-arm64@npm:0.25.0": "6c8de60d94a53fa4c37f7cbfca04baf06a14bb4b4360ab711b2235ec33b624e268cd39aad84382648eabae4db5727495806221211d663c36f1710579f504f967", - "@esbuild/openbsd-arm64@npm:0.25.2": "8a08c16440c6389623bbacb717412635aff61a1552c917e707d71da1dc92c618eea9a9aa1606a4a4f322216f100ede658523baec2e82b1f11b4efd523d491173", + "@esbuild/openbsd-arm64@npm:0.25.9": "9bf0e7a535304f0d3c700d6e4ef536fe94b17e05bf5f9a4cc308ffc8c3d3cd642ee7debcf7f649a845610b1c706675af903f785ef14f320ee918faa61bf79bb5", "@esbuild/openbsd-x64@npm:0.25.0": "ed2beae58658aa2146a9cae2152a38f52f34e2dd929e79a298f8ce4b3c2c6fcf8e2ac98b458fb0fe5baf87c08df12b162c74b52b4c95f5f54f5a073da1668ebe", - "@esbuild/openbsd-x64@npm:0.25.2": "43baf3248bb460e169cb1b5f26f5eb720088fa0d467c77f4f72c6cfa8e6d7b7794c52ed5e4a9a2113db53313c5fec86e352c94939abf601ab22d5e6e9addc4e5", + "@esbuild/openbsd-x64@npm:0.25.9": "bb9bb4c5f095575f267d30c9e65f8e64c3f425d24904f6e22112c305ee5f1503aea750f510252e4b862f366e5efac678b71cc848cda72c587be8af4119d28f80", + "@esbuild/openharmony-arm64@npm:0.25.9": "130f08d72a018aceef14b8534b9910bd2c0852fc074467ad0adf54d339584277326c7ffc8cd8126be08a530184c51d8de11d06971d1cc44545162bfb8428bcc3", "@esbuild/sunos-x64@npm:0.25.0": "9a0d0569ea65171983b0daadbf8ec6dd31341db7bee50fc4c2b85521eb09ff7597279d9dda4b4f25c3bfd6f4f77d558b6a6f36dcfb6794e7fc2177df9770a17e", - "@esbuild/sunos-x64@npm:0.25.2": "0babbb99d3bc3ed818b2b01fbf65ebbf5930defb850e5a5a94a3ba5fc7bc2463d561c07af0d3ac6d6d0197c86682750ceb47abf7d293dd3222b1bd33da9f8aa5", + "@esbuild/sunos-x64@npm:0.25.9": "a86fca2baaaffcaed419bdc6569cf4a88b4ae830034f8deb4d83ba781b989e25b03696cfe05a482e24710191abc53479b70491f3f157eff37ed2b486d88c897b", "@esbuild/win32-arm64@npm:0.25.0": "5484d8ad74479f8cc8c7b5d14d5f8ced3e50d6ef7fc12a45406ae6c6e5199784267bfccbe0173b598c1b512ea20ecd5de20579cf04d3e07848df3db7ccffd8e6", - "@esbuild/win32-arm64@npm:0.25.2": "205aab6fc7b0ca7ee992cd24d73550110c1f79dc2ca724384bb52aa95111248df022375cd648314bd7eeb42083d576c55572f3d39d4ddcd82fc7372f1e7688b0", + "@esbuild/win32-arm64@npm:0.25.9": "cd32c8fe88511e413f6161480ea3b6fc2ed7cb4bd2febb455e7bc45842880c752ba71772f289908ded50d8cfd3207e6730c8fdec2e811af1f65e97d1ee53b4ef", "@esbuild/win32-ia32@npm:0.25.0": "206eb14fd607c5a5116a49eaf4ed3ca7c34c0372729d7d34aa07bbc2a5792afabfd62873212213b17607165bd4ecbe4366066de0ddedd50a46a27a3c5cb830e5", - "@esbuild/win32-ia32@npm:0.25.2": "aa38c0e082e3111e84929a64638cce1c3e1114218726e41c99bf239f2c05be94fb6fe1083366aa342bbd8e75fd449a6a3bcae9b6b3b84066a3a3882dcbaa0090", + "@esbuild/win32-ia32@npm:0.25.9": "c374576d857dfa3c8dc5bdeef598ffc0e3adfcb8b7986a2b78ce61d2aa3c3d1f1cd15cb685f52b88411403d974f657c3fd44cf9b4fadb94e8ed69d75e9e3e0ef", "@esbuild/win32-x64@npm:0.25.0": "a129e6ad07bbcc791fda365e71634aa45cf3989ded1f05ed1ecb99efa625b09081ef410d236fdd279037d001f2e5e5049c98bfbe6a2242c818463222df85cc54", - "@esbuild/win32-x64@npm:0.25.2": "2f2d147c610a3c3ab0f0f97132e4421464d3d38b835d989e8c324b7397e2592cd05485ec1998ae352f06d3191dd1d71c24f94f63f7c70cd8ea8a4c85441502a9", - "@rollup/rollup-android-arm-eabi@npm:4.34.8": "1d21d3ba13ed2cff8b4955b9d7c5fb91fa954be9cdd8f4e5bedc4e1d95733af3249bb7f3f000b9c69e89128a9439bb35990fd5c737372bc9b7fdbea906ac63dd", - "@rollup/rollup-android-arm64@npm:4.34.8": "b3c44e5aaab2b429716d58b93353b0429a131a0b7e08ee39f25ceca1faf3cc453346c9cb91dd1cc278eb5621fb701da87608cc3ce323c24d5f3d191781694ec3", - "@rollup/rollup-darwin-arm64@npm:4.34.8": "a117920a3f06b6fb3e57f3a240a38ea3184811f931105185942e1cb9865d609662e3849ee53bdf7265d4555b9c9d2b6723fb4c94a9b1e494b522253246767b72", - "@rollup/rollup-darwin-x64@npm:4.34.8": "70862e22270122f61690fcf69f07a32f3cce9028c7c296cc6a37bd5ae2fe2e021cf86df877274acf07a927889faf3ffc8721871d749087ea86941853c66a1f27", - "@rollup/rollup-freebsd-arm64@npm:4.34.8": "42e5a9a8fb20585ee5fc1a94f758fdfe4d1dde03a4f6476686b1a8835167e2e210192fb8ffd733dd12baaec928a3fc753bf05609798df99bb4d8b2f6ea44f997", - "@rollup/rollup-freebsd-x64@npm:4.34.8": "984baffa0968907090146b0237697ee76b64eb18dbde512304e83d793030f2cec01bb08658ccb2e12ff6ecd88dccc4886acaaf8117345e564c9b7752c20a7d51", - "@rollup/rollup-linux-arm-gnueabihf@npm:4.34.8": "3a7fe8a7c80608ee54bc2c5b40424b15b0a3da8ec8201e3303f56bedbf3a34f8446b9968da849705373c02c3bd35c56ca22117c3549c8968b2cd1ad54f2d82ed", - "@rollup/rollup-linux-arm-musleabihf@npm:4.34.8": "27fbc7ec1a8ac9d44661d4024d704bc1af8c257bd454b3b56cbcf43afe60a617ac4dec50e6c5906a07945d2bed60c8d44b972aee9f53186b24b7df2b9c99e3f3", - "@rollup/rollup-linux-arm64-gnu@npm:4.34.8": "7ce7073fa830540fc67616b44b3155bacfe84463268ba948aa68719a197684da4ef60882ac1623d168597c3178f936262386de67425c60d645bf66eabf743351", - "@rollup/rollup-linux-arm64-musl@npm:4.34.8": "1acb2a29e1a190c2df27c5e1a30424f22ca98dd5c4e12c2103e2810659c95b8e027b5b34dd0127e55b8c818bb28c49dfc9fe6586c508f85b98350ded6bb60717", - "@rollup/rollup-linux-loongarch64-gnu@npm:4.34.8": "50c416ca41ed0df3d54ccf11c7e5487c64f9e2fee97deb21741086c61a99007ee3dc011d34a6261a3d32cff3f46483bce930ae92e96d54abe607576095bc3906", - "@rollup/rollup-linux-powerpc64le-gnu@npm:4.34.8": "b80e0473848b7d26ab845368e75fd834f71fe6b03f1753450a9c521fe99024a5caa40a85ce8bce1bce079971b31dc2266c718e05ff950143f98a3310944863f4", - "@rollup/rollup-linux-riscv64-gnu@npm:4.34.8": "1efd1e6142b2bbaa986f5c9edc1caee98f3fbd18160da02fd6c05b324b683eec0d8a9b0d4525b67de70873375988d1a4986dfdaf94ec847d9f30a82e5bac1bcd", - "@rollup/rollup-linux-s390x-gnu@npm:4.34.8": "d536c327ad26cf9ad586ad68e146f4cbd64b6bb1daf146f8124f6257f70f42e1d05e37afab902f97049cf8d0b7e60458480a8cf2e49379f1efa1568ac13f6107", - "@rollup/rollup-linux-x64-gnu@npm:4.34.8": "9c8e0c8ae968e8400641d782d7cb0b9b06cdec0c0a366c20259e49da0984ffea2a6af15de3e1fdfc92c1906a97044ea676195b945750848c8ddf34abf675eebf", - "@rollup/rollup-linux-x64-musl@npm:4.34.8": "994b3a904c79fa72a3c331c983c27296ebb302b08f6c624ecbbf91cfa136f03cbdad4be904fd1a80b44d521e49399aff6e7902b594146a8c73cb6d1ad13dce08", - "@rollup/rollup-win32-arm64-msvc@npm:4.34.8": "5d09e6b59d1b08bb85922170aad0b8ada8bff7a5d63bed3b1ba49d4bbe32fd2557527d85c1bb97bf8d7f20778c2266b35c86bb4b0c035835099a3f6b222bc26c", - "@rollup/rollup-win32-ia32-msvc@npm:4.34.8": "d4817c6e0744f2a53c24ea6855ed061fb03437fa0187f86363768d0edffc7e1bd281f9003e684779ac5662627daab1f2816084a257a13ade5bc0fd7e63912d94", - "@rollup/rollup-win32-x64-msvc@npm:4.34.8": "47679da18b7676a91d123a73298047fca019b4a9dfc4e026c43ba0dfea763ed972a9ce0cd46766317af45ef4d2a09cccc6284c4226a006b05d2e6fb712dad29c", - "lightningcss-darwin-arm64@npm:1.29.3": "599581a267d180e23c3a08652666a62c1a47b2c7d2cff892f22675a3705886f728c596c7fe51867649736b15ac29a79cb97d7aba58a9fd8c75b3cb73d10a8c85", - "lightningcss-darwin-x64@npm:1.29.3": "c9868e863c72d8e60edbb21c88146928da1ad89e8a6f642ec8cc14d20b1d623961270707a94bca0332ef3d2b57d3ef8346523ec619b587db655d204341677ced", - "lightningcss-freebsd-x64@npm:1.29.3": "f04a9f4b401db4879134c6b7e96c56301f485fb0c65bc2ef753d89e3ba40c5eeefdc006cd4787e5a40efb7409555a400f469898133ad7d947a09eb5bfa20f9c0", - "lightningcss-linux-arm-gnueabihf@npm:1.29.3": "2ebd119afe472d0e43bcb530fa87a23124716f9134d34b03b73ff71a0b145d39c350780ab630b0dbdafdd420b08159dc3f672623099c07b072417c5c8216c18f", - "lightningcss-linux-arm64-gnu@npm:1.29.3": "617df6a4bf3f76db3e2ed826120ecfc81db270947a785db57a63633a9e14e7e8d55e2e35adabb3ef98db4a5f572b7a2eadcf31f93ae08182e949480f9c1c9c83", - "lightningcss-linux-arm64-musl@npm:1.29.3": "f31c4f11fafee941f7077df9a7669f4eb7e299f0ef8e194b6fbe91d4847fe90dcb16eff5b245520bc56e1486377ff95a2a53dfdb5cb36fd0d4aeb1828b7b53e3", - "lightningcss-linux-x64-gnu@npm:1.29.3": "95872955cdc86a3401e36a7871a050e84908b27c1809277c2f86e3bb8fc5ba10d11c442f0df6c6ba5a5b2ec64ffeffd1b941135d515e8b37d873ce342a0a7f2c", - "lightningcss-linux-x64-musl@npm:1.29.3": "6dc4817256841b7b98da88833c9575d87339f6c3b56d16b25cef0eddbe3b03cb7d12121187a1ac4443d6b5f52161bb6177a50e017a86d320278e7524b4394179", - "lightningcss-win32-arm64-msvc@npm:1.29.3": "64ed3c716814064ef13f804468dc4def41f86695b0131fb8fa1cfd295036b885ca92122e488758c8ff88feb61e5a8ce05371281cb18e3d77b92abeb434d61857", - "lightningcss-win32-x64-msvc@npm:1.29.3": "84b8711c3371d96d096c826cbfca21d253bc4de6f40afec951f64a457154feeed8c57fcca9835977c907b208015b0635b035c5a0fbb78852947e4f8f6bfc5806" + "@esbuild/win32-x64@npm:0.25.9": "41f2ba9101f4a9a28e3287026a32a05e8fdffcb4a4e41cfaf9f94b41093c6882f46ef80f12854b67b7ad78e47d1df492f3e8a71d41813a61500ace4a574af851", + "@rollup/rollup-android-arm-eabi@npm:4.46.2": "d7d021a87cd3504c8d71b00a94199e13c4e07c14fe20ed7300cf1e6436a5f3fe8496c9e5f206e023b15f9b6f8991b2d95a48b47fa41d5c00b44f37fe5f4d5eb8", + "@rollup/rollup-android-arm64@npm:4.46.2": "ca901edbf95bbdd2505c979f777e2a01e2e885a597b6daeed5362dac523ea2a1eb9c0c0d22b9b436f3613c22abdd442bd2764491948890930333a9e40ade35be", + "@rollup/rollup-darwin-arm64@npm:4.46.2": "ed2b07c4803915d46ff642abd659e179fae524dcd3cb88c810a5b71290d16b498e0371dcb91fe98f6301b8c6600d579a099be1e9450278326281002df4a80019", + "@rollup/rollup-darwin-x64@npm:4.46.2": "c53e31df756cb8d44e179c167db1ec5d321225561a1aff2b320091c226c2dfafd080a98a1466f2dc697ff0173b52c41d89c60cae97f73b41fbd128d4c87fde66", + "@rollup/rollup-freebsd-arm64@npm:4.46.2": "9495d87e670bbea87e43d06df53ae83fcd46e2c82a80927556f3516ac76613b8b7739bbd4b43c3f264bbab57a50a3b6cd2dfa6c1b2741bd3acdeba8af7c47018", + "@rollup/rollup-freebsd-x64@npm:4.46.2": "890a965b45f4c4b9beb4696912ee30472180a040dafb24ce32f8811aed4d0d0ee90bf675d234abc6d8e66266d2966a72483fff7e6f1dbd116424b23e18fe38a9", + "@rollup/rollup-linux-arm-gnueabihf@npm:4.46.2": "ce9720f61b4f7d9a791ba78e13cbbea67ef5f46c465e054c08f009cd06de8c1e4518df8e8578366a27cc9ae4280d37528dd0762906a19e820ca1a95158b47090", + "@rollup/rollup-linux-arm-musleabihf@npm:4.46.2": "b884f568a681d8c13ffdfa77ad6183ed6f7f9fe5bc952b1c82dc21e36b4bc8eb7ee292168929a2575ff5ff14582060d7d73c583aef7edf04fd0bddd67140f4b0", + "@rollup/rollup-linux-arm64-gnu@npm:4.46.2": "519477372d8358a4d3f1f1245bc2b5b57b65960f9a7d02bc5795ba68aed471fe87b20391a63c334bf0abb94085ad8c89d8d3b2e4d79ca0fed702537e9a0949eb", + "@rollup/rollup-linux-arm64-musl@npm:4.46.2": "a5dec7799dd832b5374171a73a6b57cffef8be317482dd9ea4e6554db6fc8afb4bdb91ec725502f1b378aa9cb9a1333684056d55c9120262cb7744a33b961a76", + "@rollup/rollup-linux-loongarch64-gnu@npm:4.46.2": "76ebbf40535f68c6922edf7d866dad00608cd475c8436d199653341ea09124cb4478f67c12d32b5363634f3f811926acb14a086eb146a1fe6b310fdbde01f2c8", + "@rollup/rollup-linux-ppc64-gnu@npm:4.46.2": "31b62a51393e0f2608e1133701523e894ff5d04038e3d9af95abf595ab7fbe827167a651b200e9975d0e76904699cde3428aa1afbf46bf939f836f8ef90b1d88", + "@rollup/rollup-linux-riscv64-gnu@npm:4.46.2": "4f22bc5fe58730026085d1a5372b51d9ed933b314cde2d3dec1d73ad76106406915c313d331f094176ed917863c0041667e63184d9730da7107b11266dad477f", + "@rollup/rollup-linux-riscv64-musl@npm:4.46.2": "1bc37b77ac38d7e82e7d661b67fc043a1db01272a0566e5432c61e3c7a5e6c11b5ecb4a49547da2de33a8e0a7b0d685f3c7341572fa77c90e9b71e515f753e86", + "@rollup/rollup-linux-s390x-gnu@npm:4.46.2": "1b1821a848d8bf86fa5e01ae57f60ebe5566cbcb0c605b5d05050821e94b8b45a72515ef302a3021196018b289aaffade5c41a5f89b3f8324d509a25d28dcfc4", + "@rollup/rollup-linux-x64-gnu@npm:4.46.2": "66231802689c1ac1d6ecec6fd65d14c01c900537e588808e0a2c92ba34e322665bb6df3853500717cf600f40a93de4c490838290e21bb10eed4249f587a08109", + "@rollup/rollup-linux-x64-musl@npm:4.46.2": "064ed54e9ddb05eec1b5da5ac8366f3290b7b65e63959a76a26d6940ce44d741c30488e39ce94c51a2679b2c56217c2e0aaf74e123a1c0928503712c115d6047", + "@rollup/rollup-win32-arm64-msvc@npm:4.46.2": "b59089cddf652e3da278744f6b8b2105360d1219833e54791380322913d40073ed4197ccd06d6091e83e1e12a5290d7a2e4aeae7947ff20c45943d07d1f0af0c", + "@rollup/rollup-win32-ia32-msvc@npm:4.46.2": "d0aae1f80a64d9148426a7ff25b9df7f3abf7aca912c358a952f4b3bc541e030b5959f52e0b67abe01b9c8c8fb6567d1bbd30e31daabb7e2c4dc0488faf875f7", + "@rollup/rollup-win32-x64-msvc@npm:4.46.2": "740ca3c1d07f5af76fc9c2db917edbf6d0c1cf3eeee8330a0c571db4990ec44f0b272696a215ab118e8a32d7529f84bd47225e85dfab458a989b4b18d0bbea49", + "lightningcss-darwin-arm64@npm:1.30.1": "bbdce4ee14b3952699e6d07c539cf4bd678853bfd974e3107742198dac38dfa6d40c6ea80163a7026aff662dd7d3a462a2bee9a18448c75c788659ceebe2746a", + "lightningcss-darwin-x64@npm:1.30.1": "6b88c182be0de82858983ec374093c2cb13cd58139456e25be215fc55a7a8cbfcd6f7487bee1507fc024988a1f324d7cb26b3f195893d5a69ccaf252dc9094eb", + "lightningcss-freebsd-x64@npm:1.30.1": "731a96282db6afff3f57e8cbb73f51d06455231868b3b311a772ee11ead9c57538fc217d0956df4f177dbb805fa4fc761734440f6d2bb8965963b21f06bf63c1", + "lightningcss-linux-arm-gnueabihf@npm:1.30.1": "fcf07f54c4d7d056f9b57d39e6df1c6f60c02ef4ebd51eda76056d35d89b1307af8737e44076d2b1f85348d2b1b9c61bf2220c5347389a6d40ad8bb12f34b5cf", + "lightningcss-linux-arm64-gnu@npm:1.30.1": "bc82ce2e96ffab4b0ba1f9adacf63f461c3f6221bcbc955104c05e6e8c2c6ed8863421663e0e4148a682b143868d07190c38e9f990915a80ce9692f963132320", + "lightningcss-linux-arm64-musl@npm:1.30.1": "2ae25a764b8ed9fcc1977dc1786011e68db23bf3343168fa2d4a9a4bcbb73c7aae258cdcb879d68a3a28e22343705ee435517d3f045e49b15fbb65816d74a91d", + "lightningcss-linux-x64-gnu@npm:1.30.1": "190ac9ba1b9a4bf658a9e5b3c5702546ec779a7a5ccf5a4e06e5d46012ce6cad1842a9b1e717498bc759e103ba7390f42c9b8ba3e67157adec8e7162225633b4", + "lightningcss-linux-x64-musl@npm:1.30.1": "fab6ed75d747024fcf46212b9edc7d1daccfbe4e7a06dcd0f9e841c6a023e61e716751747f9e8aecba18495adc9ef6bc20b24616d5c15c87f5dc1ff9ce1fd859", + "lightningcss-win32-arm64-msvc@npm:1.30.1": "2cc285e89f66323ecae5ec41a6b1a57500d74a549fb392829c99708d5a5254d709c0ccd2d8fef4f6c1fc9a55c5bd51eca633fa1f2228563f884545668adc1b17", + "lightningcss-win32-x64-msvc@npm:1.30.1": "60bd930e71fab0fbf0250406d4791bf27f0b9c8daf095c8d5fce9f3e120d24753e309eb6fed956043fc6a6cbb6d1da30fb0862acb54fa046b5f9a2e69908b6f9" } diff --git a/pkgs/by-name/le/learn6502/package.nix b/pkgs/by-name/le/learn6502/package.nix index b85c54e65ac1..cdb1c2bf935f 100644 --- a/pkgs/by-name/le/learn6502/package.nix +++ b/pkgs/by-name/le/learn6502/package.nix @@ -23,20 +23,20 @@ in stdenv.mkDerivation (finalAttrs: { pname = "learn6502"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "JumpLink"; repo = "Learn6502"; tag = "v${finalAttrs.version}"; - hash = "sha256-2c8dUhxCNaDlvQlYwqebfAAlClrnJpGFs9EukdiVgy0="; + hash = "sha256-Aoj4Z9uraBEH3BW0hrhuV3Hu7cnRxvjbpzm4pUziWS4="; }; missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-nbahJ+nwpHVvw8pCqhg1W+4lmgSH7o7BjjhujF7yyQs="; + hash = "sha256-0r+SRVx8b238SVm+XM4+uw7Ge3rFtsNwD/+uNfBA7eM="; }; nativeBuildInputs = [ From f509f323ed3eb317c4cdbebd605cbca6d33c945f Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Tue, 9 Sep 2025 01:24:36 +0300 Subject: [PATCH 021/116] zabbix: enableParallelBuilding --- pkgs/servers/monitoring/zabbix/agent.nix | 2 ++ pkgs/servers/monitoring/zabbix/proxy.nix | 2 ++ pkgs/servers/monitoring/zabbix/server.nix | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix index aeae46821891..8266301b77c3 100644 --- a/pkgs/servers/monitoring/zabbix/agent.nix +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -20,6 +20,8 @@ import ./versions.nix ( inherit hash; }; + enableParallelBuilding = true; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libiconv diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index ef2b02083a52..0abcc99803e7 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -53,6 +53,8 @@ import ./versions.nix ( inherit hash; }; + enableParallelBuilding = true; + nativeBuildInputs = [ pkg-config ] diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 9811448aa169..369d34a5de9f 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -48,6 +48,8 @@ import ./versions.nix ( inherit hash; }; + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook pkg-config @@ -59,7 +61,7 @@ import ./versions.nix ( libiconv libxml2 openssl - (if (lib.versions.major version >= "7" && lib.versions.minor version >= "4") then pcre2 else pcre) + (if lib.versionAtLeast version "7.4" then pcre2 else pcre) zlib ] ++ optional odbcSupport unixODBC From 6d2ea675c356d48cc6a83ed8faacd6d183d96d13 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 8 Sep 2025 18:20:19 +0200 Subject: [PATCH 022/116] nixos/snapserver: migrate to settings option Replaces the complex commandline templating with a structured freeform settings type, that renders out in the ini format while converting lists to multiple key-value pairs. --- .../manual/release-notes/rl-2511.section.md | 2 + nixos/modules/services/audio/snapserver.nix | 444 +++++++----------- nixos/tests/snapcast.nix | 38 +- 3 files changed, 190 insertions(+), 294 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 5f6f123ac4e4..8fc96e20565c 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -158,6 +158,8 @@ - The `yeahwm` package and `services.xserver.windowManager.yeahwm` module were removed due to the package being broken and unmaintained upstream. +- The `services.snapserver` module has been migrated to use the settings option and render a configuration file instead of passing every option over the command line. + - The `services.postgresql` module now sets up a systemd unit `postgresql.target`. Depending on `postgresql.target` guarantees that postgres is in read-write mode and initial/ensure scripts were executed. Depending on `postgresql.service` only guarantees a read-only connection. - The `services.siproxd` module has been removed as `siproxd` is unmaintained and broken with libosip 5.x. diff --git a/nixos/modules/services/audio/snapserver.nix b/nixos/modules/services/audio/snapserver.nix index 86ba7ec7183d..9fcaa2f2c158 100644 --- a/nixos/modules/services/audio/snapserver.nix +++ b/nixos/modules/services/audio/snapserver.nix @@ -1,6 +1,5 @@ { config, - options, lib, pkgs, ... @@ -9,77 +8,96 @@ let name = "snapserver"; + inherit (lib) + literalExpression + mkEnableOption + mkOption + mkPackageOption + mkRemovedOptionModule + mkRenamedOptionModule + types + ; + cfg = config.services.snapserver; - # Using types.nullOr to inherit upstream defaults. - sampleFormat = lib.mkOption { - type = with lib.types; nullOr str; - default = null; - description = '' - Default sample format. - ''; - example = "48000:16:2"; + format = pkgs.formats.ini { + listsAsDuplicateKeys = true; }; - codec = lib.mkOption { - type = with lib.types; nullOr str; - default = null; - description = '' - Default audio compression method. - ''; - example = "flac"; - }; - - streamToOption = - name: opt: - let - os = val: lib.optionalString (val != null) "${val}"; - os' = prefix: val: lib.optionalString (val != null) (prefix + "${val}"); - toQueryString = key: value: "&${key}=${value}"; - in - "--stream.stream=\"${opt.type}://" - + os opt.location - + "?" - + os' "name=" name - + os' "&sampleformat=" opt.sampleFormat - + os' "&codec=" opt.codec - + lib.concatStrings (lib.mapAttrsToList toQueryString opt.query) - + "\""; - - optionalNull = val: ret: lib.optional (val != null) ret; - - optionString = lib.concatStringsSep " " ( - lib.mapAttrsToList streamToOption cfg.streams - # global options - ++ [ "--stream.bind_to_address=${cfg.listenAddress}" ] - ++ [ "--stream.port=${toString cfg.port}" ] - ++ optionalNull cfg.sampleFormat "--stream.sampleformat=${cfg.sampleFormat}" - ++ optionalNull cfg.codec "--stream.codec=${cfg.codec}" - ++ optionalNull cfg.streamBuffer "--stream.stream_buffer=${toString cfg.streamBuffer}" - ++ optionalNull cfg.buffer "--stream.buffer=${toString cfg.buffer}" - ++ lib.optional cfg.sendToMuted "--stream.send_to_muted" - # tcp json rpc - ++ [ "--tcp.enabled=${toString cfg.tcp.enable}" ] - ++ lib.optionals cfg.tcp.enable [ - "--tcp.bind_to_address=${cfg.tcp.listenAddress}" - "--tcp.port=${toString cfg.tcp.port}" - ] - # http json rpc - ++ [ "--http.enabled=${toString cfg.http.enable}" ] - ++ lib.optionals cfg.http.enable [ - "--http.bind_to_address=${cfg.http.listenAddress}" - "--http.port=${toString cfg.http.port}" - ] - ++ lib.optional (cfg.http.docRoot != null) "--http.doc_root=\"${toString cfg.http.docRoot}\"" - ); + configFile = format.generate "snapserver.conf" cfg.settings; in { imports = [ - (lib.mkRenamedOptionModule + (mkRenamedOptionModule [ "services" "snapserver" "controlPort" ] [ "services" "snapserver" "tcp" "port" ] ) + + (mkRenamedOptionModule + [ "services" "snapserver" "listenAddress" ] + [ "services" "snapserver" "settings" "stream" "bind_to_address" ] + ) + (mkRenamedOptionModule + [ "services" "snapserver" "port" ] + [ "services" "snapserver" "settings" "stream" "port" ] + ) + (mkRenamedOptionModule + [ "services" "snapserver" "sampleFormat" ] + [ "services" "snapserver" "settings" "stream" "sampleformat" ] + ) + (mkRenamedOptionModule + [ "services" "snapserver" "codec" ] + [ "services" "snapserver" "settings" "stream" "codec" ] + ) + (mkRenamedOptionModule + [ "services" "snapserver" "streamBuffer" ] + [ "services" "snapserver" "settings" "stream" "chunk_ms" ] + ) + (mkRenamedOptionModule + [ "services" "snapserver" "buffer" ] + [ "services" "snapserver" "settings" "stream" "buffer" ] + ) + (mkRenamedOptionModule + [ "services" "snapserver" "send" ] + [ "services" "snapserver" "settings" "stream" "chunk_ms" ] + ) + + (mkRenamedOptionModule + [ "services" "snapserver" "tcp" "enable" ] + [ "services" "snapserver" "settings" "tcp" "enabled" ] + ) + (mkRenamedOptionModule + [ "services" "snapserver" "tcp" "listenAddress" ] + [ "services" "snapserver" "settings" "tcp" "bind_to_address" ] + ) + (mkRenamedOptionModule + [ "services" "snapserver" "tcp" "port" ] + [ "services" "snapserver" "settings" "tcp" "port" ] + ) + + (mkRenamedOptionModule + [ "services" "snapserver" "http" "enable" ] + [ "services" "snapserver" "settings" "http" "enabled" ] + ) + (mkRenamedOptionModule + [ "services" "snapserver" "http" "listenAddress" ] + [ "services" "snapserver" "settings" "http" "bind_to_address" ] + ) + (mkRenamedOptionModule + [ "services" "snapserver" "http" "port" ] + [ "services" "snapserver" "settings" "http" "port" ] + ) + (mkRenamedOptionModule + [ "services" "snapserver" "http" "docRoot" ] + [ "services" "snapserver" "settings" "http" "doc_root" ] + ) + + (mkRemovedOptionModule [ + "services" + "snapserver" + "streams" + ] "Configure `services.snapserver.settings.stream.source` instead") ]; ###### interface @@ -88,31 +106,93 @@ in services.snapserver = { - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to enable snapserver. - ''; - }; + enable = mkEnableOption "snapserver"; - package = lib.options.mkPackageOption pkgs "snapcast" { }; + package = mkPackageOption pkgs "snapcast" { }; - listenAddress = lib.mkOption { - type = lib.types.str; - default = "::"; - example = "0.0.0.0"; + settings = mkOption { + default = { }; description = '' - The address where snapclients can connect. - ''; - }; + Snapserver configuration. - port = lib.mkOption { - type = lib.types.port; - default = 1704; - description = '' - The port that snapclients can connect to. + Refer to the [example configuration](https://github.com/badaix/snapcast/blob/develop/server/etc/snapserver.conf) for possible options. ''; + type = types.submodule { + freeformType = format.type; + options = { + stream = { + bind_to_address = mkOption { + default = "::"; + description = '' + Address to listen on for snapclient connections. + ''; + }; + + port = mkOption { + type = types.port; + default = 1704; + description = '' + Port to listen on for snapclient connections. + ''; + }; + + source = mkOption { + type = with types; either str (listOf str); + example = "pipe:///tmp/snapfifo?name=default"; + description = '' + One or multiple URIs to PCM inpuit streams. + ''; + }; + }; + + tcp = { + enabled = mkEnableOption "the TCP JSON-RPC"; + + bind_to_address = mkOption { + default = "::"; + description = '' + Address to listen on for snapclient connections. + ''; + }; + + port = mkOption { + type = types.port; + default = 1705; + description = '' + Port to listen on for snapclient connections. + ''; + }; + }; + + http = { + enabled = mkEnableOption "the HTTP JSON-RPC"; + + bind_to_address = mkOption { + default = "::"; + description = '' + Address to listen on for snapclient connections. + ''; + }; + + port = mkOption { + type = types.port; + default = 1705; + description = '' + Port to listen on for snapclient connections. + ''; + }; + + doc_root = lib.mkOption { + type = with lib.types; nullOr path; + default = pkgs.snapweb; + defaultText = literalExpression "pkgs.snapweb"; + description = '' + Path to serve from the HTTP servers root. + ''; + }; + }; + }; + }; }; openFirewall = lib.mkOption { @@ -122,200 +202,13 @@ in Whether to automatically open the specified ports in the firewall. ''; }; - - inherit sampleFormat; - inherit codec; - - streamBuffer = lib.mkOption { - type = with lib.types; nullOr int; - default = null; - description = '' - Stream read (input) buffer in ms. - ''; - example = 20; - }; - - buffer = lib.mkOption { - type = with lib.types; nullOr int; - default = null; - description = '' - Network buffer in ms. - ''; - example = 1000; - }; - - sendToMuted = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Send audio to muted clients. - ''; - }; - - tcp.enable = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Whether to enable the JSON-RPC via TCP. - ''; - }; - - tcp.listenAddress = lib.mkOption { - type = lib.types.str; - default = "::"; - example = "0.0.0.0"; - description = '' - The address where the TCP JSON-RPC listens on. - ''; - }; - - tcp.port = lib.mkOption { - type = lib.types.port; - default = 1705; - description = '' - The port where the TCP JSON-RPC listens on. - ''; - }; - - http.enable = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Whether to enable the JSON-RPC via HTTP. - ''; - }; - - http.listenAddress = lib.mkOption { - type = lib.types.str; - default = "::"; - example = "0.0.0.0"; - description = '' - The address where the HTTP JSON-RPC listens on. - ''; - }; - - http.port = lib.mkOption { - type = lib.types.port; - default = 1780; - description = '' - The port where the HTTP JSON-RPC listens on. - ''; - }; - - http.docRoot = lib.mkOption { - type = with lib.types; nullOr path; - default = pkgs.snapweb; - defaultText = lib.literalExpression "pkgs.snapweb"; - description = '' - Path to serve from the HTTP servers root. - ''; - }; - - streams = lib.mkOption { - type = - with lib.types; - attrsOf (submodule { - options = { - location = lib.mkOption { - type = lib.types.oneOf [ - lib.types.path - lib.types.str - ]; - description = '' - For type `pipe` or `file`, the path to the pipe or file. - For type `librespot`, `airplay` or `process`, the path to the corresponding binary. - For type `tcp`, the `host:port` address to connect to or listen on. - For type `meta`, a list of stream names in the form `/one/two/...`. Don't forget the leading slash. - For type `alsa`, use an empty string. - ''; - example = lib.literalExpression '' - "/path/to/pipe" - "/path/to/librespot" - "192.168.1.2:4444" - "/MyTCP/Spotify/MyPipe" - ''; - }; - type = lib.mkOption { - type = lib.types.enum [ - "pipe" - "librespot" - "airplay" - "file" - "process" - "tcp" - "alsa" - "spotify" - "meta" - ]; - default = "pipe"; - description = '' - The type of input stream. - ''; - }; - query = lib.mkOption { - type = attrsOf str; - default = { }; - description = '' - Key-value pairs that convey additional parameters about a stream. - ''; - example = lib.literalExpression '' - # for type == "pipe": - { - mode = "create"; - }; - # for type == "process": - { - params = "--param1 --param2"; - logStderr = "true"; - }; - # for type == "tcp": - { - mode = "client"; - } - # for type == "alsa": - { - device = "hw:0,0"; - } - ''; - }; - inherit sampleFormat; - inherit codec; - }; - }); - default = { - default = { }; - }; - description = '' - The definition for an input source. - ''; - example = lib.literalExpression '' - { - mpd = { - type = "pipe"; - location = "/run/snapserver/mpd"; - sampleFormat = "48000:16:2"; - codec = "pcm"; - }; - }; - ''; - }; }; }; ###### implementation config = lib.mkIf cfg.enable { - - warnings = - # https://github.com/badaix/snapcast/blob/98ac8b2fb7305084376607b59173ce4097c620d8/server/streamreader/stream_manager.cpp#L85 - lib.filter (w: w != "") ( - lib.mapAttrsToList ( - k: v: - lib.optionalString (v.type == "spotify") '' - services.snapserver.streams.${k}.type = "spotify" is deprecated, use services.snapserver.streams.${k}.type = "librespot" instead. - '' - ) cfg.streams - ); + environment.etc."snapserver.conf".source = configFile; systemd.services.snapserver = { after = [ @@ -328,10 +221,13 @@ in "mpd.service" "mopidy.service" ]; - + restartTriggers = [ configFile ]; serviceConfig = { DynamicUser = true; - ExecStart = "${cfg.package}/bin/snapserver --daemon ${optionString}"; + ExecStart = toString [ + (lib.getExe' cfg.package "snapserver") + "--daemon" + ]; Type = "forking"; LimitRTPRIO = 50; LimitRTTIME = "infinity"; @@ -349,9 +245,9 @@ in }; networking.firewall.allowedTCPPorts = - lib.optionals cfg.openFirewall [ cfg.port ] - ++ lib.optional (cfg.openFirewall && cfg.tcp.enable) cfg.tcp.port - ++ lib.optional (cfg.openFirewall && cfg.http.enable) cfg.http.port; + lib.optionals cfg.openFirewall [ cfg.settings.stream.port ] + ++ lib.optional (cfg.openFirewall && cfg.settings.tcp.enabled) cfg.settings.tcp.port + ++ lib.optional (cfg.openFirewall && cfg.settings.http.enabled) cfg.settings.http.port; }; meta = { diff --git a/nixos/tests/snapcast.nix b/nixos/tests/snapcast.nix index 2a3bf114ee70..2856fc5515e5 100644 --- a/nixos/tests/snapcast.nix +++ b/nixos/tests/snapcast.nix @@ -1,4 +1,5 @@ { + lib, pkgs, ... }: @@ -12,7 +13,7 @@ let in { name = "snapcast"; - meta = with pkgs.lib.maintainers; { + meta = with lib.maintainers; { maintainers = [ hexa ]; }; @@ -20,30 +21,27 @@ in server = { services.snapserver = { enable = true; - port = port; - tcp.port = tcpPort; - http.port = httpPort; - openFirewall = true; - buffer = bufferSize; - streams = { - mpd = { - type = "pipe"; - location = "/run/snapserver/mpd"; - query.mode = "create"; - }; - bluetooth = { - type = "pipe"; - location = "/run/snapserver/bluetooth"; + settings = { + stream = { + port = port; + source = [ + "pipe:///run/snapserver/mpd?name=mpd&mode=create" + "pipe:///run/snapserver/bluetooth?name=bluetooth" + "tcp://127.0.0.1:${toString tcpStreamPort}?name=tcp" + "meta:///mpd/bluetooth/tcp?name=meta" + ]; + buffer = bufferSize; }; tcp = { - type = "tcp"; - location = "127.0.0.1:${toString tcpStreamPort}"; + enabled = true; + port = tcpPort; }; - meta = { - type = "meta"; - location = "/mpd/bluetooth/tcp"; + http = { + enabled = true; + port = httpPort; }; }; + openFirewall = true; }; environment.systemPackages = [ pkgs.snapcast ]; }; From b0f63e9173f873a9f7d458154eb86eb27d8082d2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 8 Sep 2025 17:07:31 +0200 Subject: [PATCH 023/116] snapcast: 0.30.0 -> 0.32.3 https://github.com/badaix/snapcast/releases/tag/v0.31.0 https://github.com/badaix/snapcast/releases/tag/v0.32.0 https://github.com/badaix/snapcast/releases/tag/v0.32.1 https://github.com/badaix/snapcast/releases/tag/v0.32.2 https://github.com/badaix/snapcast/releases/tag/v0.32.3 --- pkgs/applications/audio/snapcast/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 9ba36c4b6b5a..67733286cc53 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -8,6 +8,7 @@ asio, avahi, boost, + expat, flac, libogg, libvorbis, @@ -23,13 +24,13 @@ stdenv.mkDerivation rec { pname = "snapcast"; - version = "0.30.0"; + version = "0.32.3"; src = fetchFromGitHub { owner = "badaix"; repo = "snapcast"; rev = "v${version}"; - hash = "sha256-EJgpZz4PnXfge0rkVH1F7cah+i9AvDJVSUVqL7qChDM="; + hash = "sha256-pGON2Nh7GgcGvMUNI3nWstm5Q9R+VW9eEi4IE6KkFBo="; }; nativeBuildInputs = [ @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { boost asio avahi + expat flac libogg libvorbis From f01814fafaa4ab49dbf14c60a5b7b27036be173f Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Mon, 8 Sep 2025 19:56:36 +0000 Subject: [PATCH 024/116] wleave: 0.5.1 -> 0.6.2 Signed-off-by: Ludovico Piero --- pkgs/by-name/wl/wleave/package.nix | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/wl/wleave/package.nix b/pkgs/by-name/wl/wleave/package.nix index f9ffefb4e40d..88be28510231 100644 --- a/pkgs/by-name/wl/wleave/package.nix +++ b/pkgs/by-name/wl/wleave/package.nix @@ -2,6 +2,9 @@ lib, fetchFromGitHub, rustPlatform, + nix-update-script, + + # Deps installShellFiles, pkg-config, scdoc, @@ -10,20 +13,22 @@ glib, gtk4, gtk4-layer-shell, - nix-update-script, + libadwaita, + librsvg, + libxml2, }: rustPlatform.buildRustPackage rec { pname = "wleave"; - version = "0.5.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "AMNatty"; repo = "wleave"; rev = version; - hash = "sha256-xl0JOepQDvYdeTv0LFYzp8QdufKXkayJcHklLBjupeA="; + hash = "sha256-+0EKnaxRaHRxRvhASuvfpUijEZJFimR4zSzOyC3FOkQ="; }; - cargoHash = "sha256-csnArsVk/Ifhi3aO3bSG0mkSA81KACxR/xC1L8JJfmc="; + cargoHash = "sha256-MRVWiQNzETFbWeKwYeoXSUY9gncRCsYdPEZhpOKcTvA="; nativeBuildInputs = [ installShellFiles @@ -37,18 +42,21 @@ rustPlatform.buildRustPackage rec { glib gtk4 gtk4-layer-shell + libadwaita + librsvg + libxml2 ]; postPatch = '' - substituteInPlace style.css \ - --replace-fail "/usr/share/wleave" "$out/share/${pname}" - - substituteInPlace src/main.rs \ + substituteInPlace src/config.rs \ --replace-fail "/etc/wleave" "$out/etc/${pname}" + + substituteInPlace layout.json \ + --replace-fail "/usr/share/wleave" "$out/share/${pname}" ''; postInstall = '' - install -Dm644 -t "$out/etc/wleave" {"style.css","layout"} + install -Dm644 -t "$out/etc/wleave" {"style.css","layout.json"} install -Dm644 -t "$out/share/wleave/icons" icons/* for f in man/*.scd; do From cf617bc908503c56b024426f944466c44f03ba7b Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Mon, 8 Sep 2025 18:11:22 -0700 Subject: [PATCH 025/116] engage: use finalAttrs --- pkgs/by-name/en/engage/package.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/en/engage/package.nix b/pkgs/by-name/en/engage/package.nix index 51fdd91008f9..45a5888cb10b 100644 --- a/pkgs/by-name/en/engage/package.nix +++ b/pkgs/by-name/en/engage/package.nix @@ -6,18 +6,15 @@ stdenv, }: -let +rustPlatform.buildRustPackage (finalAttrs: { pname = "engage"; version = "0.2.0"; -in -rustPlatform.buildRustPackage { - inherit pname version; src = fetchFromGitLab { domain = "gitlab.computer.surgery"; owner = "charles"; repo = "engage"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-niXh63xTpXSp9Wqwfi8hUBKJSClOUSvB+TPCTaqHfZk="; }; @@ -42,11 +39,11 @@ rustPlatform.buildRustPackage { description = "Task runner with DAG-based parallelism"; mainProgram = "engage"; homepage = "https://gitlab.computer.surgery/charles/engage"; - changelog = "https://gitlab.computer.surgery/charles/engage/-/blob/v${version}/CHANGELOG.md"; + changelog = "https://gitlab.computer.surgery/charles/engage/-/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ asl20 mit ]; maintainers = with lib.maintainers; [ CobaltCause ]; }; -} +}) From 583abd2e0fb25e83f39c306991c13a1e70c07d0e Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Mon, 8 Sep 2025 18:14:23 -0700 Subject: [PATCH 026/116] engage: 0.2.0 -> 0.2.1 Also update the changelog link. --- pkgs/by-name/en/engage/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/en/engage/package.nix b/pkgs/by-name/en/engage/package.nix index 45a5888cb10b..426ad3883eaf 100644 --- a/pkgs/by-name/en/engage/package.nix +++ b/pkgs/by-name/en/engage/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "engage"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitLab { domain = "gitlab.computer.surgery"; owner = "charles"; repo = "engage"; rev = "v${finalAttrs.version}"; - hash = "sha256-niXh63xTpXSp9Wqwfi8hUBKJSClOUSvB+TPCTaqHfZk="; + hash = "sha256-n7ypFJBYT712Uzh1NnWWSOIpEDKR0e6sQxbiIN6pZgo="; }; - cargoHash = "sha256-0r5MIoitmFxUODxzi0FBLsUpdGrG1pY8Lo+gy7HeJU8="; + cargoHash = "sha256-UTIxxPBtxzsZilxriAT8ksl2ovoDzIhB+8f+b2cGN3k="; nativeBuildInputs = [ installShellFiles @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Task runner with DAG-based parallelism"; mainProgram = "engage"; homepage = "https://gitlab.computer.surgery/charles/engage"; - changelog = "https://gitlab.computer.surgery/charles/engage/-/blob/v${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://charles.gitlab-pages.computer.surgery/engage/changelog.html"; license = with lib.licenses; [ asl20 mit From 6fb61c6e093800d21367e4ad7d8ad5f128572e45 Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Mon, 8 Sep 2025 18:22:51 -0700 Subject: [PATCH 027/116] engage: build/include documentation --- pkgs/by-name/en/engage/package.nix | 40 ++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/en/engage/package.nix b/pkgs/by-name/en/engage/package.nix index 426ad3883eaf..59c8c0f59952 100644 --- a/pkgs/by-name/en/engage/package.nix +++ b/pkgs/by-name/en/engage/package.nix @@ -4,12 +4,22 @@ rustPlatform, fetchFromGitLab, stdenv, + mdbook, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "engage"; version = "0.2.1"; + outputs = [ + "out" + "doc" + ]; + + env = { + ENGAGE_DOCS_LINK = "file://${builtins.placeholder "doc"}/share/doc/${finalAttrs.pname}/index.html"; + }; + src = fetchFromGitLab { domain = "gitlab.computer.surgery"; owner = "charles"; @@ -24,16 +34,26 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellFiles ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ( - "installShellCompletion --cmd engage " - + builtins.concatStringsSep " " ( - builtins.map (shell: "--${shell} <($out/bin/engage completions ${shell})") [ - "bash" - "fish" - "zsh" - ] - ) - ); + checkFlags = [ + # Upstream doesn't set `ENGAGE_DOCS_LINK` during tests so the output differs. + "--skip=long_help" + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd engage ${ + builtins.concatStringsSep " " ( + builtins.map (shell: "--${shell} <($out/bin/engage completions ${shell})") [ + "bash" + "zsh" + "fish" + ] + ) + } + + ${lib.getExe mdbook} build + mkdir -p "$doc/share/doc" + mv public "$doc/share/doc/${finalAttrs.pname}" + ''; meta = { description = "Task runner with DAG-based parallelism"; From 294670e531f4026861090db27417a0da33707b3c Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Sun, 7 Sep 2025 18:05:25 +0200 Subject: [PATCH 028/116] manim-slides: 5.5.1 -> 5.5.2 This also fixes some longstanding issues with the package and makes it actually work again. fixes: #440756 --- .../python-modules/manim-slides/default.nix | 67 +++++++++++++------ pkgs/top-level/all-packages.nix | 10 +-- 2 files changed, 50 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/manim-slides/default.nix b/pkgs/development/python-modules/manim-slides/default.nix index 9ff812373508..270e6173b672 100644 --- a/pkgs/development/python-modules/manim-slides/default.nix +++ b/pkgs/development/python-modules/manim-slides/default.nix @@ -4,11 +4,12 @@ fetchFromGitHub, pythonOlder, + # Build system hatchling, hatch-fancy-pypi-readme, - manim, - ffmpeg, + # Dependencies + ffmpeg, beautifulsoup4, click, click-default-group, @@ -24,17 +25,19 @@ rich, rtoml, tqdm, - pyqt6, # Optional dependencies ipython, - - # As Module or application? - withGui ? false, + manim, + manimgl, + setuptools, + pyqt6, + pyside6, + docutils, }: buildPythonPackage rec { pname = "manim-slides"; - version = "5.5.1"; + version = "5.5.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -43,7 +46,7 @@ buildPythonPackage rec { owner = "jeertmans"; repo = "manim-slides"; tag = "v${version}"; - hash = "sha256-V1uopwyA6y+oTofaezA4pR+ewrh0TRmCwoYhIR/iH7I="; + hash = "sha256-eCtV3xo6PxB6Nha4XuQmmlkAscmeN0O9tgUZ5L4ZroU="; }; build-system = [ @@ -52,11 +55,14 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ - "rtoml" - "qtpy" + "rtoml" # We only package version 0.10, but manim-slides depends on 0.11. + ]; + pythonRemoveDeps = [ + "av" # It can use ffmpeg, which we already provide. ]; dependencies = [ + ffmpeg beautifulsoup4 click click-default-group @@ -72,19 +78,36 @@ buildPythonPackage rec { rich rtoml tqdm + ]; - # avconv is a potential alternative - ffmpeg - # This could also be manimgl, but that is not (yet) packaged - manim - ] - ++ lib.lists.optional (!withGui) ipython - ++ - lib.lists.optional withGui - # dependency of qtpy (could also be pyqt5) - pyqt6; + optional-dependencies = lib.fix (self: { + full = self.magic ++ self.manim ++ self.sphinx-directive; + magic = self.manim ++ [ + ipython + ]; + manim = [ + manim + ]; + manimgl = [ + manimgl + setuptools + ]; + pyqt6 = [ + pyqt6 + ]; + pyqt6-full = self.full ++ self.pyqt6; + pyside6 = [ + pyside6 + ]; + pyside6-full = self.full ++ self.pyside6; + sphinx-directive = self.manim ++ [ + docutils + ]; + }); - pythonImportsCheck = [ "manim_slides" ]; + pythonImportsCheck = [ + "manim_slides" + ]; meta = { changelog = "https://github.com/jeertmans/manim-slides/blob/${src.tag}/CHANGELOG.md"; @@ -92,6 +115,6 @@ buildPythonPackage rec { homepage = "https://github.com/jeertmans/manim-slides"; license = lib.licenses.mit; mainProgram = "manim-slides"; - maintainers = with lib.maintainers; [ bpeetz ]; + maintainers = [ lib.maintainers.bpeetz ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35787411523f..4adf233989f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11782,11 +11782,11 @@ with pkgs; manim = python3Packages.toPythonApplication python3Packages.manim; - manim-slides = python3Packages.toPythonApplication ( - python3Packages.manim-slides.override { - withGui = true; - } - ); + manim-slides = + (python3Packages.toPythonApplication python3Packages.manim-slides).overridePythonAttrs + (oldAttrs: { + dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.pyqt6-full; + }); manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; From 2a31d7e083a2887c37a9ac1ea471c36afab9f43d Mon Sep 17 00:00:00 2001 From: nukdokplex Date: Thu, 12 Jun 2025 13:39:34 +0500 Subject: [PATCH 029/116] lib.mkEUI64Suffix: init --- lib/default.nix | 3 +++ lib/network/default.nix | 52 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/lib/default.nix b/lib/default.nix index d45e6de0c33f..f6984e3f53ee 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -567,6 +567,9 @@ let inherit (self.versions) splitVersion ; + inherit (self.network.ipv6) + mkEUI64Suffix + ; } ); in diff --git a/lib/network/default.nix b/lib/network/default.nix index e0c583ee7506..14d801244966 100644 --- a/lib/network/default.nix +++ b/lib/network/default.nix @@ -1,6 +1,14 @@ { lib }: let inherit (import ./internal.nix { inherit lib; }) _ipv6; + inherit (lib.strings) match concatStringsSep toLower; + inherit (lib.trivial) + pipe + bitXor + fromHexString + toHexString + ; + inherit (lib.lists) elemAt; in { ipv6 = { @@ -45,5 +53,49 @@ in { inherit address prefixLength; }; + + /** + Converts a 48-bit MAC address into a EUI-64 IPv6 address suffix. + + # Example + + ```nix + mkEUI64Suffix "66:75:63:6B:20:75" + => "6475:63ff:fe6b:2075" + ``` + + # Type + + ``` + mkEUI64Suffix :: String -> String + ``` + + # Argumemts + + mac + : The MAC address (may contain these delimiters: `:`, `-` or `.` but it's not necessary) + */ + mkEUI64Suffix = + mac: + pipe mac [ + # match mac address + (match "^([0-9A-Fa-f]{2})[-:.]?([0-9A-Fa-f]{2})[-:.]?([0-9A-Fa-f]{2})[-:.]?([0-9A-Fa-f]{2})[-:.]?([0-9A-Fa-f]{2})[-:.]?([0-9A-Fa-f]{2})$") + + # check if there are matches + (matches: if matches == null then throw ''"${mac}" doesn't meet MAC address criteria'' else matches) + + # transform to result hextets + (mac: [ + (toHexString (bitXor 512 (fromHexString ((elemAt mac 0) + (elemAt mac 1))))) + "${elemAt mac 2}ff" + "fe${elemAt mac 3}" + ((elemAt mac 4) + (elemAt mac 5)) + ]) + + # concat to result suffix + (concatStringsSep ":") + + toLower + ]; }; } From 7abe9e95ece8e6dfbdf8d5b6b951991813af5b06 Mon Sep 17 00:00:00 2001 From: nukdokplex Date: Tue, 9 Sep 2025 12:12:59 +0500 Subject: [PATCH 030/116] lib.network: add lib.mkEUI64Suffix tests to network.sh --- lib/tests/network.sh | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/lib/tests/network.sh b/lib/tests/network.sh index 54ca476d2deb..b0c917b8b222 100755 --- a/lib/tests/network.sh +++ b/lib/tests/network.sh @@ -114,4 +114,42 @@ expectFailure '(internal._ipv6.split "/::/").prefixLength' "is not a valid IPv expectSuccess 'lib.network.ipv6.fromString "2001:DB8::ffff/64"' '{"address":"2001:db8:0:0:0:0:0:ffff","prefixLength":64}' expectSuccess 'lib.network.ipv6.fromString "1234:5678:90ab:cdef:fedc:ba09:8765:4321/44"' '{"address":"1234:5678:90ab:cdef:fedc:ba09:8765:4321","prefixLength":44}' +expectSuccess 'mkEUI64Suffix "00:11:22:AA:BB:CC"' '"211:22ff:feaa:bbcc"' +expectSuccess 'mkEUI64Suffix "00-11-22-AA-BB-CC"' '"211:22ff:feaa:bbcc"' +expectSuccess 'mkEUI64Suffix "00.11.22.AA.BB.CC"' '"211:22ff:feaa:bbcc"' +expectSuccess 'mkEUI64Suffix "00:11:22:aa:bb:cc"' '"211:22ff:feaa:bbcc"' +expectSuccess 'mkEUI64Suffix "00-11-22-aa-bb-cc"' '"211:22ff:feaa:bbcc"' +expectSuccess 'mkEUI64Suffix "00.11.22.aa.bb.cc"' '"211:22ff:feaa:bbcc"' + +expectSuccess 'mkEUI64Suffix "12:34:56:78:9A:bc"' '"1034:56ff:fe78:9abc"' +expectSuccess 'mkEUI64Suffix "123456789ABC"' '"1034:56ff:fe78:9abc"' + +expectSuccess 'mkEUI64Suffix "001122AABBCC"' '"211:22ff:feaa:bbcc"' +expectSuccess 'mkEUI64Suffix "001122aabbcc"' '"211:22ff:feaa:bbcc"' + +expectSuccess 'mkEUI64Suffix "ff-ff-ff-ff-ff-ff"' '"fdff:ffff:feff:ffff"' +expectSuccess 'mkEUI64Suffix "ffffffffffff"' '"fdff:ffff:feff:ffff"' +expectSuccess 'mkEUI64Suffix "00.00.00.00.00.00"' '"200:00ff:fe00:0000"' +expectSuccess 'mkEUI64Suffix "000000000000"' '"200:00ff:fe00:0000"' + +expectFailure 'mkEUI64Suffix "123456789AB"' "doesn't meet MAC address criteria" +expectFailure 'mkEUI64Suffix "123456789A"' "doesn't meet MAC address criteria" +expectFailure 'mkEUI64Suffix "123456789"' "doesn't meet MAC address criteria" +expectFailure 'mkEUI64Suffix "12345678"' "doesn't meet MAC address criteria" +expectFailure 'mkEUI64Suffix "1234567"' "doesn't meet MAC address criteria" +expectFailure 'mkEUI64Suffix "123456"' "doesn't meet MAC address criteria" +expectFailure 'mkEUI64Suffix "12345"' "doesn't meet MAC address criteria" +expectFailure 'mkEUI64Suffix "1234"' "doesn't meet MAC address criteria" +expectFailure 'mkEUI64Suffix "123"' "doesn't meet MAC address criteria" +expectFailure 'mkEUI64Suffix "12"' "doesn't meet MAC address criteria" +expectFailure 'mkEUI64Suffix "1"' "doesn't meet MAC address criteria" +expectFailure 'mkEUI64Suffix ""' "doesn't meet MAC address criteria" +expectFailure 'mkEUI64Suffix "------------"' "doesn't meet MAC address criteria" +expectFailure 'mkEUI64Suffix "............"' "doesn't meet MAC address criteria" +expectFailure 'mkEUI64Suffix "::::::::::::"' "doesn't meet MAC address criteria" +expectFailure 'mkEUI64Suffix "1:2:3:4:5:6"' "doesn't meet MAC address criteria" +expectFailure 'mkEUI64Suffix "0.0.0.0.0.0"' "doesn't meet MAC address criteria" +expectFailure 'mkEUI64Suffix "00:11:-2:AA:BB:CC"' "doesn't meet MAC address criteria" +expectFailure 'mkEUI64Suffix "00:-11:22:AA:BB:CC"' "doesn't meet MAC address criteria" + echo >&2 tests ok From 9aef91bf0a8967f4409ea348dab42541a33885ab Mon Sep 17 00:00:00 2001 From: Henri Rosten Date: Tue, 9 Sep 2025 12:22:33 +0300 Subject: [PATCH 031/116] sbomnix: 1.7.2 -> 1.7.3 Signed-off-by: Henri Rosten --- pkgs/by-name/sb/sbomnix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sb/sbomnix/package.nix b/pkgs/by-name/sb/sbomnix/package.nix index 67ae168f0814..51ae36a7c9e8 100644 --- a/pkgs/by-name/sb/sbomnix/package.nix +++ b/pkgs/by-name/sb/sbomnix/package.nix @@ -29,14 +29,14 @@ in python.pkgs.buildPythonApplication rec { pname = "sbomnix"; - version = "1.7.2"; + version = "1.7.3"; pyproject = true; src = fetchFromGitHub { owner = "tiiuae"; repo = "sbomnix"; tag = "v${version}"; - hash = "sha256-Vtrxpb6nTTR5a9sFi1NrhEflhPOwv1gt6i7DnggJwMs="; + hash = "sha256-eN0dn2TNVEPSfIiJM0NA+HT1l4DnFq1mrSOOUF0h9xY="; # Remove documentation as it contains references to nix store postFetch = '' From de1e068b1f49a8b2b3abf9e2d1ad0b987e75841e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 9 Sep 2025 15:39:30 +0200 Subject: [PATCH 032/116] ghcWithPackages: expose targetPrefix --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 6fb552d22c75..b683febeaf6c 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -178,7 +178,7 @@ else + postBuild; preferLocalBuild = true; passthru = { - inherit (ghc) version meta; + inherit (ghc) version meta targetPrefix; hoogle = hoogleWithPackages'; From d1bc568af24346f8af5d50277c58679c9e40c71c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 9 Sep 2025 15:40:03 +0200 Subject: [PATCH 033/116] tests.haskell.ghcWithPackages: verify -fllvm works with useLLVM Note that this test also succeeds in pkgsCross though using a stdenv with cc is crucial, since its setup hooks are required for -lgmp to work. Maybe this is something we should look at for GHC again, maybe we can add extra entries to the package db, so it passes the necessary -L flags by itself? --- pkgs/test/haskell/ghcWithPackages/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/test/haskell/ghcWithPackages/default.nix b/pkgs/test/haskell/ghcWithPackages/default.nix index c31721b9531e..e1140ae0b482 100644 --- a/pkgs/test/haskell/ghcWithPackages/default.nix +++ b/pkgs/test/haskell/ghcWithPackages/default.nix @@ -1,6 +1,7 @@ { lib, runCommand, + runCommandCC, haskellPackages, }: @@ -45,4 +46,21 @@ lib.recurseIntoAttrs { touch $out ''; + + use-llvm = + let + ghc = (haskellPackages.ghcWithPackages.override { useLLVM = true; }) (_: [ ]); + in + runCommandCC "ghc-with-packages-use-llvm" + { + nativeBuildInputs = [ ghc ]; + } + '' + echo 'main = pure ()' > test.hs + # -ddump-llvm is unnecessary, but nice for visual feedback in the build log + ${ghc.targetPrefix}ghc --make -fllvm -keep-llvm-files -ddump-llvm test.hs + # Did we actually use the LLVM backend? + test -f test.ll + touch $out + ''; } From 49ac23d75d420c9f9d27dcfbeb30971f1a760de4 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 9 Sep 2025 15:43:29 +0200 Subject: [PATCH 034/116] tests.haskell.ghcWithPackages.regression-224542: make cross aware Obviously, we can't run GHCi of a cross-compiler, but respecting targetPrefix will give a more helpful error message: : not built for interactive use --- pkgs/test/haskell/ghcWithPackages/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/test/haskell/ghcWithPackages/default.nix b/pkgs/test/haskell/ghcWithPackages/default.nix index e1140ae0b482..aedcac0d2c91 100644 --- a/pkgs/test/haskell/ghcWithPackages/default.nix +++ b/pkgs/test/haskell/ghcWithPackages/default.nix @@ -22,16 +22,19 @@ lib.recurseIntoAttrs { # See: https://github.com/NixOS/nixpkgs/pull/224542 regression-224542 = + let + ghc = haskellPackages.ghcWithPackages (hsPkgs: [ + hsPkgs.hspec + ]); + in runCommand "regression-224542" { - buildInputs = [ - (haskellPackages.ghcWithPackages (hsPkgs: [ - hsPkgs.hspec - ])) + nativeBuildInputs = [ + ghc ]; } '' - ghc --interactive \ + ${ghc.targetPrefix}ghc --interactive \ -Werror=unrecognised-warning-flags \ -Werror=missed-extra-shared-lib \ 2>&1 \ From 6dddf8cc3d5ccd3c882398bfe924d1921a048763 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Sep 2025 15:35:53 +0000 Subject: [PATCH 035/116] scx.full: 1.0.15 -> 1.0.16 --- pkgs/os-specific/linux/scx/version.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/scx/version.json b/pkgs/os-specific/linux/scx/version.json index ba4efd7bc025..67d5cb1bed11 100644 --- a/pkgs/os-specific/linux/scx/version.json +++ b/pkgs/os-specific/linux/scx/version.json @@ -1,8 +1,8 @@ { "scx": { - "version": "1.0.15", - "hash": "sha256-HZIcJVWb0prkCjoSw7hd4JKve+unWFnfz9bGXZaF6EA=", - "cargoHash": "sha256-CRk8vLwSylNM5M9j0iwRbAmzAREUOJAl28BdY2o1zGs=" + "version": "1.0.16", + "hash": "sha256-fL8SlwIJOEme3bUTk1huv61jg/2QUWtUFaplM3DmCWI=", + "cargoHash": "sha256-CrQclEsb/Bkoe3SI069vKWiIUepk8f1Tts1MKpgphsM=" }, "bpftool": { "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e", From b03e0dd68164e86da75f095afb7cc91efebb4517 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Tue, 9 Sep 2025 23:33:38 +0800 Subject: [PATCH 036/116] f2: 2.1.2 -> 2.2.0 --- pkgs/by-name/f2/f2/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/f2/f2/package.nix b/pkgs/by-name/f2/f2/package.nix index b152d9ad0e46..e19f2c6e76e3 100644 --- a/pkgs/by-name/f2/f2/package.nix +++ b/pkgs/by-name/f2/f2/package.nix @@ -1,23 +1,23 @@ { lib, fetchFromGitHub, - buildGoModule, + buildGo125Module, exiftool, nix-update-script, }: -buildGoModule (finalAttrs: { +buildGo125Module (finalAttrs: { pname = "f2"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "ayoisaiah"; repo = "f2"; tag = "v${finalAttrs.version}"; - hash = "sha256-Roectcq8jMtw9bFnojJBq4+8dG7V4AGxclfqVSTdl4A="; + hash = "sha256-eIsy7YYWAiP4Oqla/wsJW2hQ1LgG+QkFxtUPagbmAuM="; }; - vendorHash = "sha256-i6hgLj1zu8D0mrO0f+SZ4wAkmMKIPtzOKpu9zMAEML0="; + vendorHash = "sha256-DHUX+8gw+pmjEQRUeukzTimfYo0iHyN90MjrOlpjoJg="; ldflags = [ "-s" From f043d4e4ffae1619f773c871cbf8b18ce1310759 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Tue, 9 Sep 2025 20:19:23 +0200 Subject: [PATCH 037/116] chezmoi: 2.64.0 -> 2.65.0 --- pkgs/by-name/ch/chezmoi/package.nix | 87 ++++++++++++++--------------- 1 file changed, 42 insertions(+), 45 deletions(-) diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index 9a76c0b696ee..d179311b21cd 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -1,53 +1,50 @@ { lib, - buildGoModule, + buildGo125Module, fetchFromGitHub, installShellFiles, }: -let - argset = { - pname = "chezmoi"; - version = "2.64.0"; +buildGo125Module (finalAttrs: { + pname = "chezmoi"; + version = "2.65.0"; - src = fetchFromGitHub { - owner = "twpayne"; - repo = "chezmoi"; - rev = "v${argset.version}"; - hash = "sha256-MiIZfT2ax5LszSboXOtDp0hOpOJ8gXqeBTXyoacl+BY="; - }; - - vendorHash = "sha256-LVq++K5ElXeArEpXLnSxg+8D9XJoXCHozOPeJrFbDRE="; - - nativeBuildInputs = [ - installShellFiles - ]; - - ldflags = [ - "-s" - "-w" - "-X main.version=${argset.version}" - "-X main.builtBy=nixpkgs" - ]; - - doCheck = false; - - postInstall = '' - installShellCompletion --bash --name chezmoi.bash completions/chezmoi-completion.bash - installShellCompletion --fish completions/chezmoi.fish - installShellCompletion --zsh completions/chezmoi.zsh - ''; - - subPackages = [ "." ]; - - meta = { - homepage = "https://www.chezmoi.io/"; - description = "Manage your dotfiles across multiple machines, securely"; - changelog = "https://github.com/twpayne/chezmoi/releases/tag/${argset.src.rev}"; - license = lib.licenses.mit; - mainProgram = "chezmoi"; - maintainers = with lib.maintainers; [ ]; - }; + src = fetchFromGitHub { + owner = "twpayne"; + repo = "chezmoi"; + tag = "v${finalAttrs.version}"; + hash = "sha256-neUltKkmNUtTajTwfWIIM9sJfDSXuAqJT3uLq6vR5NE="; }; -in -buildGoModule argset + + vendorHash = "sha256-NQ7k9bydAJDOGRX3bvRGkX5FuU8Va1IjUa6h0JEiLzo="; + + nativeBuildInputs = [ + installShellFiles + ]; + + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-w" + "-X main.version=${finalAttrs.version}" + "-X main.builtBy=nixpkgs" + ]; + + doCheck = false; + + postInstall = '' + installShellCompletion --bash --name chezmoi.bash completions/chezmoi-completion.bash + installShellCompletion --fish completions/chezmoi.fish + installShellCompletion --zsh completions/chezmoi.zsh + ''; + + meta = { + description = "Manage your dotfiles across multiple machines, securely"; + homepage = "https://www.chezmoi.io/"; + changelog = "https://github.com/twpayne/chezmoi/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + mainProgram = "chezmoi"; + }; +}) From a9df711087546c44e28a4a236071744939aabee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 8 Sep 2025 01:16:55 +0200 Subject: [PATCH 038/116] anubis: 1.21.3 -> 1.22.0 The new preact challenge uses go generate and depends on the node_modules directory being available. To make things easier and more closely to how upstream builds things, I removed the xess package and added some, lets be honest to ourselves, hacks to build the new things without breaking the FODs. Changelog: https://github.com/TecharoHQ/anubis/releases/tag/v1.22.0 Co-authored-by: Ryan Omasta --- pkgs/by-name/an/anubis/package.nix | 63 +++++++++++++++++------------- pkgs/by-name/an/anubis/update.sh | 8 ---- 2 files changed, 35 insertions(+), 36 deletions(-) delete mode 100755 pkgs/by-name/an/anubis/update.sh diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix index 668fc4973a9e..98ebf26eb7ca 100644 --- a/pkgs/by-name/an/anubis/package.nix +++ b/pkgs/by-name/an/anubis/package.nix @@ -2,53 +2,45 @@ lib, buildGoModule, fetchFromGitHub, + fetchNpmDeps, nixosTests, stdenv, - buildNpmPackage, - + npmHooks, + nodejs, esbuild, brotli, zstd, + nix-update-script, }: buildGoModule (finalAttrs: { pname = "anubis"; - version = "1.21.3"; + version = "1.22.0"; src = fetchFromGitHub { owner = "TecharoHQ"; repo = "anubis"; tag = "v${finalAttrs.version}"; - hash = "sha256-CMFd9che+D1ot1Iqk0VcJmna0xIqHlRIvNnzYo+q+RU="; + hash = "sha256-LOYBl9r00AJljGvlacd506cLeMr8Ndh817/ZIw46Uu0="; }; - vendorHash = "sha256-cWkC3Bqut5h3hHh5tPIPeHMnkwoqKMnG1x40uCtUIwI="; + vendorHash = "sha256-/iTAbwYSHTz9SrJ0vrAXsA+3yS0jUreJDF52gju9CgU="; + + npmDeps = fetchNpmDeps { + name = "anubis-npm-deps"; + inherit (finalAttrs) src; + hash = "sha256-s+OxVf6Iysobfuo0nAh5qF157opD2sR5D+7awAx6GTs="; + }; nativeBuildInputs = [ esbuild brotli zstd + + nodejs + npmHooks.npmConfigHook ]; - xess = buildNpmPackage { - pname = "anubis-xess"; - inherit (finalAttrs) version src; - - npmDepsHash = "sha256-NJMUXGXcaY8l1WIbvCn+aIknVuagR7X8gRkme9xpYQ0="; - - buildPhase = '' - runHook preBuild - npx postcss ./xess/xess.css -o xess.min.css - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -Dm644 xess.min.css $out/xess.min.css - runHook postInstall - ''; - }; - subPackages = [ "cmd/anubis" ]; ldflags = [ @@ -58,20 +50,35 @@ buildGoModule (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-extldflags=-static" ]; + prePatch = '' + # we must forcefully disable the hook when creating the go vendor archive + if [[ $name =~ go-modules ]]; then + npmConfigHook() { true; } + fi + ''; + postPatch = '' - patchShebangs ./web/build.sh + patchShebangs ./web/build.sh ./lib/challenge/preact/build.sh ''; preBuild = '' - go generate ./... && ./web/build.sh && cp -r ${finalAttrs.xess}/xess.min.css ./xess + # do not run when creating go vendor archive + if [[ ! $name =~ go-modules ]]; then + # https://github.com/TecharoHQ/anubis/blob/main/xess/build.sh + npx postcss ./xess/xess.css -o xess/xess.min.css + go generate ./... + ./web/build.sh + fi ''; preCheck = '' export DONT_USE_NETWORK=1 ''; - passthru.tests = { inherit (nixosTests) anubis; }; - passthru.updateScript = ./update.sh; + passthru = { + tests = { inherit (nixosTests) anubis; }; + updateScript = nix-update-script { extraArgs = [ "--version-regex=^v(\\d+\\.\\d+\\.\\d+)$" ]; }; + }; meta = { description = "Weighs the soul of incoming HTTP requests using proof-of-work to stop AI crawlers"; diff --git a/pkgs/by-name/an/anubis/update.sh b/pkgs/by-name/an/anubis/update.sh deleted file mode 100755 index fa62b90b82cc..000000000000 --- a/pkgs/by-name/an/anubis/update.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update - -set -euo pipefail - -nix-update anubis --src-only --version-regex='^v(\d+\.\d+\.\d+)$' -nix-update anubis.xess --version=skip -nix-update anubis --version=skip From 8d39b4fb2632b79a442edf4cdb26083e58f42e62 Mon Sep 17 00:00:00 2001 From: Qiming Chu Date: Wed, 10 Sep 2025 11:20:36 +0800 Subject: [PATCH 039/116] add-determinism: 0.6.0 -> 0.7.0 Signed-off-by: Qiming Chu --- pkgs/by-name/ad/add-determinism/Cargo.lock | 488 ++++++++++++-------- pkgs/by-name/ad/add-determinism/package.nix | 13 +- 2 files changed, 289 insertions(+), 212 deletions(-) diff --git a/pkgs/by-name/ad/add-determinism/Cargo.lock b/pkgs/by-name/ad/add-determinism/Cargo.lock index a23863544736..8d0f821d17cf 100644 --- a/pkgs/by-name/ad/add-determinism/Cargo.lock +++ b/pkgs/by-name/ad/add-determinism/Cargo.lock @@ -1,14 +1,15 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 4 +version = 3 [[package]] name = "add-determinism" -version = "0.6.0" +version = "0.7.0" dependencies = [ "anyhow", "chrono", "clap", + "crossbeam-channel", "glob", "indoc", "itertools", @@ -18,8 +19,7 @@ dependencies = [ "num-integer", "num-traits", "regex", - "serde", - "serde_cbor", + "rlimit", "tempfile", "thiserror", "time", @@ -29,9 +29,9 @@ dependencies = [ [[package]] name = "adler2" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "aho-corasick" @@ -42,12 +42,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - [[package]] name = "android_system_properties" version = "0.1.5" @@ -59,9 +53,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192" dependencies = [ "anstyle", "anstyle-parse", @@ -74,62 +68,62 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" +checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" [[package]] name = "anstyle-parse" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.2" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2" dependencies = [ - "windows-sys", + "windows-sys 0.60.2", ] [[package]] name = "anstyle-wincon" -version = "3.0.7" +version = "3.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" +checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a" dependencies = [ "anstyle", - "once_cell", - "windows-sys", + "once_cell_polyfill", + "windows-sys 0.60.2", ] [[package]] name = "anyhow" -version = "1.0.95" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" +checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100" [[package]] name = "autocfg" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "bitflags" -version = "2.8.0" +version = "2.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" +checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394" [[package]] name = "bumpalo" -version = "3.17.0" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "byteorder" @@ -139,18 +133,19 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.2.13" +version = "1.2.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda" +checksum = "5252b3d2648e5eedbc1a6f501e3c795e07025c1e93bbf8bbdd6eef7f447a6d54" dependencies = [ + "find-msvc-tools", "shlex", ] [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" [[package]] name = "cfg_aliases" @@ -160,23 +155,22 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.39" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" dependencies = [ - "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets", + "windows-link 0.2.0", ] [[package]] name = "clap" -version = "4.5.29" +version = "4.5.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184" +checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931" dependencies = [ "clap_builder", "clap_derive", @@ -184,9 +178,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.29" +version = "4.5.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9" +checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6" dependencies = [ "anstream", "anstyle", @@ -196,9 +190,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.28" +version = "4.5.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" +checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c" dependencies = [ "heck", "proc-macro2", @@ -208,15 +202,15 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" +checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" [[package]] name = "colorchoice" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" [[package]] name = "core-foundation-sys" @@ -226,13 +220,22 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "crc32fast" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ "cfg-if", ] +[[package]] +name = "crossbeam-channel" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.21" @@ -241,27 +244,27 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "deranged" -version = "0.3.11" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc" dependencies = [ "powerfmt", ] [[package]] name = "either" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "errno" -version = "0.3.10" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.61.0", ] [[package]] @@ -271,10 +274,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] -name = "flate2" -version = "1.0.35" +name = "find-msvc-tools" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +checksum = "7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d" + +[[package]] +name = "flate2" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" dependencies = [ "crc32fast", "libz-sys", @@ -283,38 +292,32 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi 0.11.1+wasi-snapshot-preview1", ] [[package]] name = "getrandom" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ "cfg-if", "libc", - "wasi 0.13.3+wasi-0.2.2", - "windows-targets", + "r-efi", + "wasi 0.14.5+wasi-0.2.4", ] [[package]] name = "glob" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" - -[[package]] -name = "half" -version = "1.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[package]] name = "heck" @@ -324,14 +327,15 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "iana-time-zone" -version = "0.1.61" +version = "0.1.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", + "log", "wasm-bindgen", "windows-core", ] @@ -347,9 +351,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.5" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" +checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" [[package]] name = "is_terminal_polyfill" @@ -368,9 +372,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "0c0b063578492ceec17683ef2f8c5e89121fbd0b172cbc280635ab7567db2738" dependencies = [ "once_cell", "wasm-bindgen", @@ -387,21 +391,21 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.169" +version = "0.2.175" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" [[package]] name = "libm" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "libz-sys" -version = "1.1.21" +version = "1.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df9b68e50e6e0b26f672573834882eb57759f6db9b3be2ea3c35c91188bb4eaa" +checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d" dependencies = [ "cc", "pkg-config", @@ -410,21 +414,21 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.15" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" [[package]] name = "log" -version = "0.4.25" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "memchr" -version = "2.7.4" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" [[package]] name = "memoffset" @@ -437,9 +441,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.8.4" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", ] @@ -511,15 +515,21 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.3" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "once_cell_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" [[package]] name = "pkg-config" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "powerfmt" @@ -529,31 +539,37 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ "zerocopy", ] [[package]] name = "proc-macro2" -version = "1.0.93" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" +checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "rand" version = "0.8.5" @@ -581,14 +597,14 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.15", + "getrandom 0.2.16", ] [[package]] name = "regex" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912" dependencies = [ "aho-corasick", "memchr", @@ -598,9 +614,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6" dependencies = [ "aho-corasick", "memchr", @@ -609,28 +625,37 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001" + +[[package]] +name = "rlimit" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7043b63bd0cd1aaa628e476b80e6d4023a3b50eb32789f2728908107bd0c793a" +dependencies = [ + "libc", +] [[package]] name = "rustix" -version = "0.38.44" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" dependencies = [ "bitflags", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.61.0", ] [[package]] name = "rustversion" -version = "1.0.19" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "same-file" @@ -643,28 +668,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.217" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half", - "serde", -] - [[package]] name = "serde_derive" -version = "1.0.217" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", @@ -679,9 +694,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "smallvec" -version = "1.13.2" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "spin" @@ -697,9 +712,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.98" +version = "2.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" +checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" dependencies = [ "proc-macro2", "quote", @@ -708,16 +723,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.16.0" +version = "3.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91" +checksum = "84fa4d11fadde498443cca10fd3ac23c951f0dc59e080e9f4b93d4df4e4eea53" dependencies = [ - "cfg-if", "fastrand", - "getrandom 0.3.1", + "getrandom 0.3.3", "once_cell", "rustix", - "windows-sys", + "windows-sys 0.61.0", ] [[package]] @@ -742,9 +756,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.37" +version = "0.3.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" +checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031" dependencies = [ "deranged", "num-conv", @@ -755,15 +769,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" [[package]] name = "unicode-ident" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "utf8parse" @@ -789,36 +803,46 @@ dependencies = [ [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasi" -version = "0.13.3+wasi-0.2.2" +version = "0.14.5+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +checksum = "a4494f6290a82f5fe584817a676a34b9d6763e8d9d18204009fb31dceca98fd4" dependencies = [ - "wit-bindgen-rt", + "wasip2", +] + +[[package]] +name = "wasip2" +version = "1.0.0+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03fa2761397e5bd52002cd7e73110c71af2109aca4e521a9f40473fe685b0a24" +dependencies = [ + "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "7e14915cadd45b529bb8d1f343c4ed0ac1de926144b746e2710f9cd05df6603b" dependencies = [ "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", + "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +checksum = "e28d1ba982ca7923fd01448d5c30c6864d0a14109560296a162f80f305fb93bb" dependencies = [ "bumpalo", "log", @@ -830,9 +854,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "7c3d463ae3eff775b0c45df9da45d68837702ac35af998361e2c84e7c5ec1b0d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -840,9 +864,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "7bb4ce89b08211f923caf51d527662b75bdc9c9c7aab40f86dcb9fb85ac552aa" dependencies = [ "proc-macro2", "quote", @@ -853,46 +877,112 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "f143854a3b13752c6950862c906306adb27c7e839f7414cec8fea35beab624c1" dependencies = [ "unicode-ident", ] [[package]] name = "winapi-util" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys", + "windows-sys 0.61.0", ] [[package]] name = "windows-core" -version = "0.52.0" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link 0.1.3", + "windows-result", + "windows-strings", +] + +[[package]] +name = "windows-implement" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.59.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-link" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + +[[package]] +name = "windows-link" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" + +[[package]] +name = "windows-result" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +dependencies = [ + "windows-link 0.1.3", +] + +[[package]] +name = "windows-strings" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link 0.1.3", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ "windows-targets", ] [[package]] name = "windows-sys" -version = "0.59.0" +version = "0.61.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa" dependencies = [ - "windows-targets", + "windows-link 0.2.0", ] [[package]] name = "windows-targets" -version = "0.52.6" +version = "0.53.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" dependencies = [ + "windows-link 0.1.3", "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", @@ -905,76 +995,72 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.6" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" [[package]] name = "windows_aarch64_msvc" -version = "0.52.6" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" [[package]] name = "windows_i686_gnu" -version = "0.52.6" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" [[package]] name = "windows_i686_gnullvm" -version = "0.52.6" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" [[package]] name = "windows_i686_msvc" -version = "0.52.6" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" [[package]] name = "windows_x86_64_gnu" -version = "0.52.6" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.6" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" [[package]] name = "windows_x86_64_msvc" -version = "0.52.6" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] -name = "wit-bindgen-rt" -version = "0.33.0" +name = "wit-bindgen" +version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" -dependencies = [ - "bitflags", -] +checksum = "5c573471f125075647d03df72e026074b7203790d41351cd6edc96f46bcccd36" [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" dependencies = [ - "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/by-name/ad/add-determinism/package.nix b/pkgs/by-name/ad/add-determinism/package.nix index 9f84acea1d60..74dc8905a88c 100644 --- a/pkgs/by-name/ad/add-determinism/package.nix +++ b/pkgs/by-name/ad/add-determinism/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "add-determinism"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "keszybz"; repo = "add-determinism"; tag = "v${version}"; - hash = "sha256-QFhed8YTgvfm6bB/cRsrnN0foplJhK1b9IYD9HGdJUc="; + hash = "sha256-jUBHIdqPuK95jNNMFeSgj0xd3WSneqRa0kcVDhFC3aw="; }; # this project has no Cargo.lock now @@ -24,15 +24,6 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; }; - patches = [ - # fix MetadataExt imports for macOS builds, will be removed when the PR is merged: - # https://github.com/keszybz/add-determinism/pull/48 - (fetchpatch { - url = "https://github.com/Emin017/add-determinism/commit/0c6c4d1c78c845ab6b6b0666aee0e2dc85492205.patch"; - sha256 = "sha256-y5blOfQuZ5GMug4cDkDDKc5jaGgQEYtLTuuLl041sZs="; - }) - ]; - postPatch = '' ln -s ${./Cargo.lock} Cargo.lock ''; From 13425f0def2b378f708a604f78098ea7550a1d48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Sep 2025 08:06:13 +0000 Subject: [PATCH 040/116] dependabot-cli: 1.71.0 -> 1.72.0 --- pkgs/by-name/de/dependabot-cli/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix index 9ba6982bebac..c81ed9dd146d 100644 --- a/pkgs/by-name/de/dependabot-cli/package.nix +++ b/pkgs/by-name/de/dependabot-cli/package.nix @@ -12,20 +12,20 @@ }: let pname = "dependabot-cli"; - version = "1.71.0"; + version = "1.72.0"; # `tag` is what `dependabot` uses to find the relevant docker images. tag = "nixpkgs-dependabot-cli-${version}"; # Get these hashes from # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag} - updateJobProxy.imageDigest = "sha256:a42f9b9845929ae044b8cd51b5335195c33fd610405e558552408287c5295827"; - updateJobProxy.hash = "sha256-pEtwBoJ+wF2TdQCcCyigLg4NYqOp2oNCEB7oCJOkwYc="; + updateJobProxy.imageDigest = "sha256:b0a4c841300510255d6e647e9bcdb939d194bc644dee7962a543f637515b0f23"; + updateJobProxy.hash = "sha256-+drR2uTtaQU0ckPTEbEBj5yvDtSP0BC3D0MxqRZ1Cjc="; # Get these hashes from # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag} - updaterGitHubActions.imageDigest = "sha256:ca93364b87b6a803d0005409cdb4c61d9c6d808dca33de47de14ef8c30811b51"; - updaterGitHubActions.hash = "sha256-TnV8IaBrGPpd06YYmvazGMlZTAVJIMCSWdOgi6hkpRE="; + updaterGitHubActions.imageDigest = "sha256:3cbd297b1181de69e72a43ce2d7aa02eb7c2e71bc0c11d41288a86384af24aa0"; + updaterGitHubActions.hash = "sha256-Btn7bsBNJb34T7JXmgpTxkxBXXT9IpQihernhNAT/HQ="; in buildGoModule { inherit pname version; @@ -34,10 +34,10 @@ buildGoModule { owner = "dependabot"; repo = "cli"; rev = "v${version}"; - hash = "sha256-RZNZ72FG4KQr52X0No6iXU4NMUQs7k000KYpw2Kuz5U="; + hash = "sha256-YI5HkypIEWkPmdtPvMrOp7r71ccucAEKNFo/va6yICE="; }; - vendorHash = "sha256-5zOMTe8Sa/nkIGtwm4FbAqv3/9Mg5Du2ixxF84VQbXE="; + vendorHash = "sha256-KrjwObQ3o5A0JuOW71EKNi9yNJYwsPHI+6a0AZY/cqU="; ldflags = [ "-s" From 0cc17dee54e72fb3978396c713aedd5bd88d096a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 10 Sep 2025 22:45:58 +0800 Subject: [PATCH 041/116] pantheon.elementary-dock: 8.1.2 -> 8.2.0 https://github.com/elementary/dock/compare/8.1.2...8.2.0 --- pkgs/desktops/pantheon/apps/elementary-dock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix index a5daf2a75a4d..c06c1412c254 100644 --- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "elementary-dock"; - version = "8.1.2"; + version = "8.2.0"; outputs = [ "out" @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "elementary"; repo = "dock"; rev = finalAttrs.version; - hash = "sha256-hZ1xfEBN+pGj0TxNy5dSQrYuba2I0dmXl0p65rU73H4="; + hash = "sha256-aKRWb/xtusb9Q2xq6GdM7WzNSweBqWbYUejQq4Or86s="; }; depsBuildBuild = [ pkg-config ]; From 4951398eeb47c92cc4ce6308d4170f31f7ef33ab Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 10 Sep 2025 10:22:45 -0500 Subject: [PATCH 042/116] vimPlugins.advanced-git-search-nvim: fix hard depenency on pickers Plugin offers configuration to choose which picker you'd like, don't need to pollute environment with extra deps. Signed-off-by: Austin Horstman --- pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 9447e31c576b..60d8ecde6b2d 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -143,13 +143,13 @@ in assertNoAdditions { advanced-git-search-nvim = super.advanced-git-search-nvim.overrideAttrs { checkInputs = with self; [ + fzf-lua snacks-nvim + telescope-nvim ]; dependencies = with self; [ - telescope-nvim vim-fugitive vim-rhubarb - fzf-lua plenary-nvim ]; }; From 2bce09281d45e332336cbbe6e1cb3bbea029506a Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 10 Sep 2025 10:26:39 -0500 Subject: [PATCH 043/116] vimPlugins.easy-dotnet-nvim: fix hard depenency on pickers Plugin offers configuration to choose which picker you'd like, don't need to pollute environment with extra deps. Signed-off-by: Austin Horstman --- pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 60d8ecde6b2d..4ee042bb2a20 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1107,11 +1107,11 @@ assertNoAdditions { easy-dotnet-nvim = super.easy-dotnet-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim - telescope-nvim ]; checkInputs = with self; [ - # Pickers, can use telescope or fzf-lua + # Pickers, can use telescope, fzf-lua, or snacks fzf-lua + telescope-nvim ]; }; From c5b01def48f64636c6f4995296d03ad65bf235ae Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 10 Sep 2025 10:33:52 -0500 Subject: [PATCH 044/116] vimPlugins.leetcode-nvim: fix hard depenency on pickers Plugin offers configuration to choose which picker you'd like, don't need to pollute environment with extra deps. Signed-off-by: Austin Horstman --- pkgs/applications/editors/vim/plugins/overrides.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 4ee042bb2a20..c302729761c4 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1628,11 +1628,13 @@ assertNoAdditions { }; leetcode-nvim = super.leetcode-nvim.overrideAttrs { - checkInputs = [ self.snacks-nvim ]; + checkInputs = with self; [ + snacks-nvim + telescope-nvim + ]; dependencies = with self; [ nui-nvim plenary-nvim - telescope-nvim ]; doInstallCheck = true; From fb6aa56a7e0fa46ecc2d0a1a3d7b9b448a3d21f6 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 10 Sep 2025 10:38:47 -0500 Subject: [PATCH 045/116] vimPlugins.neotest-playwright: fix hard dependency on telescope Telescope is the supported picker, but the plugin checks if you have it available before trying to use it. Allowing you to use the neotest integration without telescope. Signed-off-by: Austin Horstman --- pkgs/applications/editors/vim/plugins/overrides.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index c302729761c4..182dcddd36d7 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2187,11 +2187,14 @@ assertNoAdditions { }; neotest-playwright = super.neotest-playwright.overrideAttrs { + checkInputs = with self; [ + # Optional picker integration + telescope-nvim + ]; dependencies = with self; [ neotest nvim-nio plenary-nvim - telescope-nvim ]; # Unit test assert nvimSkipModules = "neotest-playwright-assertions"; From 67c7581e6b1a904715e45f500be3399b498f21b5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 10 Sep 2025 10:53:58 -0500 Subject: [PATCH 046/116] vimPlugins.uv-nvim: fix hard depenency on pickers Plugin offers configuration to choose which picker you'd like, don't need to pollute environment with extra deps. Signed-off-by: Austin Horstman --- pkgs/applications/editors/vim/plugins/overrides.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 182dcddd36d7..1890e2071b79 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3607,9 +3607,6 @@ assertNoAdditions { }; uv-nvim = super.uv-nvim.overrideAttrs { - dependencies = with self; [ - telescope-nvim - ]; runtimeDeps = [ uv ]; }; From bb8032ca5410b7523e153e9c3c5f9c620c2c981d Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 10 Sep 2025 10:58:05 -0500 Subject: [PATCH 047/116] vimPlugins.vs-tasks-nvim: fix hard depenency on pickers Plugin offers configuration to choose which picker you'd like, don't need to pollute environment with extra deps. Signed-off-by: Austin Horstman --- pkgs/applications/editors/vim/plugins/overrides.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 1890e2071b79..572549bee744 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -4010,9 +4010,12 @@ assertNoAdditions { }; vs-tasks-nvim = super.vs-tasks-nvim.overrideAttrs { - dependencies = with self; [ - plenary-nvim - telescope-nvim + checkInputs = [ + # Optional telescope integration + self.telescope-nvim + ]; + dependencies = [ + self.plenary-nvim ]; }; From 8abab37e4b1fe257b84f78266498d2d2b218401f Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 10 Sep 2025 18:27:21 +0200 Subject: [PATCH 048/116] warzone2100: 4.5.5 -> 4.6.0 --- pkgs/by-name/wa/warzone2100/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/warzone2100/package.nix b/pkgs/by-name/wa/warzone2100/package.nix index 3dd785a1f9aa..3de1e3c07d47 100644 --- a/pkgs/by-name/wa/warzone2100/package.nix +++ b/pkgs/by-name/wa/warzone2100/package.nix @@ -27,6 +27,8 @@ vulkan-headers, vulkan-loader, shaderc, + protobuf, + libzip, testers, warzone2100, @@ -47,11 +49,11 @@ in stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "4.5.5"; + version = "4.6.0"; src = fetchurl { url = "mirror://sourceforge/project/warzone2100/releases/${finalAttrs.version}/warzone2100_src.tar.xz"; - hash = "sha256-B/YbrnIWh+3rYtpId+hQMKA6BTpZPWRRlPxld44EgP8="; + hash = "sha256-kL8dfXN6ku6778Yu3M969ZMGSU5sQm6mp1k+MQKSk48="; }; buildInputs = [ @@ -69,6 +71,8 @@ stdenv.mkDerivation (finalAttrs: { freetype harfbuzz sqlite + protobuf + libzip ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ vulkan-headers From f9c2ec4adf8070cf34e2de03ecb0fafeee776fea Mon Sep 17 00:00:00 2001 From: Zachary Arnaise <121795280+zacharyarnaise@users.noreply.github.com> Date: Wed, 10 Sep 2025 19:08:32 +0200 Subject: [PATCH 049/116] tilt: 0.35.0 -> 0.35.1 --- pkgs/by-name/ti/tilt/assets.nix | 2 +- pkgs/by-name/ti/tilt/package.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ti/tilt/assets.nix b/pkgs/by-name/ti/tilt/assets.nix index 31b4ac1e7874..7ef54abef59c 100644 --- a/pkgs/by-name/ti/tilt/assets.nix +++ b/pkgs/by-name/ti/tilt/assets.nix @@ -68,7 +68,7 @@ stdenvNoCC.mkDerivation { dontInstall = true; outputHashAlgo = "sha256"; - outputHash = "sha256-twc8mtBPizQrA9kRtQpSXG8Q404sbGVs5ay4MHitPgg="; + outputHash = "sha256-UdNvUSz86E1W1gVPQrxt5g3Z3JIX/tq8rI5E8+h20PI="; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/ti/tilt/package.nix b/pkgs/by-name/ti/tilt/package.nix index bd43271ff243..52299b1b00c4 100644 --- a/pkgs/by-name/ti/tilt/package.nix +++ b/pkgs/by-name/ti/tilt/package.nix @@ -9,13 +9,13 @@ let running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.35.0"; + version = "0.35.1"; src = fetchFromGitHub { owner = "tilt-dev"; repo = "tilt"; tag = "v${version}"; - hash = "sha256-IXmycwZFeDbCNFtLh126FvVSuugFoElj1TfU5Bdl5rc="; + hash = "sha256-rM5INMOECbnuWd4ealBcIuMwZij7MthrXfohOBavl8Y="; }; }; From 805641797695652b3645e41da3d3587a5ccfa34e Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Wed, 10 Sep 2025 13:11:20 -0400 Subject: [PATCH 050/116] erlang_26: 26.2.5.14 -> 26.2.5.15 https://github.com/erlang/otp/releases/tag/OTP-26.2.5.15 --- pkgs/development/interpreters/erlang/26.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix index 78891d06af72..30e891baba29 100644 --- a/pkgs/development/interpreters/erlang/26.nix +++ b/pkgs/development/interpreters/erlang/26.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "26.2.5.14"; - sha256 = "sha256-/m76FtCJvIjNuvM96XV3ngFMgKF8C5uCH89YQklJKpo="; + version = "26.2.5.15"; + sha256 = "sha256-D2JfB7D9mhbmYvJfjSMbcdNrlYNWa/BfqAeqsbjTZlE="; } From 586cfaf842c9cf24969b7fbf77425c861f1957ec Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Wed, 10 Sep 2025 13:16:23 -0400 Subject: [PATCH 051/116] erlang_27: 27.3.4.2 -> 27.3.4.3 https://github.com/erlang/otp/releases/tag/OTP-27.3.4.3 --- pkgs/development/interpreters/erlang/27.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix index bc6b0507aac8..ee6baf22b471 100644 --- a/pkgs/development/interpreters/erlang/27.nix +++ b/pkgs/development/interpreters/erlang/27.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "27.3.4.2"; - sha256 = "sha256-wbaRSTwTrNADbShNHoWorWyD+2ul6NZbRs6isP3g+OI="; + version = "27.3.4.3"; + sha256 = "sha256-p4M1PPrbpNq6la4kgTTCOa2f5/oYxNwMaSi59mhlM4o="; } From 0095c1d3c38ea25dd526618f5d917af0a57a0e71 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Wed, 10 Sep 2025 13:18:03 -0400 Subject: [PATCH 052/116] erlang_28: 28.0.2 -> 28.0.3 https://github.com/erlang/otp/releases/tag/OTP-28.0.3 --- pkgs/development/interpreters/erlang/28.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/28.nix b/pkgs/development/interpreters/erlang/28.nix index e9594b18621f..4160e592aad9 100644 --- a/pkgs/development/interpreters/erlang/28.nix +++ b/pkgs/development/interpreters/erlang/28.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "28.0.2"; - sha256 = "sha256-4+Jv7MUX4KAwasNyU7AiV9+Qd9NginYXTN0fDteTFEM="; + version = "28.0.3"; + sha256 = "sha256-fNuUMJs4nPZF0iptPxrd7xi13CDmLnA348hnyPFgL5Q="; } From 672b1cf62fe0f0bff4c5c3a1ba9b9aa70a36ce1f Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 10 Sep 2025 13:05:08 -0500 Subject: [PATCH 053/116] vimPlugins.nvim-tinygit: remove hard depenency on telescope Only interactive stagign requiring telescope, but other pickers can be used for all the other functionality. Signed-off-by: Austin Horstman --- pkgs/applications/editors/vim/plugins/overrides.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 572549bee744..d9a0e05828e4 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2641,14 +2641,10 @@ assertNoAdditions { }; nvim-tinygit = super.nvim-tinygit.overrideAttrs { - dependencies = with self; [ - telescope-nvim - ]; - checkInputs = [ gitMinimal - # transitive dependency (telescope-nvim) not properly propagated to the test environment - self.plenary-nvim + # interactive staging support + self.telescope-nvim ]; }; From ced4e68950af82bd36101f1b56da02324efc0941 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 10 Sep 2025 20:19:49 +0200 Subject: [PATCH 054/116] finit: enable keventd functionality --- pkgs/by-name/fi/finit/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/fi/finit/package.nix b/pkgs/by-name/fi/finit/package.nix index 580a6ca97114..0993428521b1 100644 --- a/pkgs/by-name/fi/finit/package.nix +++ b/pkgs/by-name/fi/finit/package.nix @@ -53,6 +53,9 @@ stdenv.mkDerivation (finalAttrs: { # minimal replacement for systemd notification library "--with-libsystemd" + + # monitor kernel events, like ac power status + "--with-keventd" ]; env.NIX_CFLAGS_COMPILE = toString [ From 03c5c9b2ad11df6fd14c64893084f9f6a48402ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Sep 2025 18:25:07 +0000 Subject: [PATCH 055/116] llama-cpp: 6210 -> 6442 --- pkgs/by-name/ll/llama-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index b3733b1f8342..9f9af59cc7de 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -73,13 +73,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "6210"; + version = "6442"; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-yPlFw3fuXvf4+IhOv0nVI9hnuZq73Br6INn8wdOmCOs="; + hash = "sha256-YNH7gvFtkHaZDnABg9pxJjnsASQfrRU4iqKqVa79MO8="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT From 68253aae9bd742cff45706ab66e470ab7502b728 Mon Sep 17 00:00:00 2001 From: nukdokplex Date: Wed, 10 Sep 2025 13:31:23 +0500 Subject: [PATCH 056/116] lib.mkEUI64Suffix: bring @hsjobeki suggestions renamed `mac` to `octets` in hextets combining step for better var naming; rephrased error message to provide a hint of expected format; replaced `Arguments` with `Inputs` in docstring; added more test cases for invalid hex digits; added comments in hextets combining step; --- lib/network/default.nix | 25 ++++++++++++++++------- lib/tests/network.sh | 44 +++++++++++++++++++++++------------------ 2 files changed, 43 insertions(+), 26 deletions(-) diff --git a/lib/network/default.nix b/lib/network/default.nix index 14d801244966..54934b138db0 100644 --- a/lib/network/default.nix +++ b/lib/network/default.nix @@ -70,7 +70,7 @@ in mkEUI64Suffix :: String -> String ``` - # Argumemts + # Inputs mac : The MAC address (may contain these delimiters: `:`, `-` or `.` but it's not necessary) @@ -82,14 +82,25 @@ in (match "^([0-9A-Fa-f]{2})[-:.]?([0-9A-Fa-f]{2})[-:.]?([0-9A-Fa-f]{2})[-:.]?([0-9A-Fa-f]{2})[-:.]?([0-9A-Fa-f]{2})[-:.]?([0-9A-Fa-f]{2})$") # check if there are matches - (matches: if matches == null then throw ''"${mac}" doesn't meet MAC address criteria'' else matches) + ( + matches: + if matches == null then + throw ''"${mac}" is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)'' + else + matches + ) # transform to result hextets - (mac: [ - (toHexString (bitXor 512 (fromHexString ((elemAt mac 0) + (elemAt mac 1))))) - "${elemAt mac 2}ff" - "fe${elemAt mac 3}" - ((elemAt mac 4) + (elemAt mac 5)) + (octets: [ + # combine 1st and 2nd octets into first hextet, flip U/L bit, 512 = 0x200 + (toHexString (bitXor 512 (fromHexString ((elemAt octets 0) + (elemAt octets 1))))) + + # combine 3rd and 4th octets, combine them, insert fffe pattern in between to get next two hextets + "${elemAt octets 2}ff" + "fe${elemAt octets 3}" + + # combine 5th and 6th octets into the last hextet + ((elemAt octets 4) + (elemAt octets 5)) ]) # concat to result suffix diff --git a/lib/tests/network.sh b/lib/tests/network.sh index b0c917b8b222..e873ac851fe8 100755 --- a/lib/tests/network.sh +++ b/lib/tests/network.sh @@ -132,24 +132,30 @@ expectSuccess 'mkEUI64Suffix "ffffffffffff"' '"fdff:ffff:feff:ffff"' expectSuccess 'mkEUI64Suffix "00.00.00.00.00.00"' '"200:00ff:fe00:0000"' expectSuccess 'mkEUI64Suffix "000000000000"' '"200:00ff:fe00:0000"' -expectFailure 'mkEUI64Suffix "123456789AB"' "doesn't meet MAC address criteria" -expectFailure 'mkEUI64Suffix "123456789A"' "doesn't meet MAC address criteria" -expectFailure 'mkEUI64Suffix "123456789"' "doesn't meet MAC address criteria" -expectFailure 'mkEUI64Suffix "12345678"' "doesn't meet MAC address criteria" -expectFailure 'mkEUI64Suffix "1234567"' "doesn't meet MAC address criteria" -expectFailure 'mkEUI64Suffix "123456"' "doesn't meet MAC address criteria" -expectFailure 'mkEUI64Suffix "12345"' "doesn't meet MAC address criteria" -expectFailure 'mkEUI64Suffix "1234"' "doesn't meet MAC address criteria" -expectFailure 'mkEUI64Suffix "123"' "doesn't meet MAC address criteria" -expectFailure 'mkEUI64Suffix "12"' "doesn't meet MAC address criteria" -expectFailure 'mkEUI64Suffix "1"' "doesn't meet MAC address criteria" -expectFailure 'mkEUI64Suffix ""' "doesn't meet MAC address criteria" -expectFailure 'mkEUI64Suffix "------------"' "doesn't meet MAC address criteria" -expectFailure 'mkEUI64Suffix "............"' "doesn't meet MAC address criteria" -expectFailure 'mkEUI64Suffix "::::::::::::"' "doesn't meet MAC address criteria" -expectFailure 'mkEUI64Suffix "1:2:3:4:5:6"' "doesn't meet MAC address criteria" -expectFailure 'mkEUI64Suffix "0.0.0.0.0.0"' "doesn't meet MAC address criteria" -expectFailure 'mkEUI64Suffix "00:11:-2:AA:BB:CC"' "doesn't meet MAC address criteria" -expectFailure 'mkEUI64Suffix "00:-11:22:AA:BB:CC"' "doesn't meet MAC address criteria" +expectFailure 'mkEUI64Suffix "123456789AB"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "123456789A"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "123456789"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "12345678"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "1234567"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "123456"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "12345"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "1234"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "123"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "12"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "1"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix ""' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "------------"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "............"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "::::::::::::"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "1:2:3:4:5:6"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "0.0.0.0.0.0"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "00:11:-2:AA:BB:CC"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "00:-11:22:AA:BB:CC"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "ab:cd:ef:g0:12:34' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "AB:CD:EF:G0:12:34' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "ab:cd:ef:gh:jk:lm' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "AB:CD:EF:GH:JK:LM' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "01:23:3a:bc:de:fg"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "01:23:3A:BC:DE:FG"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" echo >&2 tests ok From d24f103572bc7dd16f4ffa844cc6b315be603656 Mon Sep 17 00:00:00 2001 From: nukdokplex Date: Thu, 11 Sep 2025 00:01:53 +0500 Subject: [PATCH 057/116] lib.mkEUI64Suffix: fix syntax errors and tests --- lib/network/default.nix | 2 +- lib/tests/network.sh | 50 ++++++++++++++++++++--------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/network/default.nix b/lib/network/default.nix index 54934b138db0..822abc9abf53 100644 --- a/lib/network/default.nix +++ b/lib/network/default.nix @@ -85,7 +85,7 @@ in ( matches: if matches == null then - throw ''"${mac}" is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)'' + throw ''"${mac}" is not a valid MAC address (expected 6 octets of hex digits)'' else matches ) diff --git a/lib/tests/network.sh b/lib/tests/network.sh index e873ac851fe8..543a75c0f565 100755 --- a/lib/tests/network.sh +++ b/lib/tests/network.sh @@ -132,30 +132,30 @@ expectSuccess 'mkEUI64Suffix "ffffffffffff"' '"fdff:ffff:feff:ffff"' expectSuccess 'mkEUI64Suffix "00.00.00.00.00.00"' '"200:00ff:fe00:0000"' expectSuccess 'mkEUI64Suffix "000000000000"' '"200:00ff:fe00:0000"' -expectFailure 'mkEUI64Suffix "123456789AB"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "123456789A"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "123456789"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "12345678"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "1234567"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "123456"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "12345"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "1234"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "123"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "12"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "1"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix ""' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "------------"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "............"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "::::::::::::"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "1:2:3:4:5:6"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "0.0.0.0.0.0"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "00:11:-2:AA:BB:CC"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "00:-11:22:AA:BB:CC"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "ab:cd:ef:g0:12:34' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "AB:CD:EF:G0:12:34' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "ab:cd:ef:gh:jk:lm' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "AB:CD:EF:GH:JK:LM' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "01:23:3a:bc:de:fg"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "01:23:3A:BC:DE:FG"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "123456789AB"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "123456789A"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "123456789"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "12345678"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "1234567"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "123456"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "12345"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "1234"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "123"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "12"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "1"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix ""' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "------------"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "............"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "::::::::::::"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "1:2:3:4:5:6"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "0.0.0.0.0.0"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "00:11:-2:AA:BB:CC"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "00:-11:22:AA:BB:CC"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "ab:cd:ef:g0:12:34"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "AB:CD:EF:G0:12:34"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "ab:cd:ef:gh:jk:lm"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "AB:CD:EF:GH:JK:LM"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "01:23:3a:bc:de:fg"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "01:23:3A:BC:DE:FG"' "is not a valid MAC address \(expected 6 octets of hex digits\)" echo >&2 tests ok From 468337fed4a26a4967dad493e8569d9281814a3a Mon Sep 17 00:00:00 2001 From: Rafael Ieda Date: Wed, 10 Sep 2025 16:30:30 -0300 Subject: [PATCH 058/116] bolt-launcher: fix superfluous CMAKE --- pkgs/by-name/bo/bolt-launcher/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix index 662e6e03b12a..873898272736 100644 --- a/pkgs/by-name/bo/bolt-launcher/package.nix +++ b/pkgs/by-name/bo/bolt-launcher/package.nix @@ -67,7 +67,6 @@ let ]; cmakeFlags = [ - "-D CMAKE_BUILD_TYPE=Release" "-D BOLT_LUAJIT_INCLUDE_DIR=${luajit}/include" "-G Ninja" ] From 87062c596ba10629ffe97ffa2528a46ec345b5d3 Mon Sep 17 00:00:00 2001 From: Amaan Qureshi Date: Wed, 10 Sep 2025 15:42:39 -0400 Subject: [PATCH 059/116] tree-sitter-grammars.tree-sitter-yaml: switch to maintained fork --- .../tree-sitter/grammars/tree-sitter-yaml.json | 15 ++++++++------- .../tools/parsing/tree-sitter/update.nix | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json index 94b8ac0f1cf3..a0472d268303 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json @@ -1,13 +1,14 @@ { - "url": "https://github.com/ikatyang/tree-sitter-yaml", - "rev": "0e36bed171768908f331ff7dff9d956bae016efb", - "date": "2021-05-11T12:47:24+08:00", - "path": "/nix/store/7d7m4zs4ydnwbn3xnfm3pvpy7gvkrmg8-tree-sitter-yaml", - "sha256": "0wyvjh62zdp5bhd2y8k7k7x4wz952l55i1c8d94rhffsbbf9763f", - "hash": "sha256-bpiT3FraOZhJaoiFWAoVJX1O+plnIi8aXOW2LwyU23M=", + "url": "https://github.com/tree-sitter-grammars/tree-sitter-yaml", + "rev": "9632edc32eb86966a482fcb3c9a7f4bb78ae0ddb", + "date": "2025-05-22T16:31:05+03:00", + "path": "/nix/store/rz2zq4cpjgkcnl9b3y0wckcz91a4b7lz-tree-sitter-yaml", + "sha256": "0j03miv56d0sh9cnnrxjxwzwjiypw9pqxpx698f9zjc80mlzyqk7", + "hash": "sha256-Z2L/aQWIyZ8cSqbfjm/i10fJP++yZ2tZgho0U3asA0g=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, "fetchTags": false, - "leaveDotGit": false + "leaveDotGit": false, + "rootDir": "" } diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 2a499434aa6f..c9518d9f17a8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -209,7 +209,7 @@ let repo = "tree-sitter-viml"; }; "tree-sitter-yaml" = { - orga = "ikatyang"; + orga = "tree-sitter-grammars"; repo = "tree-sitter-yaml"; }; "tree-sitter-zig" = { From f1fb555a2c1d03d40a8dd1b46dd0be7f507be0f7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 10 Sep 2025 21:54:25 +0200 Subject: [PATCH 060/116] rehex: 0.63.2 -> 0.63.3 --- pkgs/by-name/re/rehex/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/rehex/package.nix b/pkgs/by-name/re/rehex/package.nix index 2749549d189e..8ef49c0dda68 100644 --- a/pkgs/by-name/re/rehex/package.nix +++ b/pkgs/by-name/re/rehex/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, pkg-config, which, zip, @@ -21,13 +20,13 @@ stdenv.mkDerivation rec { pname = "rehex"; - version = "0.63.2"; + version = "0.63.3"; src = fetchFromGitHub { owner = "solemnwarning"; repo = "rehex"; tag = version; - hash = "sha256-de92lBnn0tp7Awm6PLJw12GfYohXY9m59XPmw7npvOg="; + hash = "sha256-o/ff0V0pMomXRu1DrD/m+M6364NisUI+8+RwryIsSLc="; }; nativeBuildInputs = [ From 231b39263956ab9bda0afb67ec1d324831b64eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= Date: Wed, 10 Sep 2025 22:03:27 +0200 Subject: [PATCH 061/116] fwupd: 2.0.14 -> 2.0.15 Diff: https://github.com/fwupd/fwupd/compare/2.0.14...2.0.15 Changelog: https://github.com/fwupd/fwupd/releases/tag/2.0.15 --- pkgs/by-name/fw/fwupd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index 3028c49a384c..47e5df45b400 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -133,7 +133,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "2.0.14"; + version = "2.0.15"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; tag = finalAttrs.version; - hash = "sha256-VUpLYl7SKJqwbM3Lna22txTeMwqtpQieiw1DLX/4xtA="; + hash = "sha256-p0ZpbthjUaEKAn1UwzoW2gxqiBTsC4GMoXTmV3zKN2o="; }; patches = [ From 28a87b88ec8d69365df03cf38e99547ace8670fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Sep 2025 20:28:49 +0000 Subject: [PATCH 062/116] snac2: 2.81 -> 2.82 --- pkgs/by-name/sn/snac2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snac2/package.nix b/pkgs/by-name/sn/snac2/package.nix index 90038ea24f21..a8f7f20c8683 100644 --- a/pkgs/by-name/sn/snac2/package.nix +++ b/pkgs/by-name/sn/snac2/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "snac2"; - version = "2.81"; + version = "2.82"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = "snac2"; tag = finalAttrs.version; - hash = "sha256-ozK+T8V4KNqNhkLYw4yJd0u56I3wsxl9ctWFmfJplos="; + hash = "sha256-iYBxx1QqjK1fsrADIiyAzftpNoH33vKRbjkeppHL39k="; }; buildInputs = [ From 1b9fe3f92a6d83cbf0968c7860c164273b3cec66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= Date: Wed, 10 Sep 2025 23:03:11 +0200 Subject: [PATCH 063/116] fwupd: add libmnl for new devlink plugin With this present, the plugin is automatically enabled. --- pkgs/by-name/fw/fwupd/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index 47e5df45b400..b90d3f399dd1 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -47,6 +47,7 @@ libgudev, libjcat, libmbim, + libmnl, libqmi, libuuid, libxmlb, @@ -234,6 +235,7 @@ stdenv.mkDerivation (finalAttrs: { libgudev libjcat libmbim + libmnl libqmi libuuid libxmlb From a0f6575e05b1b528ec3687b3bb8afae4946d5362 Mon Sep 17 00:00:00 2001 From: George Macon Date: Wed, 3 Sep 2025 20:56:33 -0400 Subject: [PATCH 064/116] cwtch: 0.1.6 -> 0.1.7 --- pkgs/by-name/cw/cwtch/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cw/cwtch/package.nix b/pkgs/by-name/cw/cwtch/package.nix index c7eb92c10e44..83d3c210d8bf 100644 --- a/pkgs/by-name/cw/cwtch/package.nix +++ b/pkgs/by-name/cw/cwtch/package.nix @@ -5,15 +5,15 @@ }: buildGoModule rec { pname = "libcwtch"; - version = "0.1.6"; + version = "0.1.7"; # This Gitea instance has archive downloads disabled, so: fetchgit src = fetchgit { url = "https://git.openprivacy.ca/cwtch.im/autobindings.git"; rev = "v${version}"; - hash = "sha256-LlnfGHwjZFvygVF1/f9q+q1rD0OpEGIPzt7E6N6HWDc="; + hash = "sha256-QHEaf3xm6SIHLnQamf0cUrKJ/A1v0iFaaGsMg33uIBs="; }; - vendorHash = "sha256-t9SupYMfWBF0wHY3EFVT1zu0vvcd4OD/aQqlPeExw04="; + vendorHash = "sha256-pnAdUFG1G0Bi/e9KNVX0WwloJy8xQ25YVFnGerRGy9A="; overrideModAttrs = ( old: { preBuild = '' From 8275a9eb5da871559e6a891f7e6aa1af44b20b04 Mon Sep 17 00:00:00 2001 From: George Macon Date: Wed, 3 Sep 2025 21:07:24 -0400 Subject: [PATCH 065/116] cwtch-ui: 1.15.5 -> 1.16.0 --- pkgs/by-name/cw/cwtch-ui/package.nix | 9 +- pkgs/by-name/cw/cwtch-ui/pubspec.json | 520 +++++++++++++++----------- 2 files changed, 310 insertions(+), 219 deletions(-) diff --git a/pkgs/by-name/cw/cwtch-ui/package.nix b/pkgs/by-name/cw/cwtch-ui/package.nix index 97199ed5092f..56ec33b81e40 100644 --- a/pkgs/by-name/cw/cwtch-ui/package.nix +++ b/pkgs/by-name/cw/cwtch-ui/package.nix @@ -12,19 +12,14 @@ let in flutter329.buildFlutterApplication rec { pname = "cwtch-ui"; - version = "1.15.5"; + version = "1.16.0"; # This Gitea instance has archive downloads disabled, so: fetchgit src = fetchgit { url = "https://git.openprivacy.ca/cwtch.im/cwtch-ui"; rev = "v${version}"; - hash = "sha256-u0IFLZp53Fg8soKjSXr6IjNxFI9aTU5xUYgf1SN6rTQ="; + hash = "sha256-887BiDqu35kocQmren9/rRhLdMNEXPmzsQFAixUvTxo="; }; - # NOTE: The included pubspec.json does not exactly match the upstream - # pubspec.lock. With Flutter 3.24, a newer version of material_color_utilities - # is required than the upstream locked version. From a checkout of cwtch-ui - # 1.15.4, I ran `flutter pub upgrade material_color_utilities` on 2024-12-15. - # This upgraded material_color_utilities and its dependencies. pubspecLock = lib.importJSON ./pubspec.json; gitHashes = { flutter_gherkin = "sha256-Y8tR84kkczQPBwh7cGhPFAAqrMZKRfGp/02huPaaQZg="; diff --git a/pkgs/by-name/cw/cwtch-ui/pubspec.json b/pkgs/by-name/cw/cwtch-ui/pubspec.json index 493c10f67c14..bbc362826141 100644 --- a/pkgs/by-name/cw/cwtch-ui/pubspec.json +++ b/pkgs/by-name/cw/cwtch-ui/pubspec.json @@ -4,121 +4,127 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", + "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab", "url": "https://pub.dev" }, "source": "hosted", - "version": "67.0.0" + "version": "76.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.3" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", + "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.4.1" + "version": "6.11.0" }, "archive": { "dependency": "transitive", "description": { "name": "archive", - "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.6.1" + "version": "4.0.7" }, "args": { "dependency": "transitive", "description": { "name": "args", - "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0" + "version": "2.7.0" }, "async": { "dependency": "transitive", "description": { "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.12.0" }, "boolean_selector": { "dependency": "transitive", "description": { "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "build": { "dependency": "transitive", "description": { "name": "build", - "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.1" - }, - "build_config": { - "dependency": "transitive", - "description": { - "name": "build_config", - "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "build_daemon": { - "dependency": "transitive", - "description": { - "name": "build_daemon", - "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.2" - }, - "build_resolvers": { - "dependency": "transitive", - "description": { - "name": "build_resolvers", - "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", + "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0", "url": "https://pub.dev" }, "source": "hosted", "version": "2.4.2" }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.4" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.4" + }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7", + "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.11" + "version": "2.4.15" }, "build_runner_core": { "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe", + "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.3.1" + "version": "8.0.0" }, "built_collection": { "dependency": "transitive", @@ -134,21 +140,21 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.2" + "version": "8.9.5" }, "characters": { "dependency": "transitive", "description": { "name": "characters", - "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "checked_yaml": { "dependency": "transitive", @@ -160,45 +166,55 @@ "source": "hosted", "version": "2.0.3" }, + "cli_config": { + "dependency": "transitive", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, "cli_util": { "dependency": "transitive", "description": { "name": "cli_util", - "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.1" + "version": "0.4.2" }, "clock": { "dependency": "transitive", "description": { "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "code_builder": { "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", + "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.10.0" + "version": "4.10.1" }, "collection": { "dependency": "transitive", "description": { "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.0" + "version": "1.19.1" }, "connectivity_plus": { "dependency": "direct main", @@ -232,31 +248,41 @@ "dependency": "transitive", "description": { "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.1" + "version": "3.1.2" }, "coverage": { "dependency": "transitive", "description": { "name": "coverage", - "sha256": "c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5", + "sha256": "802bd084fb82e55df091ec8ad1553a7331b61c08251eef19a508b6f3f3a9858d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.2" + "version": "1.13.1" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4+2" }, "crypto": { "dependency": "direct main", "description": { "name": "crypto", - "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.3" + "version": "3.0.6" }, "cupertino_icons": { "dependency": "direct main", @@ -272,71 +298,71 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", + "sha256": "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.6" + "version": "2.3.8" }, "dbus": { "dependency": "direct main", "description": { "name": "dbus", - "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.10" + "version": "0.7.11" }, "fake_async": { "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "1.3.2" }, "ffi": { "dependency": "direct main", "description": { "name": "ffi", - "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "file": { "dependency": "transitive", "description": { "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.0.1" }, "file_picker": { "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "bdfa035a974a0c080576c4c8ed01cdf9d1b406a04c7daa05443ef0383a97bedc", + "sha256": "dd51fd20fdc45e073529c102376d54deba3e120603fe711c848ce44575b838e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.3.4" + "version": "10.1.8" }, "fixnum": { "dependency": "transitive", "description": { "name": "fixnum", - "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "flutter": { "dependency": "direct main", @@ -365,31 +391,31 @@ "dependency": "direct main", "description": { "name": "flutter_local_notifications", - "sha256": "5f79a1be5e9fef9ddd7f494532d31851399099f9defc21ebcb1ae4539e8a37f1", + "sha256": "ef41ae901e7529e52934feba19ed82827b11baa67336829564aeab3129460610", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.1.5" + "version": "18.0.1" }, "flutter_local_notifications_linux": { "dependency": "transitive", "description": { "name": "flutter_local_notifications_linux", - "sha256": "33f741ef47b5f63cc7f78fe75eeeac7e19f171ff3c3df054d84c1e38bedb6a03", + "sha256": "8f685642876742c941b29c32030f6f4f6dacd0e4eaecb3efbb187d6a3812ca01", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0+1" + "version": "5.0.0" }, "flutter_local_notifications_platform_interface": { "dependency": "transitive", "description": { "name": "flutter_local_notifications_platform_interface", - "sha256": "340abf67df238f7f0ef58f4a26d2a83e1ab74c77ab03cd2b2d5018ac64db30b7", + "sha256": "6c5b83c86bf819cdb177a9247a3722067dd8cc6313827ce7c77a4b238a26fd52", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.1.0" + "version": "8.0.0" }, "flutter_localizations": { "dependency": "direct main", @@ -401,11 +427,11 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "c6b0b4c05c458e1c01ad9bcc14041dd7b1f6783d487be4386f793f47a8a4d03e", + "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.20" + "version": "2.0.28" }, "flutter_test": { "dependency": "transitive", @@ -459,61 +485,61 @@ "dependency": "direct main", "description": { "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "graphs": { "dependency": "transitive", "description": { "name": "graphs", - "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "2.3.2" }, "http": { "dependency": "transitive", "description": { "name": "http", - "sha256": "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938", + "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.4.0" }, "http_multi_server": { "dependency": "transitive", "description": { "name": "http_multi_server", - "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "http_parser": { "dependency": "transitive", "description": { "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.1.2" }, "image": { "dependency": "transitive", "description": { "name": "image", - "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8", + "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.0" + "version": "4.5.4" }, "integration_test": { "dependency": "transitive", @@ -535,11 +561,11 @@ "dependency": "transitive", "description": { "name": "io", - "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.0.5" }, "js": { "dependency": "transitive", @@ -565,21 +591,21 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.5" + "version": "10.0.8" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.5" + "version": "3.0.9" }, "leak_tracker_testing": { "dependency": "transitive", @@ -595,21 +621,31 @@ "dependency": "transitive", "description": { "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3-main.0" }, "matcher": { "dependency": "transitive", "description": { "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16+1" + "version": "0.12.17" }, "material_color_utilities": { "dependency": "transitive", @@ -625,31 +661,31 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.16.0" }, "mime": { "dependency": "transitive", "description": { "name": "mime", - "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.5" + "version": "2.0.0" }, "msix": { "dependency": "direct dev", "description": { "name": "msix", - "sha256": "519b183d15dc9f9c594f247e2d2339d855cf0eaacc30e19b128e14f3ecc62047", + "sha256": "edde648a8133bf301883c869d19d127049683037c65ff64173ba526ac7a8af2f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.16.7" + "version": "3.16.9" }, "nested": { "dependency": "transitive", @@ -675,71 +711,71 @@ "dependency": "transitive", "description": { "name": "package_config", - "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.2.0" }, "package_info_plus": { "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017", + "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.0" + "version": "8.3.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6", + "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "3.2.0" }, "path": { "dependency": "direct main", "description": { "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.0" + "version": "1.9.1" }, "path_provider": { "dependency": "direct main", "description": { "name": "path_provider", - "sha256": "c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161", + "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.5" }, "path_provider_android": { "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "bca87b0165ffd7cdb9cad8edd22d18d2201e886d9a9f19b4fb3452ea7df3a72a", + "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.6" + "version": "2.2.17" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16", + "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.1" }, "path_provider_linux": { "dependency": "transitive", @@ -765,31 +801,31 @@ "dependency": "transitive", "description": { "name": "path_provider_windows", - "sha256": "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.3.0" }, "petitparser": { "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.1.0" }, "platform": { "dependency": "transitive", "description": { "name": "platform", - "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.5" + "version": "3.1.6" }, "plugin_platform_interface": { "dependency": "transitive", @@ -811,55 +847,65 @@ "source": "hosted", "version": "1.5.1" }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, "process": { "dependency": "transitive", "description": { "name": "process", - "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", + "sha256": "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.2" + "version": "5.0.3" }, "provider": { "dependency": "direct main", "description": { "name": "provider", - "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", + "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.2" + "version": "6.1.5" }, "pub_semver": { "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.2.0" }, "pubspec_parse": { "dependency": "transitive", "description": { "name": "pubspec_parse", - "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.5.0" }, "qr": { "dependency": "transitive", "description": { "name": "qr", - "sha256": "64957a3930367bf97cc211a5af99551d630f2f4625e38af10edd6b19131b64b3", + "sha256": "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "qr_flutter": { "dependency": "direct main", @@ -875,11 +921,51 @@ "dependency": "transitive", "description": { "name": "screen_retriever", - "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", + "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.9" + "version": "0.2.0" + }, + "screen_retriever_linux": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_linux", + "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_macos": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_macos", + "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_platform_interface", + "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_windows": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_windows", + "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" }, "scrollable_positioned_list": { "dependency": "direct main", @@ -895,11 +981,11 @@ "dependency": "transitive", "description": { "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.1" + "version": "1.4.2" }, "shelf_packages_handler": { "dependency": "transitive", @@ -925,17 +1011,17 @@ "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "3.0.0" }, "sky_engine": { "dependency": "transitive", "description": "flutter", "source": "sdk", - "version": "0.0.99" + "version": "0.0.0" }, "source_gen": { "dependency": "transitive", @@ -961,61 +1047,61 @@ "dependency": "transitive", "description": { "name": "source_maps", - "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.10.12" + "version": "0.10.13" }, "source_span": { "dependency": "transitive", "description": { "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.10.1" }, "stack_trace": { "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.1" + "version": "1.12.1" }, "stream_channel": { "dependency": "transitive", "description": { "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.4" }, "stream_transform": { "dependency": "transitive", "description": { "name": "stream_transform", - "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "string_scanner": { "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.4.1" }, "sync_http": { "dependency": "transitive", @@ -1031,121 +1117,121 @@ "dependency": "transitive", "description": { "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.1" + "version": "1.2.2" }, "test": { "dependency": "direct dev", "description": { "name": "test", - "sha256": "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e", + "sha256": "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.25.7" + "version": "1.25.15" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.2" + "version": "0.7.4" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696", + "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.4" + "version": "0.6.8" }, "timezone": { "dependency": "transitive", "description": { "name": "timezone", - "sha256": "a6ccda4a69a442098b602c44e61a1e2b4bf6f5516e875bbf0f427d5df14745d5", + "sha256": "dd14a3b83cfd7cb19e7888f1cbc20f258b8d71b54c06f79ac585f14093a287d1", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.3" + "version": "0.10.1" }, "timing": { "dependency": "transitive", "description": { "name": "timing", - "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "1.0.2" }, "typed_data": { "dependency": "transitive", "description": { "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.4.0" }, "url_launcher": { "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3", + "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.0" + "version": "6.3.1" }, "url_launcher_android": { "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf", + "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.3" + "version": "6.3.16" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89", + "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.0" + "version": "6.3.3" }, "url_launcher_linux": { "dependency": "transitive", "description": { "name": "url_launcher_linux", - "sha256": "ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811", + "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.1" + "version": "3.2.1" }, "url_launcher_macos": { "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de", + "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "3.2.2" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -1161,21 +1247,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a", + "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "2.4.1" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7", + "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.1" + "version": "3.1.4" }, "uuid": { "dependency": "transitive", @@ -1201,51 +1287,61 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.5" + "version": "14.3.1" }, "watcher": { "dependency": "transitive", "description": { "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web": { "dependency": "transitive", "description": { "name": "web", - "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1" + "version": "1.1.1" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.5" + "version": "3.0.3" }, "webdriver": { "dependency": "transitive", "description": { "name": "webdriver", - "sha256": "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e", + "sha256": "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.3" + "version": "3.0.4" }, "webkit_inspection_protocol": { "dependency": "transitive", @@ -1261,11 +1357,11 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4", + "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.5.1" + "version": "5.13.0" }, "win_toast": { "dependency": "direct main", @@ -1281,21 +1377,21 @@ "dependency": "direct main", "description": { "name": "window_manager", - "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf", + "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.9" + "version": "0.4.3" }, "xdg_directories": { "dependency": "transitive", "description": { "name": "xdg_directories", - "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.1.0" }, "xml": { "dependency": "transitive", @@ -1311,15 +1407,15 @@ "dependency": "direct main", "description": { "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.3" } }, "sdks": { - "dart": ">=3.4.0 <4.0.0", - "flutter": ">=3.22.0" + "dart": ">=3.7.0 <4.0.0", + "flutter": ">=3.27.0" } } From ad4761bbb6e9a39927caa6565092e1bfb0e835cc Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 10 Sep 2025 22:59:34 +0000 Subject: [PATCH 066/116] pkgsStatic.ovn: fix build --- pkgs/by-name/ov/ovn/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index dbc1e9b595ba..04df1fc24747 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -35,11 +35,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libbpf libcap_ng numactl openssl unbound + ] + ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ + libbpf xdp-tools ]; @@ -58,7 +60,8 @@ stdenv.mkDerivation rec { "--with-dbdir=/var/lib/ovn" "--sbindir=$(out)/bin" "--enable-ssl" - ]; + ] + ++ lib.optional stdenv.hostPlatform.isStatic "--with-openssl=${lib.getLib openssl.dev}"; enableParallelBuilding = true; From 239f75f9db0d67bdabdd25cabd14e002daac6f5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Sep 2025 00:42:26 +0000 Subject: [PATCH 067/116] compose2nix: 0.3.1 -> 0.3.2 --- pkgs/by-name/co/compose2nix/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/compose2nix/package.nix b/pkgs/by-name/co/compose2nix/package.nix index 550eb49b1271..d6da37a19c5d 100644 --- a/pkgs/by-name/co/compose2nix/package.nix +++ b/pkgs/by-name/co/compose2nix/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "compose2nix"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "aksiksi"; repo = "compose2nix"; rev = "v${version}"; - hash = "sha256-rFnnbRVVv/N5021Al3vmjFAui1cTp8NBZDBNQo8CsXM="; + hash = "sha256-3i49IyYDwyVQffjHrHPmtPJl4ZkT1VpiFVDmX/dHcKw="; }; - vendorHash = "sha256-kiUXgbXJg4x89k2SXf/1e1DLB04ETS+Qp2gx8uJA2DU="; + vendorHash = "sha256-ckN4nK2A0micl+iBtvxwf5iMchrcGdC0xzjQta6Jges="; passthru.tests = { version = testers.testVersion { From 6cb826411408eba3214d6ce4e1b50ee92072f123 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Sep 2025 00:48:11 +0000 Subject: [PATCH 068/116] sslh: 2.2.4 -> 2.3.0 --- pkgs/by-name/ss/sslh/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ss/sslh/package.nix b/pkgs/by-name/ss/sslh/package.nix index 451749ae8745..7ab12dfa5357 100644 --- a/pkgs/by-name/ss/sslh/package.nix +++ b/pkgs/by-name/ss/sslh/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "sslh"; - version = "2.2.4"; + version = "2.3.0"; src = fetchFromGitHub { owner = "yrutschle"; repo = "sslh"; rev = "v${version}"; - hash = "sha256-jG2+CT+Zcfkp+RLKcVfCTozgNuldfxKw7YaJLGKIZzE="; + hash = "sha256-qGOOqEe9wlR3pXmYEwMQTxuMcNLLX2i/39AIAb6I4jU="; }; postPatch = "patchShebangs *.sh"; From 5627c11ceb2cf43e623f00c78213f7d010a64a25 Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Thu, 11 Sep 2025 05:48:01 +0200 Subject: [PATCH 069/116] pico-sdk: 2.1.1 -> 2.2.0 --- pkgs/by-name/pi/pico-sdk/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pico-sdk/package.nix b/pkgs/by-name/pi/pico-sdk/package.nix index 0835ad2111ca..b478f4914c2a 100644 --- a/pkgs/by-name/pi/pico-sdk/package.nix +++ b/pkgs/by-name/pi/pico-sdk/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pico-sdk"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "raspberrypi"; @@ -26,11 +26,15 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = withSubmodules; hash = if withSubmodules then - "sha256-8ru1uGjs11S2yQ+aRAvzU53K8mreZ+CC3H+ijfctuqg=" + "sha256-8ubZW6yQnUTYxQqYI6hi7s3kFVQhe5EaxVvHmo93vgk=" else - "sha256-epO7yw6/21/ess3vMCkXvXEqAn6/4613zmH/hbaBbUw="; + "sha256-hQdEZD84/cnLSzP5Xr9vbOGROQz4BjeVOnvbyhe6rfM="; }; + cmakeFlags = [ + (lib.cmakeFeature "PIOASM_VERSION_STRING" finalAttrs.version) + ]; + nativeBuildInputs = [ cmake ]; # SDK contains libraries and build-system to develop projects for RP2040 chip From 77a88712d343b413082bcefa6fb13a9c4c264c2d Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Thu, 11 Sep 2025 14:01:30 +0800 Subject: [PATCH 070/116] python3Packages.docling-jobkit: 1.2.0 -> 1.5.0 --- .../python-modules/docling-jobkit/default.nix | 39 ++++++++----------- .../python-modules/docling-serve/default.nix | 2 +- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/docling-jobkit/default.nix b/pkgs/development/python-modules/docling-jobkit/default.nix index 7cfe20ee9478..fcbbff916315 100644 --- a/pkgs/development/python-modules/docling-jobkit/default.nix +++ b/pkgs/development/python-modules/docling-jobkit/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -18,32 +19,26 @@ httpx, # optional dependencies - tesserocr, - rapidocr, - onnxruntime, ray, + rq, + msgpack, # tests pytestCheckHook, pytest-asyncio, writableTmpDirAsHomeHook, - - # options - withTesserocr ? false, - withRapidocr ? false, - withRay ? false, }: buildPythonPackage rec { pname = "docling-jobkit"; - version = "1.2.0"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-jobkit"; tag = "v${version}"; - hash = "sha256-bLLcMbN6GNpZ8U5Fhyq/XaHawOFcrFrobY7Jtpdm8Qo="; + hash = "sha256-/rFMP5KiWHBsGaA2LVOWP2TkJLVeguIlrmO+JL610hQ="; }; build-system = [ @@ -60,18 +55,14 @@ buildPythonPackage rec { fastparquet pyarrow httpx - ] - ++ lib.optionals withTesserocr optional-dependencies.tesserocr - ++ lib.optionals withRapidocr optional-dependencies.rapidocr - ++ lib.optionals withRay optional-dependencies.ray; + ]; optional-dependencies = { - tesserocr = [ tesserocr ]; - rapidocr = [ - rapidocr - onnxruntime - ]; ray = [ ray ]; + rq = [ + rq + msgpack + ]; }; pythonRelaxDeps = [ @@ -89,14 +80,18 @@ buildPythonPackage rec { pytestCheckHook pytest-asyncio writableTmpDirAsHomeHook - ]; + ] + ++ optional-dependencies.rq; disabledTests = [ # requires network access - "test_convert_url" + "test_chunk_file" "test_convert_file" "test_convert_warmup" - + "test_convert_url" + "test_replicated_convert" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Flaky due to comparison with magic object # https://github.com/docling-project/docling-jobkit/issues/45 "test_options_validator" diff --git a/pkgs/development/python-modules/docling-serve/default.nix b/pkgs/development/python-modules/docling-serve/default.nix index bf3ebf1827c0..2867fb5c319a 100644 --- a/pkgs/development/python-modules/docling-serve/default.nix +++ b/pkgs/development/python-modules/docling-serve/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { dependencies = [ docling - (docling-jobkit.override { inherit withTesserocr withRapidocr; }) + docling-jobkit docling-mcp fastapi httpx From 00bb68554edee37b5456ec90ed44533d0facf6fd Mon Sep 17 00:00:00 2001 From: Nikola Knezevic Date: Mon, 25 Aug 2025 13:48:14 +0200 Subject: [PATCH 071/116] prek: init at 0.1.6 This change adds prek, a pre-commit drop-in replacement implemented in Rust. --- pkgs/by-name/pr/prek/package.nix | 109 +++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 pkgs/by-name/pr/prek/package.nix diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix new file mode 100644 index 000000000000..dbd0b8db832c --- /dev/null +++ b/pkgs/by-name/pr/prek/package.nix @@ -0,0 +1,109 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + git, + uv, + python312, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "prek"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "j178"; + repo = "prek"; + tag = "v${finalAttrs.version}"; + hash = "sha256-MVdd67ssP64aEV6rjNA3fxypqKn0lJe/UN2waCEkLJM="; + }; + + cargoHash = "sha256-XW8na9kXgn7gKaN7OYlEGTv8cgtzKXggj1uXlvQh4N4="; + + preBuild = '' + version312_str=$(${python312}/bin/python -c 'import sys; print(sys.version_info[:3])') + + substituteInPlace ./tests/languages/python.rs \ + --replace '(3, 12, 11)' "$version312_str" + ''; + + nativeCheckInputs = [ + git + python312 + uv + ]; + + preCheck = '' + export TEMP="$(mktemp -d)" + export TMP=$TEMP + export TMPDIR=$TEMP + export PREK_INTERNAL__TEST_DIR=$TEMP + ''; + + __darwinAllowLocalNetworking = true; + useNextest = true; + + # some python tests use uv, which in turn needs python + UV_PYTHON = "${python312}/bin/python"; + + checkFlags = builtins.map (t: "--skip ${t}") [ + # these tests require internet access + "check_added_large_files_hook" + "check_json_hook" + "end_of_file_fixer_hook" + "mixed_line_ending_hook" + "install_hooks_only" + "install_with_hooks" + "golang" + "node" + "script" + "check_useless_excludes_remote" + # "meta_hooks" + "reuse_env" + "docker::docker" + "docker_image::docker_image" + "pygrep::basic_case_sensitive" + "pygrep::case_insensitive" + "pygrep::case_insensitive_multiline" + "pygrep::complex_regex_patterns" + "pygrep::invalid_args" + "pygrep::invalid_regex" + "pygrep::multiline_mode" + "pygrep::negate_mode" + "pygrep::negate_multiline_mode" + "pygrep::pattern_not_found" + "pygrep::python_regex_quirks" + "python::additional_dependencies" + "python::can_not_download" + "python::hook_stderr" + "python::language_version" + # can't checkout pre-commit-hooks + "cjk_hook_name" + "fail_fast" + "file_types" + "files_and_exclude" + "git_commit_a" + "log_file" + "merge_conflicts" + "pass_env_vars" + "restore_on_interrupt" + "run_basic" + "run_last_commit" + "same_repo" + "skips" + "staged_files_only" + "subdirectory" + "check_yaml_hook" + "check_yaml_multiple_document" + # does not properly use TMP + "hook_impl" + ]; + + meta = { + homepage = "https://github.com/j178/prek"; + description = "Better `pre-commit`, re-engineered in Rust "; + changelog = "https://github.com/j178/prek/releases/tag/${finalAttrs.src.tag}"; + license = [ lib.licenses.mit ]; + maintainers = [ lib.maintainers.knl ]; + }; +}) From 225d0bcf521f18bfdf3c68f66f1b50c3c7cd250b Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:35:11 +0100 Subject: [PATCH 072/116] maintainers: add `adhityaravi` --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4c763e3d157c..a29bdef61ade 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -641,6 +641,12 @@ githubId = 8026586; name = "Adrien Faure"; }; + adhityaravi = { + email = "adhitya.ravi@canonical.com"; + github = "adhityaravi"; + githubId = 34714491; + name = "Adhitya Ravi"; + }; adisbladis = { email = "adisbladis@gmail.com"; matrix = "@adis:blad.is"; From 4b0d830bfcb6544b06d36ab8aaf9c29bbe71a783 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:36:45 +0100 Subject: [PATCH 073/116] maintainers: add `bepri` --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a29bdef61ade..6ccb2ff75af0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3197,6 +3197,12 @@ github = "benwis"; githubId = 6953353; }; + bepri = { + email = "imani.pelton@canonical.com"; + github = "bepri"; + githubId = 17732342; + name = "Imani Pelton"; + }; berberman = { email = "berberman@yandex.com"; matrix = "@berberman:mozilla.org"; From bcc54aa1854bae902002a63ce26ab4e014df864c Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:38:32 +0100 Subject: [PATCH 074/116] maintainers: add `dstathis` --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6ccb2ff75af0..517ee22f5a2c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6977,6 +6977,12 @@ github = "dsluijk"; githubId = 8537327; }; + dstathis = { + email = "dylan.stephano-shachter@canonical.com"; + github = "dstathis"; + githubId = 2110777; + name = "Dylan Stephano-Shachter"; + }; dstengele = { name = "Dennis Stengele"; email = "dennis@stengele.me"; From 82407b72a4c655f30977914ca27106feebf8ed47 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:40:09 +0100 Subject: [PATCH 075/116] charmcraft: update maintainers list --- pkgs/by-name/ch/charmcraft/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix index 52e640edfbf7..38b79cf0b262 100644 --- a/pkgs/by-name/ch/charmcraft/package.nix +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -132,7 +132,11 @@ python.pkgs.buildPythonApplication rec { homepage = "https://github.com/canonical/charmcraft"; changelog = "https://github.com/canonical/charmcraft/releases/tag/${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; platforms = lib.platforms.linux; }; } From 8099f85a159d78995a64efaf5cf4b518350ca563 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:40:35 +0100 Subject: [PATCH 076/116] rockcraft: update maintainers list --- pkgs/by-name/ro/rockcraft/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ro/rockcraft/package.nix b/pkgs/by-name/ro/rockcraft/package.nix index e252d33fcd45..3de6ea09808f 100644 --- a/pkgs/by-name/ro/rockcraft/package.nix +++ b/pkgs/by-name/ro/rockcraft/package.nix @@ -78,7 +78,11 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/canonical/rockcraft"; changelog = "https://github.com/canonical/rockcraft/releases/tag/${version}"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; platforms = lib.platforms.linux; }; } From c1be0449bcf886aabef06fe9e53a3d0a388f0f06 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:40:51 +0100 Subject: [PATCH 077/116] snapcraft: update maintainers list --- pkgs/by-name/sn/snapcraft/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index 0030b0eccb32..c2f088fa6d3b 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -203,7 +203,11 @@ python312Packages.buildPythonApplication rec { homepage = "https://github.com/canonical/snapcraft"; changelog = "https://github.com/canonical/snapcraft/releases/tag/${version}"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; platforms = lib.platforms.linux; }; } From 0aae4a752cada383c5b949e23605ca885b450caf Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:41:18 +0100 Subject: [PATCH 078/116] python3Packages.catkin-pkg: update maintainers list --- pkgs/development/python-modules/catkin-pkg/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/catkin-pkg/default.nix b/pkgs/development/python-modules/catkin-pkg/default.nix index a09cc9fd444e..c48d1b054b7b 100644 --- a/pkgs/development/python-modules/catkin-pkg/default.nix +++ b/pkgs/development/python-modules/catkin-pkg/default.nix @@ -42,6 +42,10 @@ buildPythonPackage rec { description = "Library for retrieving information about catkin packages"; homepage = "http://wiki.ros.org/catkin_pkg"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; }; } From 28a4490f6f068a92f0fd2454793b9a3c4727cc1f Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:41:43 +0100 Subject: [PATCH 079/116] python3Packages.craft-application: update maintainers list --- .../python-modules/craft-application/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index 5a31b052eb8e..a32b1fbf12dc 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -154,7 +154,11 @@ buildPythonPackage rec { homepage = "https://github.com/canonical/craft-application"; changelog = "https://github.com/canonical/craft-application/blob/${src.tag}/docs/reference/changelog.rst"; license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; platforms = lib.platforms.linux; }; } From 5153ea1d3ae6cee14f09adf51dc0c4bb433c8618 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:42:07 +0100 Subject: [PATCH 080/116] python3Packages.craft-archives: update maintainers list --- pkgs/development/python-modules/craft-archives/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/craft-archives/default.nix b/pkgs/development/python-modules/craft-archives/default.nix index f48aa94ae967..3c026f1c2233 100644 --- a/pkgs/development/python-modules/craft-archives/default.nix +++ b/pkgs/development/python-modules/craft-archives/default.nix @@ -67,7 +67,11 @@ buildPythonPackage rec { homepage = "https://github.com/canonical/craft-archives"; changelog = "https://github.com/canonical/craft-archives/releases/tag/${version}"; license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; platforms = lib.platforms.linux; }; } From 9afdea9b6523c49be0347a16a920d0a3c276af00 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:42:44 +0100 Subject: [PATCH 081/116] python3Packages.craft-cli: update maintainers list --- pkgs/development/python-modules/craft-cli/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/craft-cli/default.nix b/pkgs/development/python-modules/craft-cli/default.nix index 3fea4555a95b..5562c2c0dafe 100644 --- a/pkgs/development/python-modules/craft-cli/default.nix +++ b/pkgs/development/python-modules/craft-cli/default.nix @@ -59,7 +59,11 @@ buildPythonPackage rec { homepage = "https://github.com/canonical/craft-cli"; changelog = "https://github.com/canonical/craft-cli/releases/tag/${version}"; license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; platforms = lib.platforms.linux; }; } From 14bf79e0adb0e26a6ab7d207be22ff70a6040bb2 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:43:18 +0100 Subject: [PATCH 082/116] python3Packages.craft-grammar: update maintainers list --- pkgs/development/python-modules/craft-grammar/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/craft-grammar/default.nix b/pkgs/development/python-modules/craft-grammar/default.nix index a464fd1f15d3..3d64cc99911a 100644 --- a/pkgs/development/python-modules/craft-grammar/default.nix +++ b/pkgs/development/python-modules/craft-grammar/default.nix @@ -51,7 +51,11 @@ buildPythonPackage rec { homepage = "https://github.com/canonical/craft-grammar"; changelog = "https://github.com/canonical/craft-grammar/releases/tag/${version}"; license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; platforms = lib.platforms.linux; }; } From 82aed16777b5b405d4086fafb3ef55e3fc913caf Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:43:37 +0100 Subject: [PATCH 083/116] python3Packages.craft-parts: update maintainers list --- pkgs/development/python-modules/craft-parts/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index d373ffb87035..6eee0c6329ec 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -126,7 +126,11 @@ buildPythonPackage rec { homepage = "https://github.com/canonical/craft-parts"; changelog = "https://github.com/canonical/craft-parts/releases/tag/${src.tag}"; license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; platforms = lib.platforms.linux; }; } From f30c4d53c5257c19e9425705a2f7e809f96d79e0 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:44:04 +0100 Subject: [PATCH 084/116] python3Packages.craft-platforms: update maintainers list --- pkgs/development/python-modules/craft-platforms/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/craft-platforms/default.nix b/pkgs/development/python-modules/craft-platforms/default.nix index f3d5a0a39168..ce601592c83b 100644 --- a/pkgs/development/python-modules/craft-platforms/default.nix +++ b/pkgs/development/python-modules/craft-platforms/default.nix @@ -60,7 +60,11 @@ buildPythonPackage rec { homepage = "https://github.com/canonical/craft-platforms"; changelog = "https://github.com/canonical/craft-platforms/releases/tag/${version}"; license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; platforms = lib.platforms.linux; }; } From e9ed9275bfdca7258c107222710f6ea1d87cbd5c Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:44:22 +0100 Subject: [PATCH 085/116] python3Packages.craft-providers: update maintainers list --- pkgs/development/python-modules/craft-providers/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/craft-providers/default.nix b/pkgs/development/python-modules/craft-providers/default.nix index 3d01c52ff743..3e39d50b2981 100644 --- a/pkgs/development/python-modules/craft-providers/default.nix +++ b/pkgs/development/python-modules/craft-providers/default.nix @@ -101,7 +101,11 @@ buildPythonPackage rec { homepage = "https://github.com/canonical/craft-providers"; changelog = "https://github.com/canonical/craft-providers/releases/tag/${src.tag}"; license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; platforms = lib.platforms.linux; }; } From 3b8b758ad5ce8b411674d7cb232967b488fda452 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:44:42 +0100 Subject: [PATCH 086/116] python3Packages.craft-store: update maintainers list --- pkgs/development/python-modules/craft-store/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/craft-store/default.nix b/pkgs/development/python-modules/craft-store/default.nix index 24e6fa81100d..571a754ec89f 100644 --- a/pkgs/development/python-modules/craft-store/default.nix +++ b/pkgs/development/python-modules/craft-store/default.nix @@ -81,7 +81,11 @@ buildPythonPackage rec { homepage = "https://github.com/canonical/craft-store"; changelog = "https://github.com/canonical/craft-store/releases/tag/${version}"; license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; platforms = lib.platforms.linux; }; } From 5900ca3469db688aef4465d626179c51e756a2cc Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:45:02 +0100 Subject: [PATCH 087/116] python3Packages.logassert: update maintainers list --- pkgs/development/python-modules/logassert/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/logassert/default.nix b/pkgs/development/python-modules/logassert/default.nix index 52251a53e138..780b3cdbfc9f 100644 --- a/pkgs/development/python-modules/logassert/default.nix +++ b/pkgs/development/python-modules/logassert/default.nix @@ -36,7 +36,11 @@ buildPythonPackage rec { homepage = "https://github.com/facundobatista/logassert"; changelog = "https://github.com/facundobatista/logassert/releases/tag/${src.tag}"; license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; platforms = lib.platforms.linux; }; } From 666aefd54100772b7f57c96c938d900a64e48664 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:45:23 +0100 Subject: [PATCH 088/116] python3Packages.macaroonbakery: update maintainers list --- pkgs/development/python-modules/macaroonbakery/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/macaroonbakery/default.nix b/pkgs/development/python-modules/macaroonbakery/default.nix index 110bdc0ffd20..085711ce1794 100644 --- a/pkgs/development/python-modules/macaroonbakery/default.nix +++ b/pkgs/development/python-modules/macaroonbakery/default.nix @@ -62,7 +62,11 @@ buildPythonPackage rec { homepage = "https://github.com/go-macaroon-bakery/py-macaroon-bakery"; changelog = "https://github.com/go-macaroon-bakery/py-macaroon-bakery/releases/tag/${version}"; license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; platforms = lib.platforms.linux; }; } From b8efe063f00b3009b23c0b68e074000f64e1566f Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:45:42 +0100 Subject: [PATCH 089/116] python3Packages.pydantic-yaml: update maintainers list --- pkgs/development/python-modules/pydantic-yaml/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pydantic-yaml/default.nix b/pkgs/development/python-modules/pydantic-yaml/default.nix index de5f184ee66d..1f92908e4ee3 100644 --- a/pkgs/development/python-modules/pydantic-yaml/default.nix +++ b/pkgs/development/python-modules/pydantic-yaml/default.nix @@ -48,6 +48,10 @@ buildPythonPackage rec { homepage = "https://github.com/NowanIlfideme/pydantic-yaml"; changelog = "https://github.com/NowanIlfideme/pydantic-yaml/releases/tag/${src.tag}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; }; } From 38091845919572f6e7bdb908dad63d3a6f8e21fa Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:46:05 +0100 Subject: [PATCH 090/116] python3Packages.python-apt: update maintainers list --- pkgs/development/python-modules/python-apt/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-apt/default.nix b/pkgs/development/python-modules/python-apt/default.nix index 86d13d5c6c8d..99512d60930a 100644 --- a/pkgs/development/python-modules/python-apt/default.nix +++ b/pkgs/development/python-modules/python-apt/default.nix @@ -35,7 +35,11 @@ buildPythonPackage rec { description = "Python bindings for APT"; homepage = "https://launchpad.net/python-apt"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; platforms = lib.platforms.linux; }; } From 7d2646644aebd8982a4d4ad3a36b741aa59ad07f Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:46:26 +0100 Subject: [PATCH 091/116] python3Packages.snap-helpers: update maintainers list --- pkgs/development/python-modules/snap-helpers/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/snap-helpers/default.nix b/pkgs/development/python-modules/snap-helpers/default.nix index c7b2f951ce13..5a5e0a75bd00 100644 --- a/pkgs/development/python-modules/snap-helpers/default.nix +++ b/pkgs/development/python-modules/snap-helpers/default.nix @@ -40,7 +40,11 @@ buildPythonPackage rec { homepage = "https://github.com/albertodonato/snap-helpers"; changelog = "https://github.com/albertodonato/snap-helpers/releases/tag/${version}"; license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; platforms = lib.platforms.linux; }; } From a49e95388fb35932dc7acd0f51de03d6d1549402 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:46:57 +0100 Subject: [PATCH 092/116] python3Packages.spdx: update maintainers list --- pkgs/development/python-modules/spdx/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/spdx/default.nix b/pkgs/development/python-modules/spdx/default.nix index 93ecc69f7c63..7a9c6cffb58c 100644 --- a/pkgs/development/python-modules/spdx/default.nix +++ b/pkgs/development/python-modules/spdx/default.nix @@ -32,6 +32,10 @@ buildPythonPackage rec { homepage = "https://github.com/bbqsrc/spdx-python"; changelog = "https://github.com/bbqsrc/spdx-python/releases/tag/v${version}"; license = lib.licenses.cc0; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; }; } From ce71474a869af48d0b07477180301618690c2f9b Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 11 Sep 2025 09:47:11 +0100 Subject: [PATCH 093/116] python3Packages.spdx-lookup: update maintainers list --- pkgs/development/python-modules/spdx-lookup/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/spdx-lookup/default.nix b/pkgs/development/python-modules/spdx-lookup/default.nix index 1aa939d55223..ab77c86063b6 100644 --- a/pkgs/development/python-modules/spdx-lookup/default.nix +++ b/pkgs/development/python-modules/spdx-lookup/default.nix @@ -35,6 +35,10 @@ buildPythonPackage rec { homepage = "https://github.com/bbqsrc/spdx-lookup-python"; changelog = "https://github.com/bbqsrc/spdx-lookup-python/releases/tag/v${version}"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; }; } From 0927751ce5a9330bcc63d7bb3304ea9c22c24ba8 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Thu, 11 Sep 2025 10:01:50 +0100 Subject: [PATCH 094/116] remnote: 1.20.0 -> 1.20.8 --- pkgs/by-name/re/remnote/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index dfaa28d90e6a..8c91bcd69411 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.20.0"; + version = "1.20.8"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-H17jPk1wDDuygXyrcVg5WLwVPYt3yG/57ec8n1GJmHg="; + hash = "sha256-P2fUPYn/ZMBOGZKytrMPPKh4KLbGhQ1jR+dLG5JNfVo="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in From 4b6ae0cacef774e5b3444494d969f2d8754ab13f Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Thu, 11 Sep 2025 11:43:22 +0200 Subject: [PATCH 095/116] slint-viewer: 1.13.0 -> 1.13.1 --- pkgs/by-name/sl/slint-viewer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sl/slint-viewer/package.nix b/pkgs/by-name/sl/slint-viewer/package.nix index b38ca14ca7e6..2ed435c2d005 100644 --- a/pkgs/by-name/sl/slint-viewer/package.nix +++ b/pkgs/by-name/sl/slint-viewer/package.nix @@ -9,14 +9,14 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "slint-viewer"; - version = "1.13.0"; + version = "1.13.1"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-KasOZia9bIgMi+haXYMbu+fRrM5ZLtaC4rwHZEQOtcY="; + hash = "sha256-I3iwnxft0z6kXdlHIaZUqufqJP3XrF2h+l5Y4EgLPr0="; }; - cargoHash = "sha256-0NuwxRR2BrA9j0uKYfDVFyDZEtx1byRVnLB3TZbAAP0="; + cargoHash = "sha256-lxxiNa1xqZDtSx19h1MxGOhK/N14fv5k+miaaNpskFc="; buildInputs = [ qt6.qtbase From 44108333bfcd01c0d0d083b5ba0905ba81821c2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Sep 2025 10:39:54 +0000 Subject: [PATCH 096/116] tracexec: 0.13.0-unstable-2025-09-07 -> 0.13.1 --- pkgs/by-name/tr/tracexec/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/tr/tracexec/package.nix b/pkgs/by-name/tr/tracexec/package.nix index ed2a1ecdc951..27e43929963f 100644 --- a/pkgs/by-name/tr/tracexec/package.nix +++ b/pkgs/by-name/tr/tracexec/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { pname = "tracexec"; - version = "0.13.0-unstable-2025-09-07"; + version = "0.13.1"; src = fetchFromGitHub { owner = "kxxt"; From dc3cdbda9a14f18753bba2fe210f4099d98c5cfe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Sep 2025 11:19:03 +0000 Subject: [PATCH 097/116] conduit: 0.9.4 -> 0.9.5 --- pkgs/by-name/co/conduit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/conduit/package.nix b/pkgs/by-name/co/conduit/package.nix index 74a581ea495c..499802a528a2 100644 --- a/pkgs/by-name/co/conduit/package.nix +++ b/pkgs/by-name/co/conduit/package.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "conduit"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "LLNL"; repo = "conduit"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-xs/9hsE1DLCegXp3CHSl6qpC4ap+niNAWX5lNlUxz9E="; + hash = "sha256-mX7/5C4wd70Kx1rQyo2BcZMwDRqvxo4fBdz3pq7PuvM="; }; nativeBuildInputs = [ From b63ea724fec86d332f572fa4adba524b996c931a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Thu, 11 Sep 2025 18:57:35 +0700 Subject: [PATCH 098/116] =?UTF-8?q?displaycal:=203.9.16=20=E2=86=92=203.9.?= =?UTF-8?q?17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/di/displaycal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/displaycal/package.nix b/pkgs/by-name/di/displaycal/package.nix index f7466271e41a..0676ddd1142c 100644 --- a/pkgs/by-name/di/displaycal/package.nix +++ b/pkgs/by-name/di/displaycal/package.nix @@ -11,13 +11,13 @@ python3.pkgs.buildPythonApplication rec { pname = "displaycal"; - version = "3.9.16"; + version = "3.9.17"; format = "setuptools"; src = fetchPypi { pname = "DisplayCAL"; inherit version; - hash = "sha256-Ozl0RrYJ/oarNddnz+JjQKyRY6ZNvM9sJapqn75X3Mw="; + hash = "sha256-cV8x1Hx+KQUhOOzqw/89QgoZ9+82vhwGrhG13KpE9Vw="; }; nativeBuildInputs = [ From a1690f83f55c8328adcd1e58338e2299fdfb1acc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Sep 2025 12:40:48 +0000 Subject: [PATCH 099/116] coppwr: 1.6.2 -> 1.7.0 --- pkgs/by-name/co/coppwr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/coppwr/package.nix b/pkgs/by-name/co/coppwr/package.nix index 02d74af18e6a..49d5455e25aa 100644 --- a/pkgs/by-name/co/coppwr/package.nix +++ b/pkgs/by-name/co/coppwr/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "coppwr"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "dimtpap"; repo = "coppwr"; rev = version; - hash = "sha256-Wit0adP9M8vlCXF6WJx2tZnR6LrwcvoTNx1KC1HfN8w="; + hash = "sha256-9oFWX44jToJh0vJaDV/KZXVNQgLG0lr1iA+0hInAhLA="; }; - cargoHash = "sha256-tgvSOwZmboe4DzEqJOCYWwIbAStGV1F6ZAzlwCd7Uo4="; + cargoHash = "sha256-Fq8I1pt83yqrjiA4VXA+z7o2LFTac2SonAwTycQRP8M="; nativeBuildInputs = [ pkg-config From f0d91fc92805fed31313a192195951f95653052d Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Thu, 11 Sep 2025 13:58:06 +0300 Subject: [PATCH 100/116] nixos/zapret: fix examples --- nixos/modules/services/networking/zapret.nix | 44 ++++++++------------ 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/nixos/modules/services/networking/zapret.nix b/nixos/modules/services/networking/zapret.nix index ee4177736496..6d99be824ca3 100644 --- a/nixos/modules/services/networking/zapret.nix +++ b/nixos/modules/services/networking/zapret.nix @@ -26,13 +26,11 @@ in params = lib.mkOption { default = [ ]; type = with lib.types; listOf str; - example = '' - [ - "--dpi-desync=fake,disorder2" - "--dpi-desync-ttl=1" - "--dpi-desync-autottl=2" - ] - ''; + example = [ + "--dpi-desync=fake,disorder2" + "--dpi-desync-ttl=1" + "--dpi-desync-autottl=2" + ]; description = '' Specify the bypass parameters for Zapret binary. There are no universal parameters as they vary between different networks, so you'll have to find them yourself. @@ -44,14 +42,12 @@ in whitelist = lib.mkOption { default = [ ]; type = with lib.types; listOf str; - example = '' - [ - "youtube.com" - "googlevideo.com" - "ytimg.com" - "youtu.be" - ] - ''; + example = [ + "youtube.com" + "googlevideo.com" + "ytimg.com" + "youtu.be" + ]; description = '' Specify a list of domains to bypass. All other domains will be ignored. You can specify either whitelist or blacklist, but not both. @@ -63,11 +59,9 @@ in blacklist = lib.mkOption { default = [ ]; type = with lib.types; listOf str; - example = '' - [ - "example.com" - ] - ''; + example = [ + "example.com" + ]; description = '' Specify a list of domains NOT to bypass. All other domains will be bypassed. You can specify either whitelist or blacklist, but not both. @@ -124,12 +118,10 @@ in udpPorts = lib.mkOption { default = [ ]; type = with lib.types; listOf str; - example = '' - [ - "50000:50099" - "1234" - ] - ''; + example = [ + "50000:50099" + "1234" + ]; description = '' List of UDP ports to route. Port ranges are delimited with a colon like this "50000:50099". From 9670dfbd0e740d3fedde3c869d06c003b2818dea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Sep 2025 12:45:43 +0000 Subject: [PATCH 101/116] msolve: 0.9.0 -> 0.9.1 --- pkgs/by-name/ms/msolve/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix index 2894f7fda034..652d1c152409 100644 --- a/pkgs/by-name/ms/msolve/package.nix +++ b/pkgs/by-name/ms/msolve/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "msolve"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "algebraic-solving"; repo = "msolve"; tag = "v${finalAttrs.version}"; - hash = "sha256-6TU/h6ewQreomjStHZRViYTrrDG3+MZXa8mLg1NvvZg="; + hash = "sha256-Th5Kd8AWg+xF5nnoHTJkz1wDjywQztUzXvE0NmYxC/E="; }; postPatch = '' From 4d63e0d216b2e05185226589867aae64f828d5d0 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 31 Aug 2025 17:47:16 +0200 Subject: [PATCH 102/116] spit: init at 0.1 --- pkgs/by-name/sp/spit/package.nix | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/sp/spit/package.nix diff --git a/pkgs/by-name/sp/spit/package.nix b/pkgs/by-name/sp/spit/package.nix new file mode 100644 index 000000000000..77c1ba137dd8 --- /dev/null +++ b/pkgs/by-name/sp/spit/package.nix @@ -0,0 +1,38 @@ +{ + stdenv, + lib, + installShellFiles, + fetchFromGitHub, +}: + +stdenv.mkDerivation rec { + pname = "spit"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "leahneukirchen"; + repo = "spit"; + tag = "v${version}"; + hash = "sha256-bvcx+bQyi5tWDwuqdOv2h6q1ZSEHO9bHV2lfvRhL7iw="; + }; + + nativeBuildInputs = [ + installShellFiles + ]; + + installPhase = '' + runHook preInstall + install -Dm755 spit -t "$out/bin" + installManPage spit.1 + runHook postInstall + ''; + + meta = { + description = "Atomically create a file with content"; + platforms = lib.platforms.linux; + license = lib.licenses.cc0; + homepage = "https://git.vuxu.org/spit/"; + maintainers = [ lib.maintainers.sternenseemann ]; + mainProgram = "spit"; + }; +} From e5853f842e7e005efabab216f3100b2b2544a37f Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 10 Sep 2025 09:36:36 -0500 Subject: [PATCH 103/116] alkimia: migrate to by-name, refactor --- .../al/alkimia/package.nix} | 20 ++++++++----------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 8 insertions(+), 13 deletions(-) rename pkgs/{development/libraries/alkimia/default.nix => by-name/al/alkimia/package.nix} (85%) diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/by-name/al/alkimia/package.nix similarity index 85% rename from pkgs/development/libraries/alkimia/default.nix rename to pkgs/by-name/al/alkimia/package.nix index abcca04ee5ce..6fff009eac5d 100644 --- a/pkgs/development/libraries/alkimia/default.nix +++ b/pkgs/by-name/al/alkimia/package.nix @@ -3,16 +3,10 @@ stdenv, fetchFromGitLab, cmake, - extra-cmake-modules, doxygen, graphviz, - qtbase, - qtwebengine, mpir, - libplasma, - knewstuff, - kpackage, - wrapQtAppsHook, + kdePackages, }: stdenv.mkDerivation (finalAttrs: { @@ -23,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "invent.kde.org"; owner = "office"; repo = "alkimia"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-v5DfnnzOMsoCXr074ydXxBIrSsnbex6G/OqF6psTvPs="; }; @@ -33,16 +27,18 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - extra-cmake-modules doxygen graphviz + ] + ++ (with kdePackages; [ + extra-cmake-modules wrapQtAppsHook - ]; + ]); # qtwebengine is not a mandatory dependency, but it adds some features # we might need for alkimia's dependents. See: # https://github.com/KDE/alkimia/blob/v8.1.2/CMakeLists.txt#L124 - buildInputs = [ + buildInputs = with kdePackages; [ qtbase qtwebengine libplasma @@ -63,6 +59,6 @@ stdenv.mkDerivation (finalAttrs: { application boundaries. ''; license = lib.licenses.lgpl21Plus; - platforms = qtbase.meta.platforms; + platforms = kdePackages.qtbase.meta.platforms; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aadbbeac1b37..943d0e66d934 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12077,7 +12077,6 @@ with pkgs; llvmPackages = llvmPackages_18; }; - alkimia = kdePackages.callPackage ../development/libraries/alkimia { }; kmymoney = kdePackages.callPackage ../applications/office/kmymoney { }; kotatogram-desktop = From 2dd1a60e560e5f1056b075c936bef023d5b6e0cf Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 10 Sep 2025 09:43:37 -0500 Subject: [PATCH 104/116] kmymoney: migrate to by-name, refactor --- .../km/kmymoney/package.nix} | 45 +++++++------------ pkgs/top-level/all-packages.nix | 2 - 2 files changed, 17 insertions(+), 30 deletions(-) rename pkgs/{applications/office/kmymoney/default.nix => by-name/km/kmymoney/package.nix} (85%) diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/by-name/km/kmymoney/package.nix similarity index 85% rename from pkgs/applications/office/kmymoney/default.nix rename to pkgs/by-name/km/kmymoney/package.nix index fd5269818a53..035f8bf8431a 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/by-name/km/kmymoney/package.nix @@ -2,34 +2,18 @@ stdenv, lib, fetchurl, - cmake, doxygen, - extra-cmake-modules, graphviz, - kdoctools, pkg-config, - wrapQtAppsHook, autoPatchelfHook, - - akonadi, + kdePackages, alkimia, aqbanking, gmp, gwenhywfar, - karchive, - kcmutils, - kcontacts, - qtwebengine, - kdiagram, - kholidays, - kidentitymanagement, - kitemmodels, libical, libofx, - plasma-activities, - qgpgme, - sqlcipher, # Needed for running tests: @@ -38,12 +22,12 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kmymoney"; version = "5.2.1"; src = fetchurl { - url = "mirror://kde/stable/kmymoney/${version}/${pname}-${version}.tar.xz"; + url = "mirror://kde/stable/kmymoney/${finalAttrs.version}/kmymoney-${finalAttrs.version}.tar.xz"; hash = "sha256-/q30C21MkNd+MnFqhY3SN2kIGGMQTYzqYpELHsPkM2s="; }; @@ -54,21 +38,28 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake doxygen - extra-cmake-modules graphviz - kdoctools pkg-config python3.pkgs.wrapPython + ] + ++ (with kdePackages; [ + extra-cmake-modules wrapQtAppsHook + kdoctools autoPatchelfHook - ]; + ]); buildInputs = [ - akonadi alkimia aqbanking gmp gwenhywfar + libical + libofx + sqlcipher + ] + ++ (with kdePackages; [ + akonadi karchive kcmutils kcontacts @@ -77,12 +68,10 @@ stdenv.mkDerivation rec { kholidays kidentitymanagement kitemmodels - libical - libofx plasma-activities qgpgme - sqlcipher - + ]) + ++ [ # Put it into buildInputs so that CMake can find it, even though we patch # it into the interface later. python3.pkgs.woob @@ -117,4 +106,4 @@ stdenv.mkDerivation rec { das-g ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 943d0e66d934..f9c8b7ac70e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12077,8 +12077,6 @@ with pkgs; llvmPackages = llvmPackages_18; }; - kmymoney = kdePackages.callPackage ../applications/office/kmymoney { }; - kotatogram-desktop = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; From a392bb359533e68f7cb732ef85ef627eb9db8c55 Mon Sep 17 00:00:00 2001 From: Doro Rose Date: Sat, 6 Sep 2025 03:30:49 +0200 Subject: [PATCH 105/116] maintainers: add kfiz --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4c763e3d157c..1c96380a2372 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13360,6 +13360,13 @@ githubId = 18579667; name = "Adam J."; }; + kfiz = { + email = "doroerose@gmail.com"; + github = "kfiz"; + githubId = 5100646; + name = "kfiz"; + matrix = "@kfiz:matrix.sopado.de"; + }; kfollesdal = { email = "kfollesdal@gmail.com"; github = "kfollesdal"; From 0919966ec74f9e402c5ed442d938f12980c57fc2 Mon Sep 17 00:00:00 2001 From: Doro Rose Date: Wed, 27 Aug 2025 14:09:11 +0200 Subject: [PATCH 106/116] emacs-macport: 29.4 -> 30.2 Co-authored-by: lactose Co-authored-by: Lin Jian Co-authored-by: pancho horrillo --- doc/release-notes/rl-2511.section.md | 5 +++ pkgs/applications/editors/emacs/default.nix | 4 +-- pkgs/applications/editors/emacs/sources.nix | 40 ++++++++------------- pkgs/top-level/all-packages.nix | 4 +-- 4 files changed, 23 insertions(+), 30 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 519fd06f6f16..119baa4d1837 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -155,6 +155,11 @@ - `rofi-emoji-wayland` has been merged into `rofi-emoji` as `rofi` has been updated to `2.0.0` and supports both X11 & Wayland. +- `emacs-macport` has been moved to a fork of Mitsuharu Yamamoto's patched source code starting with Emacs v30 as the original project seems to be currently dormant. All older versions of this package have been dropped. + This introduces some backwards‐incompatible changes; see the NEWS for details. + NEWS can be viewed from Emacs by typing `C-h n`, or by clicking `Help->Emacs News` from the menu bar. + It can also be browsed [online](https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-30). + ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes} diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 24f722bf37b1..295579c7c085 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -12,7 +12,7 @@ lib.makeScope pkgs.newScope ( sources = import ./sources.nix { inherit lib; inherit (pkgs) - fetchFromBitbucket + fetchFromGitHub fetchzip ; }; @@ -31,7 +31,7 @@ lib.makeScope pkgs.newScope ( withPgtk = true; }; - emacs29-macport = callPackage (self.sources.emacs29-macport) ( + emacs30-macport = callPackage (self.sources.emacs30-macport) ( inheritedArgs // { srcRepo = true; diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index d3fb3da3b599..60f6105abe7d 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -1,6 +1,6 @@ { lib, - fetchFromBitbucket, + fetchFromGitHub, fetchzip, }: @@ -32,8 +32,8 @@ let } ); "macport" = ( - fetchFromBitbucket { - owner = "mituharu"; + fetchFromGitHub { + owner = "jdtsmith"; repo = "emacs-mac"; inherit rev hash; } @@ -68,13 +68,14 @@ let '' + lib.optionalString (variant == "macport") '' - This release is built from Mitsuharu Yamamoto's patched source code - tailored for macOS. + This release initially was built from Mitsuharu Yamamoto's patched source code + tailored for macOS. Moved to a fork of the latter starting with emacs v30 as the + original project seems to be currently dormant. ''; changelog = { "mainline" = "https://www.gnu.org/savannah-checkouts/gnu/emacs/news/NEWS.${version}"; - "macport" = "https://bitbucket.org/mituharu/emacs-mac/raw/${rev}/NEWS-mac"; + "macport" = "https://github.com/jdtsmith/emacs-mac/blob/${rev}/NEWS-mac"; } .${variant}; license = lib.licenses.gpl3Plus; @@ -88,7 +89,9 @@ let matthewbauer panchoh ]; - "macport" = with lib.maintainers; [ ]; + "macport" = with lib.maintainers; [ + kfiz + ]; } .${variant}; platforms = @@ -117,26 +120,11 @@ in ]; }); - emacs29-macport = import ./make-emacs.nix (mkArgs { + emacs30-macport = import ./make-emacs.nix (mkArgs { pname = "emacs-mac"; - version = "29.4"; + version = "30.2.50"; variant = "macport"; - rev = "emacs-29.4-mac-10.1"; - hash = "sha256-8OQ+fon9tclbh/eUJ09uqKfMaz9M77QnLIp2R8QB6Ic="; - patches = fetchpatch: [ - # CVE-2024-53920 - (fetchpatch { - url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/07_all_trusted-content.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f"; - hash = "sha256-zUWM2HDO5MHEB5fC5TCUxzmSafMvXO5usRzCyp9Q7P4="; - }) - - # CVE-2025-1244 - (fetchpatch { - url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/06_all_man.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f"; - hash = "sha256-Vdf6GF5YmGoHTkxiD9mdYH0hgvfovZwrqYN1NQ++U1w="; - }) - ]; - - meta.knownVulnerabilities = [ ]; + rev = "emacs-mac-30.2"; + hash = "sha256-i/W2Xa6Vk1+T1fs6fa4wJVMLLB6BK8QAPcdmPrU8NwM="; }); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aadbbeac1b37..95c8574b1fbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11405,10 +11405,10 @@ with pkgs; emacs30-nox emacs30-pgtk - emacs29-macport + emacs30-macport ; - emacs-macport = emacs29-macport; + emacs-macport = emacs30-macport; emacs = emacs30; emacs-gtk = emacs30-gtk3; emacs-nox = emacs30-nox; From 9d1b1aa7b9cef1fa7de7d1aac4b06c5dfa718573 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 8 Sep 2025 02:39:38 +0100 Subject: [PATCH 107/116] =?UTF-8?q?haskellPackages.spaceprobe:=20don?= =?UTF-8?q?=E2=80=99t=20force=20the=20LLVM=20backend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/haskell-modules/configuration-nix.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index d08240cacf56..cf9dd3c715f5 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -523,8 +523,14 @@ builtins.intersectAttrs super { ) ); - # Needs help finding LLVM. - spaceprobe = addBuildTool self.buildHaskellPackages.llvmPackages.llvm super.spaceprobe; + # Forces the LLVM backend; upstream signalled intent to remove this + # in 2017: . + spaceprobe = overrideCabal (drv: { + postPatch = '' + substituteInPlace spaceprobe.cabal \ + --replace-fail '-fllvm ' "" + ''; + }) super.spaceprobe; # Tries to run GUI in tests leksah = dontCheck ( From 64096636e0eed8fbb7032767e17a7e8b875663cc Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 8 Sep 2025 02:39:38 +0100 Subject: [PATCH 108/116] =?UTF-8?q?haskellPackages.GlomeVec:=20don?= =?UTF-8?q?=E2=80=99t=20force=20the=20LLVM=20backend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/haskell-modules/configuration-nix.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index cf9dd3c715f5..88fe314bdffc 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -532,6 +532,14 @@ builtins.intersectAttrs super { ''; }) super.spaceprobe; + # Forces the LLVM backend. + GlomeVec = overrideCabal (drv: { + postPatch = '' + substituteInPlace GlomeVec.cabal \ + --replace-fail '-fllvm ' "" + ''; + }) super.GlomeVec; + # Tries to run GUI in tests leksah = dontCheck ( overrideCabal (drv: { From fab98a0dcab0482914df2d6fd215759e66f4878b Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 8 Sep 2025 02:39:38 +0100 Subject: [PATCH 109/116] haskellPackages.cabal2nix-unstable: 2025-09-06 -> 2025-09-09 Co-authored-by: sternenseemann --- .../haskell-modules/cabal2nix-unstable.nix | 6 ++-- .../haskell-modules/hackage-packages.nix | 28 +++++++++---------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 168e1f885c7d..dbb99b7c62c7 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -35,10 +35,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2025-09-06"; + version = "unstable-2025-09-09"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/fe1b21c9fb01f3f8a9028744499f20b7799cad38.tar.gz"; - sha256 = "0g9pa8914mdnbbhy3far689xckfblavwv0ylmzi0h4p7v8alrjx7"; + url = "https://github.com/NixOS/cabal2nix/archive/987474e0b0ed1c6b0e3fd0d07313f6996ec98b7e.tar.gz"; + sha256 = "0nixn8incqypsfyfclj40p8bdx2yn4783kzwpqfp19ql2sbc57dc"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 85eea82315fd..45910e661c6d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -16266,7 +16266,6 @@ self: { mkDerivation, array, base, - llvm, }: mkDerivation { pname = "GlomeVec"; @@ -16276,11 +16275,10 @@ self: { array base ]; - libraryPkgconfigDepends = [ llvm ]; description = "Simple 3D vector library"; license = "GPL"; } - ) { inherit (self.llvmPackages) llvm; }; + ) { }; "GlomeView" = callPackage ( { @@ -27647,9 +27645,9 @@ self: { base, bytestring, c2hs, - clang, filepath, hashable, + libclang, mtl, ncurses, resourcet, @@ -27676,7 +27674,7 @@ self: { transformers-base vector ]; - librarySystemDepends = [ clang ]; + librarySystemDepends = [ libclang ]; libraryPkgconfigDepends = [ ncurses ]; libraryToolDepends = [ c2hs ]; description = "Haskell bindings for libclang (a C++ parsing library)"; @@ -27686,7 +27684,7 @@ self: { } ) { - inherit (self.llvmPackages) clang; + inherit (pkgs) libclang; inherit (pkgs) ncurses; }; @@ -141306,11 +141304,11 @@ self: { base, bytestring, Cabal, - clang, containers, contravariant, inline-c, lens, + libclang, microlens, microlens-contra, process, @@ -141344,7 +141342,7 @@ self: { template-haskell vector ]; - librarySystemDepends = [ clang ]; + librarySystemDepends = [ libclang ]; testHaskellDepends = [ base bytestring @@ -141355,7 +141353,7 @@ self: { hydraPlatforms = lib.platforms.none; broken = true; } - ) { inherit (self.llvmPackages) clang; }; + ) { inherit (pkgs) libclang; }; "clanki" = callPackage ( { @@ -267231,7 +267229,7 @@ self: { haskell-gi-overloading, text, transformers, - vte_291, + vte, }: mkDerivation { pname = "gi-vte"; @@ -267270,12 +267268,12 @@ self: { text transformers ]; - libraryPkgconfigDepends = [ vte_291 ]; + libraryPkgconfigDepends = [ vte ]; description = "Vte bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; } - ) { vte_291 = pkgs.vte; }; + ) { inherit (pkgs) vte; }; "gi-webkit" = callPackage ( { @@ -664371,7 +664369,7 @@ self: { text, transformers, unordered-containers, - vte_291, + vte, xml-conduit, xml-html-qq, yaml, @@ -664421,7 +664419,7 @@ self: { libraryPkgconfigDepends = [ gtk3 pcre2 - vte_291 + vte ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -664441,7 +664439,7 @@ self: { { inherit (pkgs) gtk3; inherit (pkgs) pcre2; - vte_291 = pkgs.vte; + inherit (pkgs) vte; }; "termplot" = callPackage ( From 921f5db2989cb95dc5b24bb75fb74f7b7f54e535 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 8 Sep 2025 02:39:38 +0100 Subject: [PATCH 110/116] haskellPackages.llvmPackages: drop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There’s no sensible notion of a Haskell package set’s LLVM, only a GHC’s LLVM. `haskellPackages.ghc.llvmPackages` is still accessible, although you probably don’t actually want to use it very often. Co-authored-by: sternenseemann --- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 2 -- pkgs/development/haskell-modules/make-package-set.nix | 2 +- pkgs/development/haskell-modules/with-packages-wrapper.nix | 4 ++-- 10 files changed, 3 insertions(+), 19 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 549523c2ff66..3cd9002c3a02 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -13,8 +13,6 @@ in self: super: { - llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; - # Disable GHC 9.0.x core libraries. array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index 40351fcd3635..fbac3690a708 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -16,8 +16,6 @@ let in { - llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages; - # Disable GHC core libraries array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix index 63162d068237..79afa7b31ccb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix @@ -16,8 +16,6 @@ in with haskellLib; { - llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages; - # Disable GHC core libraries array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix index 2e743b996f6c..555870017bcf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix @@ -6,8 +6,6 @@ let in self: super: { - llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages; - # Disable GHC core libraries array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index cd67a884e853..10e5d2bd55d9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -13,8 +13,6 @@ in self: super: { - llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; - # Disable GHC 9.2.x core libraries. array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 4a1afd49fcb1..924f7c1309f8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -6,8 +6,6 @@ in with haskellLib; self: super: { - llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages; - # Disable GHC core libraries. array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 60214323e839..bfc688281f22 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -16,8 +16,6 @@ let in { - llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages; - # Disable GHC core libraries array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index f56b3108ba51..e70da8a3e688 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -18,8 +18,6 @@ in { - llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages; - # Disable GHC core libraries. array = null; base = null; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 44dc23278963..d53c092ed022 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -734,6 +734,6 @@ package-set { inherit pkgs lib callPackage; } self */ forceLlvmCodegenBackend = overrideCabal (drv: { configureFlags = drv.configureFlags or [ ] ++ [ "--ghc-option=-fllvm" ]; - buildTools = drv.buildTools or [ ] ++ [ self.llvmPackages.llvm ]; + buildTools = drv.buildTools or [ ] ++ [ self.ghc.llvmPackages.llvm ]; }); } diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index b683febeaf6c..0df9ec093ef7 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -44,7 +44,7 @@ selectPackages: # fi let - inherit (haskellPackages) llvmPackages ghc; + inherit (haskellPackages) ghc; hoogleWithPackages' = if withHoogle then hoogleWithPackages selectPackages else null; @@ -71,7 +71,7 @@ let # CLang is needed on Darwin for -fllvm to work: # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm llvm = lib.makeBinPath ( - [ llvmPackages.llvm ] ++ lib.optional stdenv.targetPlatform.isDarwin llvmPackages.clang + [ ghc.llvmPackages.llvm ] ++ lib.optional stdenv.targetPlatform.isDarwin ghc.llvmPackages.clang ); in From d84b2f136595de469e66ef5350af2409c65eee0d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 11 Sep 2025 15:39:31 +0200 Subject: [PATCH 111/116] doc/rl-2511: note removal of llvmPackages from haskell.packages.* This should be the only observable breakage from #441101 / 921f5db2989cb95dc5b24bb75fb74f7b7f54e535. --- doc/release-notes/rl-2511.section.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 119baa4d1837..494193a145f3 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -34,6 +34,12 @@ The latter was probably broken anyway. If there is interest in restoring support for these architectures, it should be possible to cross‐compile a bootstrap GHC binary. +- `haskellPackages` and the package sets under `haskell.packages` no longer expose an `llvmPackages` attribute, + though it can still be accessed via `ghc.llvmPackages` (from the same package set). + Haskell packages usually only need to depend on an LLVM version matching GHC if they force the use the LLVM + backend even if NCG is available. In this case, it is best to use the `forceLlvmCodegenBackend` helper. + In all other cases, like linking against `libLLVM`, Haskell packages should use the appropriate version of `llvmPackages` from `pkgs`. + - `base16-builder` node package has been removed due to lack of upstream maintenance. - `python3Packages.bjoern` has been removed, as the upstream is unmaintained and it depends on a 14-year-old version of http-parser with numerous vulnerabilities. From c97ffa9cafb00f738886cd3cecd3c065a6bdf439 Mon Sep 17 00:00:00 2001 From: beeb <703631+beeb@users.noreply.github.com> Date: Thu, 11 Sep 2025 15:54:21 +0200 Subject: [PATCH 112/116] lintspec: 0.7.1 -> 0.9.0 --- pkgs/by-name/li/lintspec/package.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/lintspec/package.nix b/pkgs/by-name/li/lintspec/package.nix index 66a0fc3ca0ea..a785d1f5828e 100644 --- a/pkgs/by-name/li/lintspec/package.nix +++ b/pkgs/by-name/li/lintspec/package.nix @@ -1,21 +1,31 @@ { - lib, fetchFromGitHub, + installShellFiles, + lib, rustPlatform, + stdenv, }: rustPlatform.buildRustPackage rec { pname = "lintspec"; - version = "0.7.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "beeb"; repo = "lintspec"; tag = "v${version}"; - hash = "sha256-TMiUOrDsKXi+d/CbJauo2FT9WEWnztMYqrZZHpS8i7M="; + hash = "sha256-5jNOMAohfzq/S+1LASQh0hvzqdMLQGdPYSb6rcGxmD8="; }; - cargoHash = "sha256-K8zx+dW6RXcbX2ZqNdfnv7WjbvjA8ZdJBitdDOi8hxE="; + cargoHash = "sha256-m9n9r3SJtGx3/MURmZak2XRCLkmQZU06nPMQpROfvVs="; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd lintspec \ + --bash <($out/bin/lintspec completions -s bash) \ + --fish <($out/bin/lintspec completions -s fish) \ + --zsh <($out/bin/lintspec completions -s zsh) + ''; meta = { description = "Blazingly fast linter for NatSpec comments in Solidity code"; From 3af08fb5d6762383c126a4e98ff2a9325dfdc8ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Sep 2025 14:26:05 +0000 Subject: [PATCH 113/116] scalingo: 1.38.0 -> 1.39.0 --- pkgs/by-name/sc/scalingo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix index ceed9b6b6f56..b42373486121 100644 --- a/pkgs/by-name/sc/scalingo/package.nix +++ b/pkgs/by-name/sc/scalingo/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "scalingo"; - version = "1.38.0"; + version = "1.39.0"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = version; - hash = "sha256-+f4bDn5JAjSGjtdwdZjZoKg7lvvIRUug93vdZbb0tJE="; + hash = "sha256-5La3k6DXCYpnTgtnHolJ5pL7EPjkO+bXgT48gcRsbsc="; }; vendorHash = null; From 257439de746afe631d5df5174bdf932adc530a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 19 Jun 2025 14:20:51 +0200 Subject: [PATCH 114/116] xcp: fix build on darwin Co-authored-by: Michael Hoang --- pkgs/by-name/xc/xcp/package.nix | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/xc/xcp/package.nix b/pkgs/by-name/xc/xcp/package.nix index df3bf25ee049..fe4f5d39bd16 100644 --- a/pkgs/by-name/xc/xcp/package.nix +++ b/pkgs/by-name/xc/xcp/package.nix @@ -5,6 +5,7 @@ acl, nix-update-script, installShellFiles, + stdenv, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -22,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ acl ]; + checkInputs = lib.optionals stdenv.isLinux [ acl ]; # disable tests depending on special filesystem features checkNoDefaultFeatures = true; @@ -35,6 +36,29 @@ rustPlatform.buildRustPackage (finalAttrs: { "test_no_perms" ]; + # had concurrency issues on 64 cores, also tests are quite fast compared to build + dontUseCargoParallelTests = true; + checkFlags = lib.optionals stdenv.isDarwin [ + # ---- test_socket_file::test_with_parallel_file_driver stdout ---- + # STDOUT: 12:20:56 [WARN] Socket copy not supported by this OS: /private/tmp/nix-build-xcp-0.24.1.drv-0/source/targ> + # + # STDERR: + # + # thread 'test_socket_file::test_with_parallel_file_driver' panicked at tests/common.rs:1149:5: + # assertion failed: to.exists() + # note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace + "--skip=test_socket_file::test_with_parallel_file_driver" + + # ---- test_sockets_dir::test_with_parallel_file_driver stdout ---- + # STDOUT: 12:20:56 [WARN] Socket copy not supported by this OS: /private/tmp/nix-build-xcp-0.24.1.drv-0/source/targ> + # + # STDERR: + # + # thread 'test_sockets_dir::test_with_parallel_file_driver' panicked at tests/common.rs:1178:5: + # assertion failed: to.exists() + "--skip=test_sockets_dir::test_with_parallel_file_driver" + ]; + postInstall = '' installShellCompletion --cmd xcp \ --bash completions/xcp.bash \ From dd886494a02b759aa6e6854a1eede3e515b52891 Mon Sep 17 00:00:00 2001 From: Keenan Weaver Date: Thu, 11 Sep 2025 10:53:17 -0500 Subject: [PATCH 115/116] openomf: 0.8.3 -> 0.8.4 --- pkgs/by-name/op/openomf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openomf/package.nix b/pkgs/by-name/op/openomf/package.nix index 0feb0f61d3ac..9b0c7c840cd6 100644 --- a/pkgs/by-name/op/openomf/package.nix +++ b/pkgs/by-name/op/openomf/package.nix @@ -37,13 +37,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "openomf"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "omf2097"; repo = "openomf"; tag = finalAttrs.version; - hash = "sha256-9vd/LirurXFtmcG0U5SG8Oa66kcJ1EiaBmzfMxgnaqQ="; + hash = "sha256-8MkjngOVE+Bt+hyYO0ch0/QIbje4gV6nAYt4lf5nhX8="; }; nativeBuildInputs = [ From eda74daf1162e4a4008d7c2f07f47cdb6d0301d4 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Thu, 11 Sep 2025 12:09:04 -0400 Subject: [PATCH 116/116] erlang_28: 28.0.3 -> 28.0.4 https://github.com/erlang/otp/releases/tag/OTP-28.0.4 --- pkgs/development/interpreters/erlang/28.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/28.nix b/pkgs/development/interpreters/erlang/28.nix index 4160e592aad9..b41d2b0fa31c 100644 --- a/pkgs/development/interpreters/erlang/28.nix +++ b/pkgs/development/interpreters/erlang/28.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "28.0.3"; - sha256 = "sha256-fNuUMJs4nPZF0iptPxrd7xi13CDmLnA348hnyPFgL5Q="; + version = "28.0.4"; + sha256 = "sha256-xJXrV0DfYPLunkIg8jtHZNQYEH278cSeh+uR/vGw18k="; }