From e588b1af4cc594fce167526c635c76be5fb62e16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Jul 2025 12:57:27 +0000 Subject: [PATCH 01/74] python3Packages.imap-tools: 1.10.0 -> 1.11.0 --- pkgs/development/python-modules/imap-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index e71956c5835e..ec192f63fbc0 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "1.10.0"; + version = "1.11.0"; pyproject = true; src = fetchFromGitHub { owner = "ikvk"; repo = "imap_tools"; tag = "v${version}"; - hash = "sha256-lan12cHkoxCKadgyFey4ShcnwFg3Gl/VqKWlYAkvF3Y="; + hash = "sha256-8oPiCFoJ0mV7ZnteM9lufIbxwA/7hV91959weEx/e30="; }; build-system = [ setuptools ]; From 35c1d426c1e69779f36dad7c8abecc379e87b868 Mon Sep 17 00:00:00 2001 From: mksafavi Date: Tue, 22 Jul 2025 17:03:37 +0330 Subject: [PATCH 02/74] carburetor: set the binary path in desktop file exec command --- pkgs/by-name/ca/carburetor/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ca/carburetor/package.nix b/pkgs/by-name/ca/carburetor/package.nix index 9df7fcaa6f5a..4cccefa0e2c6 100644 --- a/pkgs/by-name/ca/carburetor/package.nix +++ b/pkgs/by-name/ca/carburetor/package.nix @@ -62,6 +62,8 @@ python3Packages.buildPythonApplication { dontWrapGApps = true; preFixup = '' + substituteInPlace $out/share/applications/io.frama.tractor.carburetor.desktop \ + --replace-fail "Exec=gapplication launch io.frama.tractor.carburetor" "Exec=$out/bin/carburetor" makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; From c87da712e4ee7f6c5e331107d4778eb2cf8cd969 Mon Sep 17 00:00:00 2001 From: mksafavi Date: Tue, 22 Jul 2025 17:26:17 +0330 Subject: [PATCH 03/74] carburetor: 5.0.0 -> 5.1.1 tractor: 5.0.0 -> 5.1.0 --- pkgs/by-name/ca/carburetor/package.nix | 11 ++--------- pkgs/by-name/tr/tractor/package.nix | 4 ++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ca/carburetor/package.nix b/pkgs/by-name/ca/carburetor/package.nix index 4cccefa0e2c6..c7d96c44cede 100644 --- a/pkgs/by-name/ca/carburetor/package.nix +++ b/pkgs/by-name/ca/carburetor/package.nix @@ -14,7 +14,7 @@ }: let # This package should be updated together with pkgs/by-name/tr/tractor/package.nix - version = "5.0.0"; + version = "5.1.1"; in python3Packages.buildPythonApplication { @@ -28,16 +28,9 @@ python3Packages.buildPythonApplication { owner = "tractor"; repo = "carburetor"; tag = version; - hash = "sha256-Z67bqjogPz5sz6JwM68z1jsaqvRBAOMDeBLcyLo+QLY="; + hash = "sha256-mHuD9fxHTmTfEdAsiqTtFVzxXEjD8VIDNDKF2RjcAUg="; }; - patches = [ - (fetchpatch2 { - url = "https://framagit.org/tractor/carburetor/-/commit/620b70288942497abc20ad26c043b593f66e9e3b.diff"; - hash = "sha256-oFKLjvu+fwgyU4FIUb2K8jwXOP34P3pEazOhofwveJw="; - }) - ]; - build-system = [ meson python3Packages.meson-python diff --git a/pkgs/by-name/tr/tractor/package.nix b/pkgs/by-name/tr/tractor/package.nix index 71f0c8bfb47b..29fe4d6d3cb1 100644 --- a/pkgs/by-name/tr/tractor/package.nix +++ b/pkgs/by-name/tr/tractor/package.nix @@ -17,7 +17,7 @@ let # This package should be updated together with pkgs/by-name/ca/carburetor/package.nix - version = "5.0.0"; + version = "5.1.0"; in python3Packages.buildPythonApplication { pname = "tractor"; @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication { owner = "tractor"; repo = "tractor"; tag = version; - hash = "sha256-KyVL3dFofoi2TRtZo557X9P/RD16v94VuWdtdAskZk4="; + hash = "sha256-pyGDxHOpaZutUhXRwGAN77fGNn68EWIGgWu80avkuSI="; }; patches = [ ./fix-gsettings-schema.patch ]; From abad83c495c1ce10f694b61d0f02b8d17741a909 Mon Sep 17 00:00:00 2001 From: Majiir Paktu Date: Sun, 3 Aug 2025 11:11:20 -0400 Subject: [PATCH 04/74] trillian-im: remove unused webkitgtk_4_0 dependency --- pkgs/by-name/tr/trillian-im/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/tr/trillian-im/package.nix b/pkgs/by-name/tr/trillian-im/package.nix index 1f89d57294d8..883c38ebf239 100644 --- a/pkgs/by-name/tr/trillian-im/package.nix +++ b/pkgs/by-name/tr/trillian-im/package.nix @@ -17,7 +17,6 @@ librsvg, libzip, openssl, - webkitgtk_4_0, libappindicator-gtk3, }: @@ -49,7 +48,6 @@ stdenv.mkDerivation rec { librsvg libzip openssl - webkitgtk_4_0 libappindicator-gtk3 ]; From 6cf0fe8aa7ae9c312ff8c96d7201eb6465b89db9 Mon Sep 17 00:00:00 2001 From: Majiir Paktu Date: Sun, 3 Aug 2025 11:26:08 -0400 Subject: [PATCH 05/74] trillian-im: 6.3.0.1 -> 6.3.0.2 --- pkgs/by-name/tr/trillian-im/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trillian-im/package.nix b/pkgs/by-name/tr/trillian-im/package.nix index 883c38ebf239..22e3143a372d 100644 --- a/pkgs/by-name/tr/trillian-im/package.nix +++ b/pkgs/by-name/tr/trillian-im/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "trillian-im"; - version = "6.3.0.1"; + version = "6.3.0.2"; src = fetchurl { url = "https://www.trillian.im/get/linux/6.3/trillian_${version}_amd64.deb"; - sha256 = "42e3466ee236ac2644907059f0961eba3a6ed6b6156afb2c57f54ebe6065ac6f"; + hash = "sha256-5QvvAld9IC+6DAWVsyT6BoyKx+0WUA+UC8q1RBnwjqg="; }; nativeBuildInputs = [ From 21435454e233f1e99f5d8f9f3c3340da5559bb3f Mon Sep 17 00:00:00 2001 From: Jon Hermansen Date: Wed, 6 Aug 2025 11:15:58 -0400 Subject: [PATCH 06/74] protonmail-desktop: 1.8.1 -> 1.9.0 --- pkgs/by-name/pr/protonmail-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix index 8d68de64150e..de92032c93f1 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -9,7 +9,7 @@ }: let mainProgram = "proton-mail"; - version = "1.8.1"; + version = "1.9.0"; in stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://proton.me/download/mail/linux/${version}/ProtonMail-desktop-beta.deb"; - sha256 = "sha256-Qzl0OaPO2OAgKb7tMWfkSyDyxvFdiOnL9CWI5z2ndMM="; + sha256 = "sha256-8gUkWDBLzilmLrZCHRjf8EPYrjyHpwpA7ZIU4FQ1azA="; }; dontConfigure = true; From 91fbc7627629836870b07d2791c72e06b1c9f8dd Mon Sep 17 00:00:00 2001 From: Simon Hauser Date: Thu, 7 Aug 2025 09:28:45 +0200 Subject: [PATCH 07/74] mariadb: 10.6.23, 10.11.14, 11.4.8, 11.8.3 Changelog: https://mariadb.com/docs/release-notes/community-server/changelogs/changelogs-mariadb-106-series/mariadb-10.6.23-changelog Changelog: https://mariadb.com/docs/release-notes/community-server/changelogs/changelogs-mariadb-10-11-series/mariadb-10.11.14-changelog Changelog: https://mariadb.com/docs/release-notes/community-server/changelogs/changelogs-mariadb-11-4-series/mariadb-11.4.8-changelog Changelog: https://mariadb.com/docs/release-notes/community-server/changelogs/changelogs-mariadb-11-8-series/mariadb-11.8.3-changelog --- pkgs/servers/sql/mariadb/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 80dcc2dfbed9..014b85a1f7ed 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -365,22 +365,22 @@ self: { # see https://mariadb.org/about/#maintenance-policy for EOLs mariadb_106 = self.callPackage generic { # Supported until 2026-07-06 - version = "10.6.22"; - hash = "sha256-LKYA3H6F6tHzPCEvnXax8vgS0knIveAuXzjq0Jit5CA="; + version = "10.6.23"; + hash = "sha256-uvS/N6BR6JLnFyTudSiRrbfPxpzSjQhzXDYH0wxpPCM="; }; mariadb_1011 = self.callPackage generic { # Supported until 2028-02-16 - version = "10.11.13"; - hash = "sha256-+Lc0dJ+9ZS6k4lW+jMeID5jQe2p/604eqMc2y0gNI+Q="; + version = "10.11.14"; + hash = "sha256-ilccsU+x1ONmPY6Y89QgDAQvyLKkqqq0lYYN6ot9BS8="; }; mariadb_114 = self.callPackage generic { # Supported until 2029-05-29 - version = "11.4.7"; - hash = "sha256-vyBofKEvp+/ajficqx8qZhKIzqQaz49TGJtp1SlDR9A="; + version = "11.4.8"; + hash = "sha256-UvpNyixfgK/BZn1SOifAYXbZhTIpimsMMe1zUF9J4Vw="; }; mariadb_118 = self.callPackage generic { # Supported until 2028-06-04 - version = "11.8.2"; - hash = "sha256-shYs316TF9ioYhy+2oOZkyT8CsiUQhDhSrtf4Kn+o+8="; + version = "11.8.3"; + hash = "sha256-EBSoXHaN6PnpxtS/C0JhfzsViL4a03H3FnTqMrhxGcA="; }; } From 1c6b721b62bc45f568e3f218aa0c1322e4d59739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 10 Aug 2025 00:58:56 +0200 Subject: [PATCH 08/74] nixos/zigbee2mqtt: Update homeassistant setting This is now no longer a top-level boolean: * https://www.zigbee2mqtt.io/guide/configuration/homeassistant.html * https://github.com/Koenkk/zigbee2mqtt.io/commit/ae8965a0589789449cd9478adced39a2fb69760c#diff-aa9667dbf49ded55b85667093efbf5f706f30496292182850e7f94bb2e1e0774 --- nixos/modules/services/home-automation/zigbee2mqtt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/home-automation/zigbee2mqtt.nix b/nixos/modules/services/home-automation/zigbee2mqtt.nix index 678942950ca1..d02cc7484991 100644 --- a/nixos/modules/services/home-automation/zigbee2mqtt.nix +++ b/nixos/modules/services/home-automation/zigbee2mqtt.nix @@ -41,7 +41,7 @@ in default = { }; example = lib.literalExpression '' { - homeassistant = config.services.home-assistant.enable; + homeassistant.enabled = config.services.home-assistant.enable; permit_join = true; serial = { port = "/dev/ttyACM1"; @@ -60,7 +60,7 @@ in # preset config values services.zigbee2mqtt.settings = { - homeassistant = lib.mkDefault config.services.home-assistant.enable; + homeassistant.enabled = lib.mkDefault config.services.home-assistant.enable; permit_join = lib.mkDefault false; mqtt = { base_topic = lib.mkDefault "zigbee2mqtt"; From 6c87cbe8c71ef851399426e0fb6afb34bb511565 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Aug 2025 04:46:00 +0000 Subject: [PATCH 09/74] python3Packages.supabase-functions: 0.10.1 -> 0.10.2 --- pkgs/development/python-modules/supafunc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/supafunc/default.nix b/pkgs/development/python-modules/supafunc/default.nix index 8ecce5f94487..9d56f63351d9 100644 --- a/pkgs/development/python-modules/supafunc/default.nix +++ b/pkgs/development/python-modules/supafunc/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "supafunc"; - version = "0.10.1"; + version = "0.10.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-pbM8i67La1KX0l2imiUD4uxn7mmG89RME35lG4pZoX0="; + hash = "sha256-ReTVAIVBZ8JhUVxD96NjMg4KkoEYGC/okyre/d7dtUU="; }; dependencies = [ From 1d7c5611c502e8181aee2c69e8be16885d42b64d Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 30 May 2025 23:37:23 +0200 Subject: [PATCH 10/74] python313Packages.kicadcliwrapper: init at 1.0.4 --- .../kicadcliwrapper/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/kicadcliwrapper/default.nix diff --git a/pkgs/development/python-modules/kicadcliwrapper/default.nix b/pkgs/development/python-modules/kicadcliwrapper/default.nix new file mode 100644 index 000000000000..9135e8ee1851 --- /dev/null +++ b/pkgs/development/python-modules/kicadcliwrapper/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + typing-extensions, +}: + +buildPythonPackage rec { + pname = "kicadcliwrapper"; + version = "1.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "atopile"; + repo = "kicadcliwrapper"; + tag = "v${version}"; + hash = "sha256-S1Sd3TgLUIT1TcG8WbEgHgUqIcXvzVdvfwrPnpaK7/g="; + }; + + # this script is used the generated the bindings + # and is intended for development. + preCheck = '' + rm src/kicadcliwrapper/main.py + ''; + + build-system = [ poetry-core ]; + + dependencies = [ typing-extensions ]; + + pythonRemoveDeps = [ "black" ]; + + pythonImportsCheck = [ + "kicadcliwrapper" + "kicadcliwrapper.lib" + ]; + + doCheck = false; # no tests + + meta = { + description = "Strongly typed, auto-generated bindings for KiCAD's CLI"; + homepage = "https://github.com/atopile/kicadcliwrapper"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4fbd9256b879..5fbe22e1cbeb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7735,6 +7735,8 @@ self: super: with self; { kicad = toPythonModule (pkgs.kicad.override { python3 = python; }).src; + kicadcliwrapper = callPackage ../development/python-modules/kicadcliwrapper { }; + kinparse = callPackage ../development/python-modules/kinparse { }; kiss-headers = callPackage ../development/python-modules/kiss-headers { }; From 836c4459434a30ffb08c69ffb03fcfc3be3bfad9 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 30 May 2025 23:38:52 +0200 Subject: [PATCH 11/74] python313Packages.atopile-easy2kicad: init at 0.9.4 --- .../atopile-easyeda2kicad/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/atopile-easyeda2kicad/default.nix diff --git a/pkgs/development/python-modules/atopile-easyeda2kicad/default.nix b/pkgs/development/python-modules/atopile-easyeda2kicad/default.nix new file mode 100644 index 000000000000..be856d53ed31 --- /dev/null +++ b/pkgs/development/python-modules/atopile-easyeda2kicad/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + hatch-vcs, + pydantic, + requests, +}: + +buildPythonPackage rec { + pname = "atopile-easyeda2kicad"; + version = "0.9.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "atopile"; + repo = "easyeda2kicad.py"; + tag = "v${version}"; + hash = "sha256-pdP91tWeyQWh9ow02EXA2XIUsaexitX1R/OeyFQJ9vI="; + }; + + build-system = [ + hatchling + hatch-vcs + ]; + + dependencies = [ + pydantic + requests + ]; + + pythonImportsCheck = [ "easyeda2kicad" ]; + + doCheck = false; # no tests + + meta = { + description = "Convert any LCSC components (including EasyEDA) to KiCad library"; + homepage = "https://github.com/atopile/easyeda2kicad.py"; + changelog = "https://github.com/atopile/easyeda2kicad.py/releases/tag/v${version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ sigmanificient ]; + mainProgram = "easyeda2kicad"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5fbe22e1cbeb..127657c027ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1095,6 +1095,8 @@ self: super: with self; { atopile = callPackage ../development/python-modules/atopile { }; + atopile-easyeda2kicad = callPackage ../development/python-modules/atopile-easyeda2kicad { }; + atproto = callPackage ../development/python-modules/atproto { }; atpublic = callPackage ../development/python-modules/atpublic { }; From b2774cc1cd3e16b7e00cbbd6c1eda9effc32958e Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 24 Mar 2025 03:50:45 +0100 Subject: [PATCH 12/74] python313Packaes.atopile: 0.2.69 -> 0.3.20 changelog: https://github.com/atopile/atopile/releases/tag/v0.3.20 --- .../python-modules/atopile/default.nix | 115 +++++++++++------- 1 file changed, 73 insertions(+), 42 deletions(-) diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix index 8f43b9091078..817b39ec8097 100644 --- a/pkgs/development/python-modules/atopile/default.nix +++ b/pkgs/development/python-modules/atopile/default.nix @@ -2,6 +2,9 @@ lib, buildPythonPackage, fetchFromGitHub, + + cmake, + ninja, # build-system hatchling, scikit-build-core, @@ -10,51 +13,56 @@ # deps antlr4-python3-runtime, attrs, + atopile-easyeda2kicad, + black, case-converter, - cattrs, - click, - deepdiff, - easyeda2ato, - eseries, - fake-useragent, - fastapi, + cookiecutter, + dataclasses-json, + deprecated, + freetype-py, gitpython, - igraph, - jinja2, + kicadcliwrapper, + matplotlib, + more-itertools, natsort, - networkx, + numpy, pandas, + pathvalidate, pint, + posthog, + psutil, + pydantic-settings, pygls, - quart-cors, - quart-schema, - quart, + questionary, rich, ruamel-yaml, - schema, - scipy, + ruff, semver, - toolz, + sexpdata, + shapely, + typer, urllib3, - uvicorn, - watchfiles, - pyyaml, + pythonOlder, + # tests pytestCheckHook, pytest-xdist, pytest-timeout, + hypothesis, }: buildPythonPackage rec { pname = "atopile"; - version = "0.2.69"; + version = "0.3.24"; pyproject = true; + disabled = pythonOlder "3.12"; + src = fetchFromGitHub { owner = "atopile"; repo = "atopile"; tag = "v${version}"; - hash = "sha256-mQYnaWch0lVzz1hV6WboYxBGe3ruw+mK2AwMx13DQJM="; + hash = "sha256-erHgjzg+nODEU4WzD3aP3UAv+K59SVEjpDs8VX/RFE0="; }; build-system = [ @@ -64,45 +72,65 @@ buildPythonPackage rec { nanobind ]; + dontUseCmakeConfigure = true; # skip cmake configure invocation + + nativeBuildInputs = [ + cmake + ninja + ]; + dependencies = [ antlr4-python3-runtime attrs + atopile-easyeda2kicad + black # used as a dependency case-converter - cattrs - click - deepdiff - easyeda2ato - eseries - fake-useragent - fastapi + cookiecutter + dataclasses-json + deprecated + freetype-py gitpython - igraph - jinja2 + kicadcliwrapper + matplotlib + more-itertools natsort - networkx + numpy pandas + pathvalidate pint + posthog + psutil + pydantic-settings pygls - quart-cors - quart-schema - quart + questionary rich ruamel-yaml - schema - scipy + ruff semver - toolz + sexpdata + shapely + typer urllib3 - uvicorn - watchfiles - pyyaml # required for ato ]; - pythonRelaxDeps = [ "antlr4-python3-runtime" ]; + preBuild = '' + substituteInPlace pyproject.toml \ + --replace-fail "scikit-build-core==0.9.2" "scikit-build-core>=0.9.2" + ''; + + pythonRelaxDeps = [ + "black" + "psutil" + "posthog" + ]; pythonImportsCheck = [ "atopile" ]; preCheck = '' + # do not report worker logs to filee + substituteInPlace test/conftest.py \ + --replace-fail "worker_id =" "worker_id = None #" + substituteInPlace pyproject.toml \ --replace-fail "--html=artifacts/test-report.html" "" \ --replace-fail "--self-contained-html" "" @@ -112,11 +140,14 @@ buildPythonPackage rec { pytestCheckHook pytest-xdist pytest-timeout + hypothesis ]; + doCheck = false; # test are hanging + meta = { description = "Design circuit boards with code"; - homepage = "https://aiopg.readthedocs.io/"; + homepage = "https://atopile.io"; downloadPage = "https://github.com/atopile/atopile"; changelog = "https://github.com/atopile/atopile/releases/tag/${src.rev}"; license = with lib.licenses; [ mit ]; From c63ad81e7583c9b39d94eb5e0accc10f41d5e228 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 5 May 2025 03:56:20 +0200 Subject: [PATCH 13/74] python313Packages.atopile-easyda2ato: 0.9.4 -> 0.9.5 changelog: https://github.com/atopile/easyeda2kicad.py/releases/tag/v0.9.5 --- .../python-modules/atopile-easyeda2kicad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atopile-easyeda2kicad/default.nix b/pkgs/development/python-modules/atopile-easyeda2kicad/default.nix index be856d53ed31..1b91aa1437fe 100644 --- a/pkgs/development/python-modules/atopile-easyeda2kicad/default.nix +++ b/pkgs/development/python-modules/atopile-easyeda2kicad/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "atopile-easyeda2kicad"; - version = "0.9.4"; + version = "0.9.5"; pyproject = true; src = fetchFromGitHub { owner = "atopile"; repo = "easyeda2kicad.py"; tag = "v${version}"; - hash = "sha256-pdP91tWeyQWh9ow02EXA2XIUsaexitX1R/OeyFQJ9vI="; + hash = "sha256-TLGLNe/Lk2WpYMzmX2iK3S27/QRqTOdHqO8XIMZSda4="; }; build-system = [ From 3d4984b32b4843f66653665e4827edd870fb6d81 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 5 May 2025 04:09:16 +0200 Subject: [PATCH 14/74] python313Packages.fastapi-github-oidc: init at 0.3.0 changelog: https://github.com/atopile/fastapi-github-oidc/releases/tag/0.3.0 --- .../fastapi-github-oidc/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/fastapi-github-oidc/default.nix diff --git a/pkgs/development/python-modules/fastapi-github-oidc/default.nix b/pkgs/development/python-modules/fastapi-github-oidc/default.nix new file mode 100644 index 000000000000..75614652e872 --- /dev/null +++ b/pkgs/development/python-modules/fastapi-github-oidc/default.nix @@ -0,0 +1,55 @@ +{ + buildPythonPackage, + fetchFromGitHub, + hatchling, + hatch-vcs, + fastapi, + pyjwt, + httpx, + requests, + pytestCheckHook, + lib, +}: +buildPythonPackage rec { + pname = "fastapi-github-oidc"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "atopile"; + repo = "fastapi-github-oidc"; + tag = version; + hash = "sha256-FS50++Hy9h0RFrSnc4PbXFPh/1OO0JOaFdIZwoXa86A="; + }; + + build-system = [ + hatchling + hatch-vcs + ]; + + dependencies = [ + fastapi + pyjwt + httpx + requests + ]; + + pythonImportsCheck = [ + "github_oidc.client" + "github_oidc.server" + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTests = [ + "test_with_auth" # calls github api + ]; + + meta = { + description = "FastAPI compatible middleware to authenticate Github OIDC Tokens"; + homepage = "https://github.com/atopile/fastapi-github-oidc"; + changelog = "https://github.com/atopile/fastapi-github-oidc/releases/tag/${src.tag}"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 127657c027ec..1fcb02b828be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4963,6 +4963,8 @@ self: super: with self; { fastapi-cli = callPackage ../development/python-modules/fastapi-cli { }; + fastapi-github-oidc = callPackage ../development/python-modules/fastapi-github-oidc { }; + fastapi-mail = callPackage ../development/python-modules/fastapi-mail { }; fastapi-mcp = callPackage ../development/python-modules/fastapi-mcp { }; From 5000a3bee7d69cc8aaa22cd25a51ba13beef9fc0 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 5 May 2025 04:22:37 +0200 Subject: [PATCH 15/74] python313Packages.atopile: 0.3.24 -> 0.4.1 changelog: https://github.com/atopile/atopile/releases/tag/v0.4.1 --- .../python-modules/atopile/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix index 817b39ec8097..a2cff63f3037 100644 --- a/pkgs/development/python-modules/atopile/default.nix +++ b/pkgs/development/python-modules/atopile/default.nix @@ -19,6 +19,7 @@ cookiecutter, dataclasses-json, deprecated, + fastapi-github-oidc, freetype-py, gitpython, kicadcliwrapper, @@ -26,7 +27,6 @@ more-itertools, natsort, numpy, - pandas, pathvalidate, pint, posthog, @@ -34,6 +34,7 @@ pydantic-settings, pygls, questionary, + requests, rich, ruamel-yaml, ruff, @@ -53,7 +54,7 @@ buildPythonPackage rec { pname = "atopile"; - version = "0.3.24"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -62,7 +63,7 @@ buildPythonPackage rec { owner = "atopile"; repo = "atopile"; tag = "v${version}"; - hash = "sha256-erHgjzg+nODEU4WzD3aP3UAv+K59SVEjpDs8VX/RFE0="; + hash = "sha256-N8tFD1tl1Vnn0nrQEWdE/vuJHbuSguRYg+oH7QH1m48="; }; build-system = [ @@ -88,6 +89,7 @@ buildPythonPackage rec { cookiecutter dataclasses-json deprecated + fastapi-github-oidc freetype-py gitpython kicadcliwrapper @@ -95,7 +97,6 @@ buildPythonPackage rec { more-itertools natsort numpy - pandas pathvalidate pint posthog @@ -103,6 +104,7 @@ buildPythonPackage rec { pydantic-settings pygls questionary + requests rich ruamel-yaml ruff @@ -113,15 +115,9 @@ buildPythonPackage rec { urllib3 ]; - preBuild = '' - substituteInPlace pyproject.toml \ - --replace-fail "scikit-build-core==0.9.2" "scikit-build-core>=0.9.2" - ''; - pythonRelaxDeps = [ "black" "psutil" - "posthog" ]; pythonImportsCheck = [ "atopile" ]; From 1c8f95a6459e36ce0bb214f4ef95f7fac670dd16 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 9 Aug 2025 10:27:53 +0200 Subject: [PATCH 16/74] python313Packages.atopile: fix posthog telemery initialization --- pkgs/development/python-modules/atopile/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix index a2cff63f3037..c7aba8d9a238 100644 --- a/pkgs/development/python-modules/atopile/default.nix +++ b/pkgs/development/python-modules/atopile/default.nix @@ -120,6 +120,11 @@ buildPythonPackage rec { "psutil" ]; + postPatch = '' + substituteInPlace src/atopile/telemetry.py \ + --replace-fail "api_key=" "project_api_key=" + ''; + pythonImportsCheck = [ "atopile" ]; preCheck = '' From 7eea5b3b944bec62158a9b07d05276ab3ce0f424 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 5 May 2025 04:29:30 +0200 Subject: [PATCH 17/74] python313Packages.kicadcliwrapper: 1.0.4 -> 1.10 changelog:https://github.com/atopile/kicadcliwrapper/releases/tag/v1.1.0 --- .../kicadcliwrapper/default.nix | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/kicadcliwrapper/default.nix b/pkgs/development/python-modules/kicadcliwrapper/default.nix index 9135e8ee1851..b58282ed5ec1 100644 --- a/pkgs/development/python-modules/kicadcliwrapper/default.nix +++ b/pkgs/development/python-modules/kicadcliwrapper/default.nix @@ -2,29 +2,29 @@ lib, buildPythonPackage, fetchFromGitHub, - poetry-core, + hatchling, + hatch-vcs, typing-extensions, + pytestCheckHook, + kicad, }: buildPythonPackage rec { pname = "kicadcliwrapper"; - version = "1.0.4"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "atopile"; repo = "kicadcliwrapper"; tag = "v${version}"; - hash = "sha256-S1Sd3TgLUIT1TcG8WbEgHgUqIcXvzVdvfwrPnpaK7/g="; + hash = "sha256-D9uvNwNLi9zz/TW+uAOXve/JFjeol1IbZSeunFWCEZA="; }; - # this script is used the generated the bindings - # and is intended for development. - preCheck = '' - rm src/kicadcliwrapper/main.py - ''; - - build-system = [ poetry-core ]; + build-system = [ + hatchling + hatch-vcs + ]; dependencies = [ typing-extensions ]; @@ -35,7 +35,16 @@ buildPythonPackage rec { "kicadcliwrapper.lib" ]; - doCheck = false; # no tests + # this script is used to generate the bindings + # and is intended for development. + preCheck = '' + rm src/kicadcliwrapper/main.py + ''; + + nativeCheckInputs = [ + pytestCheckHook + kicad + ]; meta = { description = "Strongly typed, auto-generated bindings for KiCAD's CLI"; From 152e01c131bfd8ac13c2c7aed9499893d89bcc2e Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 5 May 2025 04:32:35 +0200 Subject: [PATCH 18/74] python313Packages.atopile: 0.4.1 -> 0.6.0 changelog: - https://github.com/atopile/atopile/releases/tag/v0.5.0 - https://github.com/atopile/atopile/releases/tag/v0.5.1 - https://github.com/atopile/atopile/releases/tag/v0.6.0 --- pkgs/development/python-modules/atopile/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix index c7aba8d9a238..d1229978ae0d 100644 --- a/pkgs/development/python-modules/atopile/default.nix +++ b/pkgs/development/python-modules/atopile/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pname = "atopile"; - version = "0.4.1"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -63,7 +63,7 @@ buildPythonPackage rec { owner = "atopile"; repo = "atopile"; tag = "v${version}"; - hash = "sha256-N8tFD1tl1Vnn0nrQEWdE/vuJHbuSguRYg+oH7QH1m48="; + hash = "sha256-DdHS4VynQzabKGcQZdgpTqiiT8HREwq5cEVoiQS4GzM="; }; build-system = [ @@ -117,6 +117,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "black" + "rich" "psutil" ]; From 384dc15bac4634037d201c8fbd15407ca57c1fa6 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 30 May 2025 23:46:18 +0200 Subject: [PATCH 19/74] python313Packages.atopile: 0.6.0 -> 0.7.0 https://github.com/atopile/atopile/releases/tag/v0.7.0 --- pkgs/development/python-modules/atopile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix index d1229978ae0d..ebed4e7021d1 100644 --- a/pkgs/development/python-modules/atopile/default.nix +++ b/pkgs/development/python-modules/atopile/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pname = "atopile"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -63,7 +63,7 @@ buildPythonPackage rec { owner = "atopile"; repo = "atopile"; tag = "v${version}"; - hash = "sha256-DdHS4VynQzabKGcQZdgpTqiiT8HREwq5cEVoiQS4GzM="; + hash = "sha256-aQtO9jJbdVSyEfIbyAABemLU//HeF+jZMDCLuSCPNGw="; }; build-system = [ From b5b2ed13914c0cc7d945017925187410be853b51 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 30 May 2025 23:47:34 +0200 Subject: [PATCH 20/74] python313Packages.atopile: 0.7.0 -> 0.8.2 https://github.com/atopile/atopile/releases/tag/v0.8.0 https://github.com/atopile/atopile/releases/tag/v0.8.1 https://github.com/atopile/atopile/releases/tag/v0.8.2 --- pkgs/development/python-modules/atopile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix index ebed4e7021d1..cffb66ce64c8 100644 --- a/pkgs/development/python-modules/atopile/default.nix +++ b/pkgs/development/python-modules/atopile/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pname = "atopile"; - version = "0.7.0"; + version = "0.8.2"; pyproject = true; disabled = pythonOlder "3.12"; @@ -63,7 +63,7 @@ buildPythonPackage rec { owner = "atopile"; repo = "atopile"; tag = "v${version}"; - hash = "sha256-aQtO9jJbdVSyEfIbyAABemLU//HeF+jZMDCLuSCPNGw="; + hash = "sha256-NnaPXNJAwLF9Q/5qqbZoz4nxfOIjnO5nefC7NnHZeWw="; }; build-system = [ From 8a90e3c12533de49b712d12f201a71e6ee65b56f Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 8 Jun 2025 07:07:45 +0200 Subject: [PATCH 21/74] python313Packages.atopile: 0.8.2 -> 0.9.0 --- pkgs/development/python-modules/atopile/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix index cffb66ce64c8..8c7131e1e6ac 100644 --- a/pkgs/development/python-modules/atopile/default.nix +++ b/pkgs/development/python-modules/atopile/default.nix @@ -43,6 +43,7 @@ shapely, typer, urllib3, + zstd, pythonOlder, # tests @@ -54,7 +55,7 @@ buildPythonPackage rec { pname = "atopile"; - version = "0.8.2"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -63,7 +64,7 @@ buildPythonPackage rec { owner = "atopile"; repo = "atopile"; tag = "v${version}"; - hash = "sha256-NnaPXNJAwLF9Q/5qqbZoz4nxfOIjnO5nefC7NnHZeWw="; + hash = "sha256-kmoOP9Dp3wBiabq022uKnN/UtpBfH6oSUOd0HC2f0I0="; }; build-system = [ @@ -113,12 +114,14 @@ buildPythonPackage rec { shapely typer urllib3 + zstd ]; pythonRelaxDeps = [ "black" "rich" "psutil" + "zstd" ]; postPatch = '' From fd281e2c91590a62795a928525a1622af9851c4d Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 8 Jun 2025 21:03:15 +0200 Subject: [PATCH 22/74] python313Packages.easyda2ato: remove --- .../python-modules/easyeda2ato/default.nix | 41 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 pkgs/development/python-modules/easyeda2ato/default.nix diff --git a/pkgs/development/python-modules/easyeda2ato/default.nix b/pkgs/development/python-modules/easyeda2ato/default.nix deleted file mode 100644 index 362b07e2ce67..000000000000 --- a/pkgs/development/python-modules/easyeda2ato/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - setuptools, - pydantic, - requests, -}: - -buildPythonPackage rec { - pname = "easyeda2ato"; - version = "0.2.7"; - pyproject = true; - - # repo version does not match - src = fetchPypi { - inherit pname version; - - hash = "sha256-bHhBN+h9Vx9Q4wZVKxMzkEEXzV7hKoQz8i+JpkSFsYA="; - }; - - build-system = [ setuptools ]; - - dependencies = [ - pydantic - requests - ]; - - pythonImportsCheck = [ "easyeda2kicad" ]; - - doCheck = false; # no tests - - meta = { - description = "Convert any LCSC components (including EasyEDA) to KiCad library"; - homepage = "https://github.com/uPesy/easyeda2kicad.py"; - changelog = "https://github.com/uPesy/easyeda2kicad.py/releases/tag/v${version}"; - license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ sigmanificient ]; - mainProgram = "easyeda2kicad"; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index c545be2e4b11..54a8601511b1 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -231,6 +231,7 @@ mapAliases ({ dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20 dugong = throw "dugong is unmaintained since 2022 and has therefore been removed"; # added 2024-12-12 editdistance-s = throw "editdistance-s has been removed since it was added solely for the identity package, which has moved on to ukkonen"; # added 2025-08-04 + easyeda2ato = throw "easyeda2ato as been removed in favor of atopile-easyda2kicad"; # added 2025-06-08 eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03 EasyProcess = easyprocess; # added 2023-02-19 email_validator = email-validator; # added 2022-06-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1fcb02b828be..355a7214a19d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4484,8 +4484,6 @@ self: super: with self; { easydict = callPackage ../development/python-modules/easydict { }; - easyeda2ato = callPackage ../development/python-modules/easyeda2ato { }; - easyenergy = callPackage ../development/python-modules/easyenergy { }; easygui = callPackage ../development/python-modules/easygui { }; From d690766be7e2791aee2fc677f803d06958616fa0 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 13 Jun 2025 01:47:05 +0200 Subject: [PATCH 23/74] python313Packages.atopile: disable python 3.12 --- pkgs/development/python-modules/atopile/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix index 8c7131e1e6ac..59e149098751 100644 --- a/pkgs/development/python-modules/atopile/default.nix +++ b/pkgs/development/python-modules/atopile/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { version = "0.9.0"; pyproject = true; - disabled = pythonOlder "3.12"; + disabled = pythonOlder "3.13"; src = fetchFromGitHub { owner = "atopile"; From ed2a0f86a05366880d7603243e497b2362a6db70 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 9 Aug 2025 08:36:02 +0200 Subject: [PATCH 24/74] python313Packages.atopile: 0.9.0 -> 0.9.6 https://github.com/atopile/atopile/releases/tag/v0.9.1 https://github.com/atopile/atopile/releases/tag/v0.9.2 https://github.com/atopile/atopile/releases/tag/v0.9.3 https://github.com/atopile/atopile/releases/tag/v0.9.4 https://github.com/atopile/atopile/releases/tag/v0.9.5 https://github.com/atopile/atopile/releases/tag/v0.9.6 --- pkgs/development/python-modules/atopile/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix index 59e149098751..d1d1c4e12429 100644 --- a/pkgs/development/python-modules/atopile/default.nix +++ b/pkgs/development/python-modules/atopile/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { pname = "atopile"; - version = "0.9.0"; + version = "0.9.6"; pyproject = true; disabled = pythonOlder "3.13"; @@ -64,7 +64,7 @@ buildPythonPackage rec { owner = "atopile"; repo = "atopile"; tag = "v${version}"; - hash = "sha256-kmoOP9Dp3wBiabq022uKnN/UtpBfH6oSUOd0HC2f0I0="; + hash = "sha256-U+Hw+Dl+47RVl9U6dVZIBo0F7Y7b64P/iyNCDhQoJXU="; }; build-system = [ @@ -117,12 +117,7 @@ buildPythonPackage rec { zstd ]; - pythonRelaxDeps = [ - "black" - "rich" - "psutil" - "zstd" - ]; + pythonRelaxDeps = [ "zstd" ]; postPatch = '' substituteInPlace src/atopile/telemetry.py \ From 2bc70e5684652055c0812106cc492940aee39908 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 9 Aug 2025 10:57:01 +0200 Subject: [PATCH 25/74] python313Packages.kicadcliwrapper: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/kicadcliwrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kicadcliwrapper/default.nix b/pkgs/development/python-modules/kicadcliwrapper/default.nix index b58282ed5ec1..c7f6d5b341e8 100644 --- a/pkgs/development/python-modules/kicadcliwrapper/default.nix +++ b/pkgs/development/python-modules/kicadcliwrapper/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "kicadcliwrapper"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "atopile"; repo = "kicadcliwrapper"; tag = "v${version}"; - hash = "sha256-D9uvNwNLi9zz/TW+uAOXve/JFjeol1IbZSeunFWCEZA="; + hash = "sha256-s1j0k6SvZiIHu8PKGTR+GaYUZIlFq5TKYuxoCsvsvUY="; }; build-system = [ From 00b5480179494a138f3e3f2521954a4c76cd69eb Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 9 Aug 2025 10:50:24 +0200 Subject: [PATCH 26/74] python313Packages.atopile: 0.9.6 -> 0.10.15 https://github.com/atopile/atopile/compare/v0.9.6...v0.10.15 --- .../python-modules/atopile/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix index d1d1c4e12429..80df90597e75 100644 --- a/pkgs/development/python-modules/atopile/default.nix +++ b/pkgs/development/python-modules/atopile/default.nix @@ -12,7 +12,6 @@ nanobind, # deps antlr4-python3-runtime, - attrs, atopile-easyeda2kicad, black, case-converter, @@ -24,9 +23,11 @@ gitpython, kicadcliwrapper, matplotlib, + mcp, more-itertools, natsort, numpy, + ordered-set, pathvalidate, pint, posthog, @@ -55,7 +56,7 @@ buildPythonPackage rec { pname = "atopile"; - version = "0.9.6"; + version = "0.10.15"; pyproject = true; disabled = pythonOlder "3.13"; @@ -64,7 +65,7 @@ buildPythonPackage rec { owner = "atopile"; repo = "atopile"; tag = "v${version}"; - hash = "sha256-U+Hw+Dl+47RVl9U6dVZIBo0F7Y7b64P/iyNCDhQoJXU="; + hash = "sha256-18+hPvVSKgYnjpreJLs4ZeeA1T8gCDtoXWznOFjMEwA="; }; build-system = [ @@ -83,7 +84,6 @@ buildPythonPackage rec { dependencies = [ antlr4-python3-runtime - attrs atopile-easyeda2kicad black # used as a dependency case-converter @@ -95,9 +95,11 @@ buildPythonPackage rec { gitpython kicadcliwrapper matplotlib + mcp more-itertools natsort numpy + ordered-set pathvalidate pint posthog @@ -117,7 +119,10 @@ buildPythonPackage rec { zstd ]; - pythonRelaxDeps = [ "zstd" ]; + pythonRelaxDeps = [ + "posthog" + "zstd" + ]; postPatch = '' substituteInPlace src/atopile/telemetry.py \ From 2032eb4942807048cb41377af3f72a188bff51e6 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 9 Aug 2025 11:47:24 +0200 Subject: [PATCH 27/74] python313Packages.protoletariat: init at 3.3.10 protoletariat --- .../python-modules/protoletariat/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/protoletariat/default.nix diff --git a/pkgs/development/python-modules/protoletariat/default.nix b/pkgs/development/python-modules/protoletariat/default.nix new file mode 100644 index 000000000000..721f90d3c927 --- /dev/null +++ b/pkgs/development/python-modules/protoletariat/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + astunparse, + grpcio-tools, + click, + pkgs, + protobuf, + mypy-protobuf, + pytestCheckHook, + writableTmpDirAsHomeHook, +}: +buildPythonPackage rec { + pname = "protoletariat"; + version = "3.3.10"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cpcloud"; + repo = "protoletariat"; + tag = version; + hash = "sha256-oaZmgen/7WkX+nNuphrcyniL7Z/OaeqlcnbCnqR5h0w="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + astunparse + click + grpcio-tools + protobuf + ]; + + pythonRelaxDeps = [ + "protobuf" + ]; + + postPatch = '' + substituteInPlace protoletariat/__main__.py \ + --replace-fail 'default="protoc",' 'default="${lib.getExe' pkgs.protobuf "protoc"}",' + ''; + + pythonImportsCheck = [ "protoletariat" ]; + + nativeCheckInputs = [ + pytestCheckHook + writableTmpDirAsHomeHook + mypy-protobuf + ]; + + meta = { + description = "Python protocol buffers for the rest of us"; + changelog = "https://github.com/cpcloud/protoletariat/blob/${version}/CHANGELOG.md"; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 355a7214a19d..e9d4818d3599 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12048,6 +12048,8 @@ self: super: with self; { inherit (pkgs.__splicedPackages) protobuf; }; + protoletariat = callPackage ../development/python-modules/protoletariat { }; + proton-client = callPackage ../development/python-modules/proton-client { }; proton-core = callPackage ../development/python-modules/proton-core { }; From bb5529ddfd1a0b30559605a6e20cb9c94cd3f6bc Mon Sep 17 00:00:00 2001 From: qzylinra Date: Mon, 11 Aug 2025 09:36:18 +0800 Subject: [PATCH 28/74] navicat-premium: 17.2.3 -> 17.3.0 --- pkgs/by-name/na/navicat-premium/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/na/navicat-premium/package.nix b/pkgs/by-name/na/navicat-premium/package.nix index 74eba0859009..9aadbe305897 100644 --- a/pkgs/by-name/na/navicat-premium/package.nix +++ b/pkgs/by-name/na/navicat-premium/package.nix @@ -6,17 +6,17 @@ }: let pname = "navicat-premium"; - version = "17.2.3"; + version = "17.3.0"; src = { x86_64-linux = fetchurl { - url = "https://web.archive.org/web/20250516003452/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage"; - hash = "sha256-QGz+0D0rNkuzkLxLO/tFlif4X4Zuzpb+btkqKNOBi7c="; + url = "https://web.archive.org/web/20250725013746/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage"; + hash = "sha256-IXUVu7kbFsoWpd21cJb/5Ho03LiaZ2pJ9KlckJ1xcOQ="; }; aarch64-linux = fetchurl { - url = "https://web.archive.org/web/20250516004158/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage"; - hash = "sha256-hxaqK9dPm/0mL3+LoQFeVSe14AD+tfYSNvEC9JsUvRE="; + url = "https://web.archive.org/web/20250725014645/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage"; + hash = "sha256-3765am3eJRjTJ9TVo0LYis0tnFEd0anSd6CUl8bfIFU="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); From e0437c2e5d51dacd6f4229705d6465a05ba78d92 Mon Sep 17 00:00:00 2001 From: qzylinra Date: Mon, 11 Aug 2025 09:38:07 +0800 Subject: [PATCH 29/74] butterfly: 2.3.2 -> 2.3.3 --- pkgs/by-name/bu/butterfly/package.nix | 22 +- pkgs/by-name/bu/butterfly/pubspec.lock.json | 218 ++++++++++++-------- 2 files changed, 141 insertions(+), 99 deletions(-) diff --git a/pkgs/by-name/bu/butterfly/package.nix b/pkgs/by-name/bu/butterfly/package.nix index 3f86ab3c4975..47b684f3d4f2 100644 --- a/pkgs/by-name/bu/butterfly/package.nix +++ b/pkgs/by-name/bu/butterfly/package.nix @@ -1,24 +1,26 @@ { lib, - flutter329, + flutter332, fetchFromGitHub, runCommand, - butterfly, - yq, + yq-go, _experimental-update-script-combinators, gitUpdater, }: -flutter329.buildFlutterApplication rec { - pname = "butterfly"; - version = "2.3.2"; +let + version = "2.3.3"; src = fetchFromGitHub { owner = "LinwoodDev"; repo = "Butterfly"; tag = "v${version}"; - hash = "sha256-eAkepyZm4WgPo8ieBbWHoSSv/Zfr9U9HCsbxEyrzy0Y="; + hash = "sha256-3cDT1t74SrDUqUtFmNZFQHUx+eCdDjZhPseT3lhNOYE="; }; +in +flutter332.buildFlutterApplication { + pname = "butterfly"; + inherit version src; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -34,11 +36,11 @@ flutter329.buildFlutterApplication rec { pubspecSource = runCommand "pubspec.lock.json" { - buildInputs = [ yq ]; - inherit (butterfly) src; + inherit src; + nativeBuildInputs = [ yq-go ]; } '' - cat $src/app/pubspec.lock | yq > $out + yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out" ''; updateScript = _experimental-update-script-combinators.sequence [ (gitUpdater { diff --git a/pkgs/by-name/bu/butterfly/pubspec.lock.json b/pkgs/by-name/bu/butterfly/pubspec.lock.json index 1e8eb7233e3b..c997c6ec520e 100644 --- a/pkgs/by-name/bu/butterfly/pubspec.lock.json +++ b/pkgs/by-name/bu/butterfly/pubspec.lock.json @@ -4,21 +4,21 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f", + "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f", "url": "https://pub.dev" }, "source": "hosted", - "version": "82.0.0" + "version": "85.0.0" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0", + "sha256": "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.4.5" + "version": "7.7.1" }, "animations": { "dependency": "direct main", @@ -54,11 +54,11 @@ "dependency": "transitive", "description": { "name": "async", - "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.12.0" + "version": "2.13.0" }, "barcode": { "dependency": "direct main", @@ -114,11 +114,11 @@ "dependency": "transitive", "description": { "name": "build", - "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0", + "sha256": "7d95cbbb1526ab5ae977df9b4cc660963b9b27f6d1075c0b34653868911385e4", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "3.0.0" }, "build_config": { "dependency": "transitive", @@ -144,31 +144,31 @@ "dependency": "transitive", "description": { "name": "build_resolvers", - "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", + "sha256": "38c9c339333a09b090a638849a4c56e70a404c6bdd3b511493addfbc113b60c2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.4" + "version": "3.0.0" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", + "sha256": "b971d4a1c789eba7be3e6fe6ce5e5b50fd3719e3cb485b3fad6d04358304351d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.15" + "version": "2.6.0" }, "build_runner_core": { "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021", + "sha256": "c04e612ca801cd0928ccdb891c263a2b1391cb27940a5ea5afcf9ba894de5d62", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.0" + "version": "9.2.0" }, "built_collection": { "dependency": "transitive", @@ -184,11 +184,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", + "sha256": "0b1b12a0a549605e5f04476031cd0bc91ead1d7c8e830773a18ee54179b3cb62", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.5" + "version": "8.11.0" }, "butterfly_api": { "dependency": "direct main", @@ -197,37 +197,37 @@ "relative": true }, "source": "path", - "version": "2.3.2" + "version": "2.3.3" }, "camera": { "dependency": "direct main", "description": { "name": "camera", - "sha256": "413d2b34fe28496c35c69ede5b232fb9dd5ca2c3a4cb606b14efc1c7546cc8cb", + "sha256": "d6ec2cbdbe2fa8f5e0d07d8c06368fe4effa985a4a5ddade9cc58a8cd849557d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.11.1" + "version": "0.11.2" }, "camera_android_camerax": { "dependency": "transitive", "description": { "name": "camera_android_camerax", - "sha256": "9fb44e73e0fea3647a904dc26d38db24055e5b74fc68fd2b6d3abfa1bd20f536", + "sha256": "58b8fe843a3c83fd1273c00cb35f5a8ae507f6cc9b2029bcf7e2abba499e28d8", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.17" + "version": "0.6.19+1" }, "camera_avfoundation": { "dependency": "transitive", "description": { "name": "camera_avfoundation", - "sha256": "ca36181194f429eef3b09de3c96280f2400693f9735025f90d1f4a27465fdd72", + "sha256": "04e1f052ef268085a4f0550389211cc46005a9af015e444c7b1ee7aa19332e5d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.19" + "version": "0.9.20+6" }, "camera_platform_interface": { "dependency": "transitive", @@ -273,11 +273,21 @@ "dependency": "transitive", "description": { "name": "checked_yaml", - "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.3" + "version": "2.0.4" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" }, "clock": { "dependency": "transitive", @@ -329,6 +339,16 @@ "source": "hosted", "version": "2.0.1" }, + "console": { + "dependency": "transitive", + "description": { + "name": "console", + "sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, "convert": { "dependency": "transitive", "description": { @@ -404,11 +424,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "5b236382b47ee411741447c1f1e111459c941ea1b3f2b540dde54c210a3662af", + "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.1.1" }, "dbus": { "dependency": "transitive", @@ -424,21 +444,21 @@ "dependency": "transitive", "description": { "name": "device_info_plus", - "sha256": "0c6396126421b590089447154c5f98a5de423b70cfb15b1578fd018843ee6f53", + "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.4.0" + "version": "11.5.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "device_info_plus_platform_interface", - "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2", + "sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.2" + "version": "7.0.3" }, "dynamic_color": { "dependency": "direct main", @@ -464,11 +484,11 @@ "dependency": "transitive", "description": { "name": "fake_async", - "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", + "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.2" + "version": "1.3.3" }, "ffi": { "dependency": "transitive", @@ -534,11 +554,11 @@ "dependency": "transitive", "description": { "name": "file_selector_macos", - "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc", + "sha256": "8c9250b2bd2d8d4268e39c82543bacbaca0fda7d29e0728c3c4bbb7c820fd711", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.4+2" + "version": "0.9.4+3" }, "file_selector_platform_interface": { "dependency": "transitive", @@ -626,11 +646,11 @@ "dependency": "direct dev", "description": { "name": "flutter_lints", - "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1", + "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.0" + "version": "6.0.0" }, "flutter_localizations": { "dependency": "direct main", @@ -722,11 +742,11 @@ "dependency": "direct main", "description": { "name": "flutter_svg", - "sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1", + "sha256": "cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.2.0" }, "flutter_test": { "dependency": "direct dev", @@ -744,21 +764,21 @@ "dependency": "direct dev", "description": { "name": "freezed", - "sha256": "6022db4c7bfa626841b2a10f34dd1e1b68e8f8f9650db6112dcdeeca45ca793c", + "sha256": "da32f8ba8cfcd4ec71d9decc8cbf28bd2c31b5283d9887eb51eb4a0659d8110c", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.6" + "version": "3.2.0" }, "freezed_annotation": { "dependency": "transitive", "description": { "name": "freezed_annotation", - "sha256": "c87ff004c8aa6af2d531668b46a4ea379f7191dc6dfa066acd53d506da6e044b", + "sha256": "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "3.1.0" }, "frontend_server_client": { "dependency": "transitive", @@ -776,6 +796,16 @@ "source": "sdk", "version": "0.0.0" }, + "get_it": { + "dependency": "transitive", + "description": { + "name": "get_it", + "sha256": "e87cd1d108e472a0580348a543a0c49ed3d70c8a5c809c6d418583e595d0a389", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.0" + }, "glob": { "dependency": "transitive", "description": { @@ -790,11 +820,11 @@ "dependency": "direct main", "description": { "name": "go_router", - "sha256": "0b1e06223bee260dee31a171fb1153e306907563a0b0225e8c1733211911429a", + "sha256": "c489908a54ce2131f1d1b7cc631af9c1a06fac5ca7c449e959192089f9489431", "url": "https://pub.dev" }, "source": "hosted", - "version": "15.1.2" + "version": "16.0.0" }, "graphs": { "dependency": "transitive", @@ -840,11 +870,11 @@ "dependency": "direct main", "description": { "name": "idb_shim", - "sha256": "d3dae2085f2dcc9d05b851331fddb66d57d3447ff800de9676b396795436e135", + "sha256": "ee391deb010143823d25db15f8b002945e19dcb5f2dd5b696a98cb6db7644012", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.5+1" + "version": "2.6.7" }, "image": { "dependency": "direct main", @@ -866,11 +896,11 @@ "dependency": "direct main", "description": { "name": "intl", - "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.19.0" + "version": "0.20.2" }, "io": { "dependency": "transitive", @@ -886,11 +916,11 @@ "dependency": "transitive", "description": { "name": "irondash_engine_context", - "sha256": "cd7b769db11a2b5243b037c8a9b1ecaef02e1ae27a2d909ffa78c1dad747bb10", + "sha256": "2bb0bc13dfda9f5aaef8dde06ecc5feb1379f5bb387d59716d799554f3f305d7", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.4" + "version": "0.5.5" }, "irondash_message_channel": { "dependency": "transitive", @@ -926,21 +956,21 @@ "dependency": "direct dev", "description": { "name": "json_serializable", - "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c", + "sha256": "ce2cf974ccdee13be2a510832d7fba0b94b364e0b0395dee42abaa51b855be27", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.9.5" + "version": "6.10.0" }, "leak_tracker": { "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", + "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.8" + "version": "10.0.9" }, "leak_tracker_flutter_testing": { "dependency": "transitive", @@ -966,11 +996,11 @@ "dependency": "transitive", "description": { "name": "lints", - "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7", + "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.1.1" + "version": "6.0.0" }, "logging": { "dependency": "transitive", @@ -1076,6 +1106,16 @@ "source": "hosted", "version": "2.0.0" }, + "msix": { + "dependency": "direct dev", + "description": { + "name": "msix", + "sha256": "bbb9b3ff4a9f8e7e7507b2a22dc0517fd1fe3db44e72de7ab052cb6b362406ee", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.16.10" + }, "nested": { "dependency": "transitive", "description": { @@ -1374,11 +1414,11 @@ "dependency": "transitive", "description": { "name": "posix", - "sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62", + "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.2" + "version": "6.0.3" }, "printing": { "dependency": "direct main", @@ -1525,11 +1565,11 @@ "dependency": "transitive", "description": { "name": "sembast", - "sha256": "d3f0d0ba501a5f1fd7d6c8532ee01385977c8a069c334635dae390d059ae3d6d", + "sha256": "7119cf6f79bd1d48c8ec7943f4facd96c15ab26823021ed0792a487c7cd34441", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.8.5" + "version": "3.8.5+1" }, "share_plus": { "dependency": "direct main", @@ -1651,21 +1691,21 @@ "dependency": "transitive", "description": { "name": "source_gen", - "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b", + "sha256": "fc787b1f89ceac9580c3616f899c9a447413cbdac1df071302127764c023a134", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "3.0.0" }, "source_helper": { "dependency": "transitive", "description": { "name": "source_helper", - "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c", + "sha256": "4f81479fe5194a622cdd1713fe1ecb683a6e6c85cd8cec8e2e35ee5ab3fdf2a1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.5" + "version": "1.3.6" }, "source_span": { "dependency": "transitive", @@ -1731,21 +1771,21 @@ "dependency": "direct main", "description": { "name": "super_clipboard", - "sha256": "5203c881d24033c3e6154c2ae01afd94e7f0a3201280373f28e540f1defa3f40", + "sha256": "e73f3bb7e66cc9260efa1dc507f979138e7e106c3521e2dda2d0311f6d728a16", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.0-dev.6" + "version": "0.9.1" }, "super_native_extensions": { "dependency": "transitive", "description": { "name": "super_native_extensions", - "sha256": "09ccc40c475e6f91770eaeb2553bf4803812d7beadc3759aa57d643370619c86", + "sha256": "b9611dcb68f1047d6f3ef11af25e4e68a21b1a705bbcc3eb8cb4e9f5c3148569", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.0-dev.6" + "version": "0.9.1" }, "swamp_api": { "dependency": "direct main", @@ -1772,11 +1812,11 @@ "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6", + "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.1" + "version": "3.4.0" }, "term_glyph": { "dependency": "transitive", @@ -1832,11 +1872,11 @@ "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", + "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.1" + "version": "6.3.2" }, "url_launcher_android": { "dependency": "transitive", @@ -1922,11 +1962,11 @@ "dependency": "transitive", "description": { "name": "vector_graphics", - "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de", + "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.18" + "version": "1.1.19" }, "vector_graphics_codec": { "dependency": "transitive", @@ -1942,11 +1982,11 @@ "dependency": "transitive", "description": { "name": "vector_graphics_compiler", - "sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad", + "sha256": "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.16" + "version": "1.1.17" }, "vector_math": { "dependency": "transitive", @@ -1962,21 +2002,21 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", + "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.3.1" + "version": "15.0.0" }, "watcher": { "dependency": "transitive", "description": { "name": "watcher", - "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", + "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.1.2" }, "web": { "dependency": "direct main", @@ -2012,21 +2052,21 @@ "dependency": "transitive", "description": { "name": "webdriver", - "sha256": "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8", + "sha256": "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.4" + "version": "3.1.0" }, "win32": { "dependency": "transitive", "description": { "name": "win32", - "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba", + "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.13.0" + "version": "5.14.0" }, "win32_registry": { "dependency": "transitive", @@ -2042,11 +2082,11 @@ "dependency": "direct main", "description": { "name": "window_manager", - "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059", + "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.3" + "version": "0.5.1" }, "xdg_directories": { "dependency": "transitive", @@ -2080,7 +2120,7 @@ } }, "sdks": { - "dart": ">=3.7.0 <4.0.0", - "flutter": ">=3.29.3" + "dart": ">=3.8.0 <4.0.0", + "flutter": ">=3.32.8" } } From 2cd4d2cfdc4bc594a6253a403ec837134332aee4 Mon Sep 17 00:00:00 2001 From: qzylinra Date: Mon, 11 Aug 2025 10:06:03 +0800 Subject: [PATCH 30/74] cherry-studio: 1.5.3 -> 1.5.5 --- .../ch/cherry-studio/missing-hashes.json | 57 ++++++++----------- pkgs/by-name/ch/cherry-studio/package.nix | 10 ++-- 2 files changed, 30 insertions(+), 37 deletions(-) diff --git a/pkgs/by-name/ch/cherry-studio/missing-hashes.json b/pkgs/by-name/ch/cherry-studio/missing-hashes.json index f01f67d065d3..c52c802e86dd 100644 --- a/pkgs/by-name/ch/cherry-studio/missing-hashes.json +++ b/pkgs/by-name/ch/cherry-studio/missing-hashes.json @@ -1,5 +1,4 @@ { - "@cherrystudio/mac-system-ocr@npm:0.2.2": "39373e837b35b18d181ab9be112bdbd717d99138f6e907e201814316f28eb93db208f9c69e2b73b344c436dd600d1193cfd6d6e7c9bd7b4f2c70b954d88ce450", "@esbuild/aix-ppc64@npm:0.25.8": "37fc14b17214c1f6bf41175029b62a43664a6a5a5b802614fe1d837bbf7abf5eaf2f6b735b6a446ebcfabb632e038c8ad9cccd87a259c45a1846689f8527874a", "@esbuild/android-arm64@npm:0.25.8": "e367e989238292ccee72013511dde1aef2d2160d8d5d669a12272f693cf9a0970fac9d7835178b3c46ed6936a0c4b29d21d58ed11851a3697bf98b4320be4b74", "@esbuild/android-arm@npm:0.25.8": "cbfa2c802d8931e5f4d06582f20573cb34774ab713b4712c37eb15bfab6f90b693878b661de2a3bb9c81eecf45b37e0ddf2e9c79ef4ff932bbc37da588c40183", @@ -32,16 +31,6 @@ "@libsql/linux-arm64-musl@npm:0.4.7": "13eef982caf2b73cebabde76b8e209ddea27d2ff0e6228a56704a50ad41975ff03a15d90bec6ccc908cb16355d685903719676f7a91c92d20a68eecff4a4f0b6", "@libsql/linux-x64-gnu@npm:0.4.7": "524bf04f98f7a91e343b294262a627a965f626082b63b998c8019d105380caa2435e240f6085103751f87919ac2415aba97075696822915bf1a4e4492d9376f5", "@libsql/linux-x64-musl@npm:0.4.7": "227cddb499cbbf677c1dfaeeb8bd787d4c6d4cbf50c94ac1632348f26b412d2f8bacdb0131050c507d1961f96f8bbff2d8b7949f26f1dcebb61e115da9253aa0", - "@napi-rs/canvas-android-arm64@npm:0.1.71": "843eef4fc7826e5310e3778202e03491e9366d914bd236eb65b1bde23f236cb68d2270e0ceb024327a563861bdf4418a0ae11990fb0417f1cb7264ecfed96319", - "@napi-rs/canvas-darwin-arm64@npm:0.1.71": "2e2c916130cd46016ccf20c25821c1f9f7c43afedfaf5fef9c75c88f7d1a377725338373724a436d45c0cde1e08fbd8a0dc4c3b9d477a7c9689f0766e9252d0d", - "@napi-rs/canvas-darwin-x64@npm:0.1.71": "f330806ddfd007555112afda39f46904f06cbd14a2dcfb44b6fc7af549970b4ded91846aeb492980899ac9e40df36e776f3e9ea19884b096a7cc50b91583bfff", - "@napi-rs/canvas-linux-arm-gnueabihf@npm:0.1.71": "801c8b860f212b2229a5edb0e5154dccc857fca0fd0c384090b3418e54525076a1624dbf98474cc2e513ea3da400f348086420b79769f5e6158ac5f5982d23b9", - "@napi-rs/canvas-linux-arm64-gnu@npm:0.1.71": "5d6496d23eb54f0a0805a8bd07bd06e6d84e65c0fe633cdda79f4e671b9aefdfcc7a803c89dfb28ecd4489fd6dae903c5f21e1a7bf3816b05d4e2dadb8172a13", - "@napi-rs/canvas-linux-arm64-musl@npm:0.1.71": "0505fca8e0d3cf885d35a56ecef5fa1472b4d9e501472f61740a15d5d7cc55726b844d22e0113f261b49acf4892daea85b79acad426f9ef99bf6bb6c04eebb6c", - "@napi-rs/canvas-linux-riscv64-gnu@npm:0.1.71": "b135332ad77268b927eedfefdc1c0477938ef1fec91414033fe35dde2bfc72bedf18978ce35f85112b8d664b54ca9b77382f62492f5898b612bbca8ced27463d", - "@napi-rs/canvas-linux-x64-gnu@npm:0.1.71": "95dd0fd4d307f2e8444ca927e51ec7b83f9c2fb1ea73e8e1157d28774144b04416ded1b625b0e25021e0f9040cb2f803dc2c74617121d20df8d63e387b86014b", - "@napi-rs/canvas-linux-x64-musl@npm:0.1.71": "1c4d7ceb0753f3acfb4fc760a5ca5b8ccb736406604ff0989cd1968b3d28f600a4b7dad9fc996b8cf2a61beba6234dedc8727abfbd6c1feeb2238caff41969e4", - "@napi-rs/canvas-win32-x64-msvc@npm:0.1.71": "f375cb2f2008507727736efb0f5e62b7e7ded2f4975f7cd81f1b97ef8e149804ed429be6743776f1f507fb3b00b1a28cfa6a3b9312aacaea3734c8fc93ea6db3", "@parcel/watcher-android-arm64@npm:2.5.1": "f99d569e4f6cf78a1b0097fb9d4682cb201a74370ae440c531da4e1d5021e46141bfcdf8ef708b51a5b9cb1c30f78eea933ce75216d5eeb7b969a2ad27c68e4a", "@parcel/watcher-darwin-arm64@npm:2.5.1": "973c7ef3c94608da9cd1b20b18b9a7de2fb46fe44553731fe372b640de524491976150d0845f3d5953b74ed8ea469cb8d18a48651d0e5fb82f549a6b46b54f79", "@parcel/watcher-darwin-x64@npm:2.5.1": "848c5516aed9c36e14751200dbbf57e83c0bd46cdab0932df33db120e66b9596de18eeb98980e319efde84014f67d9e7924d7555383d8ffcefe35c501166b84b", @@ -55,26 +44,20 @@ "@parcel/watcher-win32-arm64@npm:2.5.1": "e015314d6b9b727cbe25eedf963ca8b23bf6d4e78d3c28008bd0d2657940ad54a271330486df3a93a5f1a30f2b8d052d14415b85cc7e7b747c6c73b5dc055628", "@parcel/watcher-win32-ia32@npm:2.5.1": "920b6ad6a2095aeb9c2d329c5118472a3c14669fa93eaa99aa8050c76c5c2d3d76d92677167ed748c2ac5487c568d5df16d5d94f4bc7c354094fccd8e0d6350c", "@parcel/watcher-win32-x64@npm:2.5.1": "8f1c8e41ec9f86e4dcd0d4db0a077742d5dcc853f15ea888387183e34e2efcff09fd1cc9ec46fc1121b9ad4ddc0e221283f2ffb23cfd7dbcbb8b03060b461963", - "@rollup/rollup-android-arm-eabi@npm:4.40.0": "723053f558eaeeb0a1fbf3b3063b930d3b1267a6aba211719927b0467f48513a514a05391689298a64624e98daa005e4685ef668787ebc228fd0527a5f17b419", - "@rollup/rollup-android-arm64@npm:4.40.0": "2562821c7032d2d95b891f47f02291d714d072fd91b3dbd07c528a7543f5e7d2458903cc38829feec311f1ebca6e34624262ae2e10aa32a0532b83c564db94cc", - "@rollup/rollup-darwin-arm64@npm:4.40.0": "cde6c2f4fe819131f65f5d19f8d1fd4889a4b8cc130cb30582fde72c79e388ef4644f57c7b03f453d4048043524ca067d5e2b4b505a5568840c73021fb74b572", - "@rollup/rollup-darwin-x64@npm:4.40.0": "28c269104ff10f0ab87a30c93139662780b0b6b4877a95cede7d66e833d478d1eb2f5aa275f60decb8383b2c05161f315902ad8fa1a52fa76283a05ceb32bf6b", - "@rollup/rollup-freebsd-arm64@npm:4.40.0": "27e99df8d1c5f0dfaead8fa6ce3025c5f959b4803e7683d95183761b1ecada4d877bd7f36465c424657ef650eac6199ddcf4911eda6367555633819454a5548d", - "@rollup/rollup-freebsd-x64@npm:4.40.0": "3422ce75f0fe774925763b1b63dded9aee56038d167af0b7f8ca0e468a8fae86d6a8aecd0b86a79718b8fc78c5ad987ba5b98be17b95fdcd48e4307749376e1b", - "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.0": "b32cd2a73db75926722dfd42a6c5c6f2f1631f70a8d261317a0ce54e2c5dcee849c0a59cd85de0c0c7bbea9defb4f6649b1354871e6ac7f637cc22673d1486c1", - "@rollup/rollup-linux-arm-musleabihf@npm:4.40.0": "1c1d95fe81ee31d0d9cd75258865d35d2afccd8255b856c0da9a3c8afa012feb6b9557d1c234af8f4cc5dfd9d397564c650fe2e8769cb4407f626058c2e19d9c", - "@rollup/rollup-linux-arm64-gnu@npm:4.40.0": "a8d071163d135e992023a374660a72cc94af4d77a711e7720d4e3fc544a7af037add4839ef8d061503e5320ee80defd35b43a68cebad0105d16cfd870387934c", - "@rollup/rollup-linux-arm64-musl@npm:4.40.0": "5582761d9426caccee50beb1fdb06ebb16fba540eabde06e21d18f59667f7c6c99ca0c2743d1b9cdb54a3d0b28445befad52c76412632bf0d79f280022acc630", - "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.0": "6d65384886c655b4a9190a2c8e3cd99d7049d13864be0f9b06c32a23ba1242bd09be0e9cba9425898a48b41bba52eb98223e34e3943924370a68f7c7800f66b2", - "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.0": "ebe38407efd0e45e92f939fe725e64695096c4389747b81f241e8a5d655526615e81512f3d61deae6aaf60669328a9bc93ac352351d6ccf8f1746caeb44bd7ab", - "@rollup/rollup-linux-riscv64-gnu@npm:4.40.0": "32cc2e2d03eadca60f42ba14af9723584c1ef7ee29f8a79578aacd9ce17e287d1f841aa926278d4b7cbf0f6d054c4ec045873a24c67279ca37f20e999f24bd4e", - "@rollup/rollup-linux-riscv64-musl@npm:4.40.0": "507c785bde98633f0139baccce0635047d43b19fb1d1fc770d4d88b11ef62b7885b0dac51a42c5f3e05bc0a56480928ae6304898884f0b5b0e56ad0cc98920f6", - "@rollup/rollup-linux-s390x-gnu@npm:4.40.0": "e464366194da4d1a72fc5ecce6c59027004b878fc36114f2d7c25812da5fe1885c29eb14d7bb318a4bb3242a99e772f7713da22f7f2d93f4b6e6a3e012f3d1f4", - "@rollup/rollup-linux-x64-gnu@npm:4.40.0": "b472cd5acd066a60bd970865be1b229ca4c31a658a5c0277b6f441396243a20c535502a0ea7ea0dca6d12e2ccf53324b7e94c0d32a4f81f0b9866fd6cc3aff5a", - "@rollup/rollup-linux-x64-musl@npm:4.40.0": "f553ef17a801559ca9418eb57dd9621884bde4d0d9f01292d9bb84de271efbf4ba737ddaf78a710edd6138528f3d8e2b3d6ba1a969c9e34624ad4266bfba39db", - "@rollup/rollup-win32-arm64-msvc@npm:4.40.0": "f14da0ce3062084d81fd42432ddf6c3cd869b4c48dc1acd803bc151bc3b508dbd290d60624ab5507d691b9e53bec81a508b61688304f171088549067ec86445d", - "@rollup/rollup-win32-ia32-msvc@npm:4.40.0": "e6849d8cb8c276681f558b8212d58340488814e697486d9d125c1191479a4819387f681945f59c2b9fdd40020403cb72a099906960625da65d2114cf3df701e5", - "@rollup/rollup-win32-x64-msvc@npm:4.40.0": "347f3af8176858afaec0f4f0d7951d4cda81f77c30e8260c678a11809bcdee0542762f27f6a4194562c2a8a6321a774ea523216ed8cf105e041eff7498443f28", + "@rolldown/binding-android-arm64@npm:1.0.0-beta.29": "60ff5920b683896ed304fd527460a0513106456b0e83c4414505970c86367d048c9a447ff0e518321f111be7e86ab81f8238ac751b1993c6a3e4b333705f3cba", + "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.29": "c6961c23612697643ba0b4267a8c5ca6f7b02683b6354491f6be7deb4b6840cdc482d62ec3169317ee6d19a7333632151622f5098b8c1f44546d953990bd5b0d", + "@rolldown/binding-darwin-x64@npm:1.0.0-beta.29": "8b96e418ea28bbe320333b8815f779d6d9f00b438044bb7608945460e428bc5bd89ce372c399665eee6b42e266843652ffe4d43f5feb51035a56875e051dcb5c", + "@rolldown/binding-freebsd-x64@npm:1.0.0-beta.29": "a6100a5e7d54968685133dd276c31c96d62789bc5ff213e70e3457d401b267f8524f71aade404f0c51d432046783d6d8da80f46b71272c6e0020f5b303512815", + "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.29": "e99a4073fc2f8ef7a878ab124f5370d37102d549d250a7287864cafc70886bd8ee34b535960660d4a8056aa3547740a68b56eaeaa2d8eb0acd4ad7795c75d9f8", + "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.29": "bfdcec47cc34ee1e9c71944b5f5486ca970106555f3b23eed4a7b359d45c1e5efe5828d3e518908e0913ff7b5f2a7815d966c528830173aac628ba12367f6c0f", + "@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.29": "a9d9bbff330df732da670c6ceb8310619febf777861a516b190223f1aa45ec2434bc920d6be012052430780aa7eed5af017e6e52b8b5b16e8c57964dec6b5c15", + "@rolldown/binding-linux-arm64-ohos@npm:1.0.0-beta.29": "693bbd389b476d0a59a482974120b2565ede119a6d00b8f626a6d7a32e3b2b8c41473670ca5ed6c44dbe92ff9bd73a4b95503246158295fe8ac440c20272811d", + "@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.29": "aff1e841dce325fdc9dbc1d31e469caea2136c123ffd7996e2045861cf9d2147027eaa95df40ed03d5463bf9ab7b6e25bab09496a4a22a90f024574f465bce0e", + "@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.29": "9e9ff51e53293f6edf933948de3f1ec29b3d69d38611e6db6be7abe8b385286710e36b4576d6b62875b5b88c9d0500ed8b51c12dbea9c615673bdd62cf954d89", + "@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.29": "c8d8547804e1e73dabfd904e451836afd08371b9a3ca683968f9d63c5b63eadb7bc7ed976cf85569c8e5a0e8ad4152038738e83ff5f2e3aff5be04bb55645496", + "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.29": "73e1dd24300d846f5747d18a7fd6c2538153eed05a82b79bd97f2f0c3a3d581f2b511f5a1adb6a6f1f661731eccb2841ec628b079db661c0d1a85fa91f5c4271", + "@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.29": "d8f18bf33a729a2213c7c874c3efe39cdc73701e2fcc5d430f8430b87dcac6c4bdd6b2357c029fa9cc254a61a74066d5707d45eff190114807495ce102c2ffdb", + "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.29": "fb8a44f8969b5d1040767ebc487a51ab74d0ac1f6e4ae771ac053de652575c7687fe5c21e640001fea2c1bd9a55bc48c90adbb21b850078ad7f9db4e0d7b7bae", "@swc/core-darwin-arm64@npm:1.11.21": "6f228ce5497f8b797d9b838af6d51c8fc27d1643d13b033ed762ab5247047da91efa3e61f38040b5ff326bfb6af0ed663f5ec8319574db1c0e355d64c9c2b665", "@swc/core-darwin-x64@npm:1.11.21": "8f7fcf910f17ab6d30fe55d7498f0ff2ac47e1e0fad749e01151891d5257f49c6354dae31917cc5097230940f9a068fcd981441e7c9581b1373e9e9c4d1ff9aa", "@swc/core-linux-arm-gnueabihf@npm:1.11.21": "5f0d964b13b3c138fe0b3249b852db4330707d4584ed5d5b0b71fb72023e3b35f3faa88c6b8f49970f7adee57976e7e1fc9115be194b91f435249b6531602e1c", @@ -86,5 +69,15 @@ "@swc/core-win32-ia32-msvc@npm:1.11.21": "ad1ba754c36131238f2ac8ec51ffc4b987888b45b3008c0fbdd31d85d6fc039f8dd9c5d188c24cb72c4f4f345090a4dcfbcbfd840e954b7aeeb2974e0baf0e4a", "@swc/core-win32-x64-msvc@npm:1.11.21": "0fb0c108c2e4a3bd82251f7552c9daa8c243829617bee7d954d1b0e021214184ead5c08dd108b3a5ac2d501797db794246a25867970ef2082f844f47b5b25070", "dmg-license@npm:1.0.11": "feef35cfb45270a72daadcca9584be5cb840f924448b9d4e543fcd61f1b6d471151049f277c91de1d8b003fad6203d0176066a5f427a01df5fb073402cb8c8b7", - "iconv-corefoundation@npm:1.1.7": "bc6f08ac421e5e92ed20f3825f123fd705e036612b2b6aa687958de753c06f32e54f0203ef55540869e3ee189eaea15e43a2757f3a90e555c4dd512c9422da43" + "iconv-corefoundation@npm:1.1.7": "bc6f08ac421e5e92ed20f3825f123fd705e036612b2b6aa687958de753c06f32e54f0203ef55540869e3ee189eaea15e43a2757f3a90e555c4dd512c9422da43", + "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/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix index 5d088ec167bf..54106861680b 100644 --- a/pkgs/by-name/ch/cherry-studio/package.nix +++ b/pkgs/by-name/ch/cherry-studio/package.nix @@ -5,7 +5,7 @@ yarn-berry_4, nodejs, python3, - electron_35, + electron_37, makeWrapper, writableTmpDirAsHomeHook, makeDesktopItem, @@ -14,18 +14,18 @@ }: let - electron = electron_35; + electron = electron_37; yarn-berry = yarn-berry_4; in stdenv.mkDerivation (finalAttrs: { pname = "cherry-studio"; - version = "1.5.3"; + version = "1.5.5"; src = fetchFromGitHub { owner = "CherryHQ"; repo = "cherry-studio"; tag = "v${finalAttrs.version}"; - hash = "sha256-HaRu4jiop/PQ6Zr4FZ1yrY+hIwU9p9xAUZ08kH2gE6c="; + hash = "sha256-/ndmQYQrnYDbVmUnLo18vhrf6Ba91q+hnHfijra0NAk="; }; postPatch = '' @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-OG/6GnemS3ePk4t2Y099tfi9Hw+jbMqabBCsax1Yq68="; + hash = "sha256-O9S57VryApHDqBi/uD4gukZtZmzsZOfBG+WROnoFiH8="; }; nativeBuildInputs = [ From 274d8eacda651e15adac742b7e5322b134d68d93 Mon Sep 17 00:00:00 2001 From: qzylinra Date: Mon, 11 Aug 2025 12:10:29 +0800 Subject: [PATCH 31/74] server-box: 1.0.1189 -> 1.0.1201 --- pkgs/by-name/se/server-box/gitHashes.json | 10 +++ pkgs/by-name/se/server-box/package.nix | 35 ++++---- pkgs/by-name/se/server-box/pubspec.lock.json | 82 ++++++++++++++++--- .../by-name/se/server-box/update-gitHashes.py | 51 ++++++++++++ 4 files changed, 148 insertions(+), 30 deletions(-) create mode 100644 pkgs/by-name/se/server-box/gitHashes.json create mode 100755 pkgs/by-name/se/server-box/update-gitHashes.py diff --git a/pkgs/by-name/se/server-box/gitHashes.json b/pkgs/by-name/se/server-box/gitHashes.json new file mode 100644 index 000000000000..576007e56a39 --- /dev/null +++ b/pkgs/by-name/se/server-box/gitHashes.json @@ -0,0 +1,10 @@ +{ + "circle_chart": "sha256-BcnL/hRf+Yv2U8Nkl7pc8BtncBW+M2by86jO5IbFIRk=", + "computer": "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8=", + "dartssh2": "sha256-XlbruyraMmZGNRppQdBLS89Qyd7mm5Noiap2BhZjEPw=", + "fl_build": "sha256-hCojuXFuN33/prCyuPcMoehWiGfaR2yOJA2V6dOuz4E=", + "fl_lib": "sha256-7nwj5eE3nCezjrv5N2cz/9r+CqMKTOIuhaeH4AGVchY=", + "plain_notification_token": "sha256-Cy1/S8bAtKCBnjfDEeW4Q2nP4jtwyCstAC1GH1efu8I=", + "watch_connectivity": "sha256-9TyuElr0PNoiUvbSTOakdw1/QwWp6J2GAwzVHsgYWtM=", + "xterm": "sha256-yMETVh1qEdQAIYaQWbL5958N5dGpczJ/Y8Zvl1WjRnw=" +} diff --git a/pkgs/by-name/se/server-box/package.nix b/pkgs/by-name/se/server-box/package.nix index c7b0bb324a38..3837cdc5c0c4 100644 --- a/pkgs/by-name/se/server-box/package.nix +++ b/pkgs/by-name/se/server-box/package.nix @@ -6,35 +6,28 @@ copyDesktopItems, makeDesktopItem, runCommand, - yq, - server-box, + yq-go, _experimental-update-script-combinators, gitUpdater, }: -flutter332.buildFlutterApplication rec { - pname = "server-box"; - version = "1.0.1189"; +let + version = "1.0.1201"; src = fetchFromGitHub { owner = "lollipopkit"; repo = "flutter_server_box"; tag = "v${version}"; - hash = "sha256-gz+4uJe0JHi8oYNz/oLylkYUmHQA8wnxp/4TadYNMfo="; + hash = "sha256-ScPpEL2YxWw1aKEyzhoa0b931WF4hrdren4aSAlMpoU="; }; +in +flutter332.buildFlutterApplication { + pname = "server-box"; + inherit version src; pubspecLock = lib.importJSON ./pubspec.lock.json; - gitHashes = { - circle_chart = "sha256-BcnL/hRf+Yv2U8Nkl7pc8BtncBW+M2by86jO5IbFIRk="; - computer = "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8="; - dartssh2 = "sha256-XlbruyraMmZGNRppQdBLS89Qyd7mm5Noiap2BhZjEPw="; - fl_build = "sha256-hCojuXFuN33/prCyuPcMoehWiGfaR2yOJA2V6dOuz4E="; - fl_lib = "sha256-cauq5kbcCE52Jp3K/xBdHEmdfuF8aQsujNTjbE93Pww="; - plain_notification_token = "sha256-Cy1/S8bAtKCBnjfDEeW4Q2nP4jtwyCstAC1GH1efu8I="; - watch_connectivity = "sha256-9TyuElr0PNoiUvbSTOakdw1/QwWp6J2GAwzVHsgYWtM="; - xterm = "sha256-yMETVh1qEdQAIYaQWbL5958N5dGpczJ/Y8Zvl1WjRnw="; - }; + gitHashes = lib.importJSON ./gitHashes.json; nativeBuildInputs = [ copyDesktopItems @@ -66,15 +59,19 @@ flutter332.buildFlutterApplication rec { pubspecSource = runCommand "pubspec.lock.json" { - nativeBuildInputs = [ yq ]; - inherit (server-box) src; + inherit src; + nativeBuildInputs = [ yq-go ]; } '' - cat $src/pubspec.lock | yq > $out + yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out" ''; updateScript = _experimental-update-script-combinators.sequence [ (gitUpdater { rev-prefix = "v"; }) (_experimental-update-script-combinators.copyAttrOutputToFile "server-box.pubspecSource" ./pubspec.lock.json) + { + command = [ ./update-gitHashes.py ]; + supportedFeatures = [ "silent" ]; + } ]; }; diff --git a/pkgs/by-name/se/server-box/pubspec.lock.json b/pkgs/by-name/se/server-box/pubspec.lock.json index efdf39f7e22a..af41ecce261e 100644 --- a/pkgs/by-name/se/server-box/pubspec.lock.json +++ b/pkgs/by-name/se/server-box/pubspec.lock.json @@ -403,7 +403,7 @@ "version": "0.3.4+2" }, "crypto": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "crypto", "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", @@ -618,8 +618,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "v1.0.321", - "resolved-ref": "e0b3338be10fa71c96d017d873f5e10bb4374709", + "ref": "v1.0.327", + "resolved-ref": "5075a679b814b10742f967066858ba4df92ea4ae", "url": "https://github.com/lppcg/fl_lib" }, "source": "git", @@ -727,6 +727,66 @@ "source": "hosted", "version": "2.6.1" }, + "flutter_secure_storage": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage", + "sha256": "9cad52d75ebc511adfae3d447d5d13da15a55a92c9410e50f67335b6d21d16ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.2.4" + }, + "flutter_secure_storage_linux": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_linux", + "sha256": "be76c1d24a97d0b98f8b54bce6b481a380a6590df992d0098f868ad54dc8f688", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.3" + }, + "flutter_secure_storage_macos": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_macos", + "sha256": "6c0a2795a2d1de26ae202a0d78527d163f4acbb11cde4c75c670f3a0fc064247", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "flutter_secure_storage_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_platform_interface", + "sha256": "cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "flutter_secure_storage_web": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_web", + "sha256": "f4ebff989b4f07b2656fb16b47852c0aab9fed9b4ec1c70103368337bc1886a9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "flutter_secure_storage_windows": { + "dependency": "transitive", + "description": { + "name": "flutter_secure_storage_windows", + "sha256": "b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, "flutter_svg": { "dependency": "transitive", "description": { @@ -983,11 +1043,11 @@ "dependency": "transitive", "description": { "name": "js", - "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", + "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.2" + "version": "0.6.7" }, "json_annotation": { "dependency": "direct main", @@ -1444,21 +1504,21 @@ "dependency": "transitive", "description": { "name": "qr_code_dart_decoder", - "sha256": "6da7eda27726d504bed3c30eabf78ddca3eb9265e1c8dc49b30ef5974b9c267f", + "sha256": "4044f13a071da6102f7e9bc44a6b1ce577604d7846bcbeb1be412a137b825017", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.0.5" + "version": "0.1.2" }, "qr_code_dart_scan": { "dependency": "transitive", "description": { "name": "qr_code_dart_scan", - "sha256": "6e1aab64b8f5f768416b471dbc3fb0fc94969c3e236157a96b52a70f9fe12ebb", + "sha256": "8c9a63dac44ea51c82e72c0fed28b850d22be26348c582f77486f128cf1c2760", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.10.1" + "version": "0.11.1" }, "quiver": { "dependency": "transitive", @@ -2252,11 +2312,11 @@ "dependency": "transitive", "description": { "name": "zxing_lib", - "sha256": "d5d81917be2e18b06a2cf4ca12927f3ab957dfbd25bd7b8175b3e9a0ce5c2e2b", + "sha256": "f9170470b6bc947d21a6783486f88ef48aad66fc1380c8acd02b118418ec0ce0", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.3" + "version": "1.1.4" } }, "sdks": { diff --git a/pkgs/by-name/se/server-box/update-gitHashes.py b/pkgs/by-name/se/server-box/update-gitHashes.py new file mode 100755 index 000000000000..ffa6feb66653 --- /dev/null +++ b/pkgs/by-name/se/server-box/update-gitHashes.py @@ -0,0 +1,51 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p python3 nix-prefetch-git + +import json +import subprocess +import sys +from pathlib import Path + +THIS_FOLDER = Path(__file__).parent.resolve() +PUBSPEC_LOCK = THIS_FOLDER / "pubspec.lock.json" +GIT_HASHES = THIS_FOLDER / "gitHashes.json" + + +def fetch_git_hash(url: str, rev: str) -> str: + result = subprocess.run( + ["nix-prefetch-git", "--url", url, "--rev", rev], + capture_output=True, + text=True, + check=True, + ) + return json.loads(result.stdout)["hash"] + + +def main() -> None: + if not PUBSPEC_LOCK.exists(): + sys.exit(1) + try: + data = json.loads(PUBSPEC_LOCK.read_text()) + except json.JSONDecodeError: + sys.exit(1) + output: dict[str, str] = {} + for name, info in data.get("packages", {}).items(): + if info.get("source") != "git": + continue + desc = info.get("description") + if not isinstance(desc, dict): + continue + url = desc.get("url") + rev = desc.get("resolved-ref") + if not (isinstance(url, str) and isinstance(rev, str)): + continue + try: + package_hash = fetch_git_hash(url, rev) + except subprocess.CalledProcessError: + continue + output[name] = package_hash + GIT_HASHES.write_text(json.dumps(output, indent=2) + "\n") + + +if __name__ == "__main__": + main() From 133efe0ba985a71ebe0ea8c4bc000dc306074220 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 11 Aug 2025 13:30:29 +0200 Subject: [PATCH 32/74] zigbee2mqtt_1: drop and return to unversioned attribute --- nixos/tests/all-tests.nix | 9 +-- nixos/tests/zigbee2mqtt.nix | 17 +---- pkgs/by-name/zi/zigbee2mqtt/package.nix | 75 ++++++++++++++++++++++- pkgs/by-name/zi/zigbee2mqtt_1/package.nix | 51 --------------- pkgs/by-name/zi/zigbee2mqtt_2/package.nix | 74 ---------------------- pkgs/top-level/aliases.nix | 2 + 6 files changed, 80 insertions(+), 148 deletions(-) delete mode 100644 pkgs/by-name/zi/zigbee2mqtt_1/package.nix delete mode 100644 pkgs/by-name/zi/zigbee2mqtt_2/package.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index bbc66e837e56..60d8f22a1d18 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1622,14 +1622,7 @@ in zenohd = runTest ./zenohd.nix; zeronet-conservancy = runTest ./zeronet-conservancy.nix; zfs = handleTest ./zfs.nix { }; - zigbee2mqtt_1 = runTest { - imports = [ ./zigbee2mqtt.nix ]; - _module.args.package = pkgs.zigbee2mqtt_1; - }; - zigbee2mqtt_2 = runTest { - imports = [ ./zigbee2mqtt.nix ]; - _module.args.package = pkgs.zigbee2mqtt_2; - }; + zigbee2mqtt = runTest ./zigbee2mqtt.nix; zipline = runTest ./zipline.nix; zoneminder = runTest ./zoneminder.nix; zookeeper = runTest ./zookeeper.nix; diff --git a/nixos/tests/zigbee2mqtt.nix b/nixos/tests/zigbee2mqtt.nix index bcc1f4ea45f7..9f57d1f70ddc 100644 --- a/nixos/tests/zigbee2mqtt.nix +++ b/nixos/tests/zigbee2mqtt.nix @@ -1,19 +1,11 @@ { lib, - package, pkgs, ... }: -let - error = - if lib.versionOlder package.version "2" then - "Inappropriate ioctl for device, cannot set" - else - "No valid USB adapter found"; -in { - name = "zigbee2mqtt-${lib.versions.major package.version}.x"; + name = "zigbee2mqtt"; nodes.machine = { systemd.services.dummy-serial = { wantedBy = [ @@ -24,10 +16,7 @@ in }; }; - services.zigbee2mqtt = { - enable = true; - inherit package; - }; + services.zigbee2mqtt.enable = true; systemd.services.zigbee2mqtt.serviceConfig.DevicePolicy = lib.mkForce "auto"; }; @@ -36,7 +25,7 @@ in machine.wait_for_unit("multi-user.target") machine.wait_until_fails("systemctl status zigbee2mqtt.service") machine.succeed( - "journalctl -eu zigbee2mqtt | grep '${error}'" + "journalctl -eu zigbee2mqtt | grep 'No valid USB adapter found'" ) machine.log(machine.succeed("systemd-analyze security zigbee2mqtt.service")) diff --git a/pkgs/by-name/zi/zigbee2mqtt/package.nix b/pkgs/by-name/zi/zigbee2mqtt/package.nix index d93139046212..3401827e0c77 100644 --- a/pkgs/by-name/zi/zigbee2mqtt/package.nix +++ b/pkgs/by-name/zi/zigbee2mqtt/package.nix @@ -1 +1,74 @@ -{ zigbee2mqtt_2 }: zigbee2mqtt_2 +{ + lib, + stdenv, + fetchFromGitHub, + nodejs, + npmHooks, + pnpm_9, + systemdMinimal, + nixosTests, + nix-update-script, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal, +}: + +let + pnpm = pnpm_9; +in +stdenv.mkDerivation (finalAttrs: { + pname = "zigbee2mqtt"; + version = "2.6.0"; + + src = fetchFromGitHub { + owner = "Koenkk"; + repo = "zigbee2mqtt"; + tag = finalAttrs.version; + hash = "sha256-syzrH3hJinAcpdyVlwEevqzi0LZ+gBMvJOXncuafzjE="; + }; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + fetcherVersion = 1; + hash = "sha256-EJgR1xjQJGKBdgJ2BGFiumVwZViXn7GJNa4GPkkscDg="; + }; + + nativeBuildInputs = [ + nodejs + npmHooks.npmInstallHook + pnpm.configHook + ]; + + buildInputs = lib.optionals withSystemd [ + systemdMinimal + ]; + + buildPhase = '' + runHook preBuild + + pnpm run build + + runHook postBuild + ''; + + dontNpmPrune = true; + + passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + changelog = "https://github.com/Koenkk/zigbee2mqtt/releases/tag/${finalAttrs.version}"; + description = "Zigbee to MQTT bridge using zigbee-shepherd"; + homepage = "https://github.com/Koenkk/zigbee2mqtt"; + license = licenses.gpl3; + longDescription = '' + Allows you to use your Zigbee devices without the vendor's bridge or gateway. + + It bridges events and allows you to control your Zigbee devices via MQTT. + In this way you can integrate your Zigbee devices with whatever smart home infrastructure you are using. + ''; + maintainers = with maintainers; [ + sweber + hexa + ]; + mainProgram = "zigbee2mqtt"; + }; +}) diff --git a/pkgs/by-name/zi/zigbee2mqtt_1/package.nix b/pkgs/by-name/zi/zigbee2mqtt_1/package.nix deleted file mode 100644 index 235a25af498e..000000000000 --- a/pkgs/by-name/zi/zigbee2mqtt_1/package.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - stdenv, - buildNpmPackage, - fetchFromGitHub, - systemdMinimal, - nixosTests, - nix-update-script, - withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal, -}: - -buildNpmPackage rec { - pname = "zigbee2mqtt"; - version = "1.42.0"; - - src = fetchFromGitHub { - owner = "Koenkk"; - repo = "zigbee2mqtt"; - rev = version; - hash = "sha256-/7mZrf3FyIliCzsy6yzVRJYMy4bViphYi81UY43iO98="; - }; - - npmDepsHash = "sha256-heqTYLC+TQPQ2dc5MrVdvJeNqrygC4tUgkLcfKvlYvE="; - - buildInputs = lib.optionals withSystemd [ - systemdMinimal - ]; - - npmFlags = lib.optionals (!withSystemd) [ "--omit=optional" ]; - - passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt_1; - passthru.updateScript = nix-update-script { }; - - meta = { - changelog = "https://github.com/Koenkk/zigbee2mqtt/releases/tag/${version}"; - description = "Zigbee to MQTT bridge using zigbee-shepherd"; - homepage = "https://github.com/Koenkk/zigbee2mqtt"; - license = lib.licenses.gpl3; - longDescription = '' - Allows you to use your Zigbee devices without the vendor's bridge or gateway. - - It bridges events and allows you to control your Zigbee devices via MQTT. - In this way you can integrate your Zigbee devices with whatever smart home infrastructure you are using. - ''; - maintainers = with lib.maintainers; [ - sweber - hexa - ]; - mainProgram = "zigbee2mqtt"; - }; -} diff --git a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix b/pkgs/by-name/zi/zigbee2mqtt_2/package.nix deleted file mode 100644 index 26c187af31c2..000000000000 --- a/pkgs/by-name/zi/zigbee2mqtt_2/package.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - nodejs, - npmHooks, - pnpm_9, - systemdMinimal, - nixosTests, - nix-update-script, - withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal, -}: - -let - pnpm = pnpm_9; -in -stdenv.mkDerivation (finalAttrs: { - pname = "zigbee2mqtt"; - version = "2.6.0"; - - src = fetchFromGitHub { - owner = "Koenkk"; - repo = "zigbee2mqtt"; - tag = finalAttrs.version; - hash = "sha256-syzrH3hJinAcpdyVlwEevqzi0LZ+gBMvJOXncuafzjE="; - }; - - pnpmDeps = pnpm.fetchDeps { - inherit (finalAttrs) pname version src; - fetcherVersion = 1; - hash = "sha256-EJgR1xjQJGKBdgJ2BGFiumVwZViXn7GJNa4GPkkscDg="; - }; - - nativeBuildInputs = [ - nodejs - npmHooks.npmInstallHook - pnpm.configHook - ]; - - buildInputs = lib.optionals withSystemd [ - systemdMinimal - ]; - - buildPhase = '' - runHook preBuild - - pnpm run build - - runHook postBuild - ''; - - dontNpmPrune = true; - - passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt_2; - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - changelog = "https://github.com/Koenkk/zigbee2mqtt/releases/tag/${finalAttrs.version}"; - description = "Zigbee to MQTT bridge using zigbee-shepherd"; - homepage = "https://github.com/Koenkk/zigbee2mqtt"; - license = licenses.gpl3; - longDescription = '' - Allows you to use your Zigbee devices without the vendor's bridge or gateway. - - It bridges events and allows you to control your Zigbee devices via MQTT. - In this way you can integrate your Zigbee devices with whatever smart home infrastructure you are using. - ''; - maintainers = with maintainers; [ - sweber - hexa - ]; - mainProgram = "zigbee2mqtt"; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 003462e80623..d427f0bc56b9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2260,6 +2260,8 @@ mapAliases { zig_0_9 = throw "zig 0.9 has been removed, upgrade to a newer version instead"; # Added 2025-01-24 zig_0_10 = throw "zig 0.10 has been removed, upgrade to a newer version instead"; # Added 2025-01-24 zig_0_11 = throw "zig 0.11 has been removed, upgrade to a newer version instead"; # Added 2025-04-09 + zigbee2mqtt_1 = throw "Zigbee2MQTT 1.x has been removed, upgrade to the unversioned attribute."; # Added 2025-08-11 + zigbee2mqtt_2 = zigbee2mqtt; # Added 2025-08-11 zimlib = throw "'zimlib' has been removed because it was an outdated and unused version of 'libzim'"; # Added 2025-03-07 zinc = zincsearch; # Added 2023-05-28 zint = zint-qt; # Added 2025-05-15 From 833f9f9c2e4d14dfcf5bb9706c790f23e5b4de6f Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 9 Aug 2025 12:57:10 +0200 Subject: [PATCH 33/74] python313Packages.kicad-python: init at 0.4.0 --- .../python-modules/kicad-python/default.nix | 70 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/development/python-modules/kicad-python/default.nix diff --git a/pkgs/development/python-modules/kicad-python/default.nix b/pkgs/development/python-modules/kicad-python/default.nix new file mode 100644 index 000000000000..3344a073b448 --- /dev/null +++ b/pkgs/development/python-modules/kicad-python/default.nix @@ -0,0 +1,70 @@ +{ + lib, + buildPythonPackage, + fetchFromGitLab, + poetry-core, + protoletariat, + mypy-protobuf, + pkgs, + protobuf, + pynng, + pytestCheckHook, + gitMinimal, + pythonOlder, + typing-extensions, +}: +buildPythonPackage rec { + pname = "kicad-python"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitLab { + owner = "kicad/code"; + repo = "kicad-python"; + tag = version; + hash = "sha256-M2vJ/lSwc1XjrG661ayNIOZKJitmy/UPM2SesQI1xYE="; + fetchSubmodules = true; + }; + + build-system = [ + poetry-core + protoletariat + ]; + + dependencies = [ + protobuf + pynng + mypy-protobuf + ] + ++ (lib.optional (pythonOlder "3.13") typing-extensions); + + nativeBuildInputs = [ + pkgs.protobuf + mypy-protobuf + gitMinimal + ]; + + pythonRelaxDeps = [ "protobuf" ]; + + # fixes: FileExistsError: File already exists .../kipy/__init__.py + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'script =' "#" + ''; + + preBuild = '' + python build.py + ''; + + pythonImportsCheck = [ "kipy" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "KiCad API Python Bindings"; + homepage = "https://kicad.org/"; + downloadPage = "https://gitlab.com/kicad/code/kicad-python"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e9d4818d3599..f575af2ab995 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7737,6 +7737,8 @@ self: super: with self; { kicad = toPythonModule (pkgs.kicad.override { python3 = python; }).src; + kicad-python = callPackage ../development/python-modules/kicad-python { }; + kicadcliwrapper = callPackage ../development/python-modules/kicadcliwrapper { }; kinparse = callPackage ../development/python-modules/kinparse { }; From 7b399afac28eb3d8d2609223d9fa36f9112d14e3 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 9 Aug 2025 13:00:05 +0200 Subject: [PATCH 34/74] python313Packages.atopile: 0.10.15 -> 0.10.23 https://github.com/atopile/atopile/compare/v0.10.15...v0.10.23 python313Packages.atopile: remove posthog patch --- pkgs/development/python-modules/atopile/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix index 80df90597e75..080d1bb8aa90 100644 --- a/pkgs/development/python-modules/atopile/default.nix +++ b/pkgs/development/python-modules/atopile/default.nix @@ -21,6 +21,7 @@ fastapi-github-oidc, freetype-py, gitpython, + kicad-python, kicadcliwrapper, matplotlib, mcp, @@ -56,7 +57,7 @@ buildPythonPackage rec { pname = "atopile"; - version = "0.10.15"; + version = "0.10.23"; pyproject = true; disabled = pythonOlder "3.13"; @@ -65,7 +66,7 @@ buildPythonPackage rec { owner = "atopile"; repo = "atopile"; tag = "v${version}"; - hash = "sha256-18+hPvVSKgYnjpreJLs4ZeeA1T8gCDtoXWznOFjMEwA="; + hash = "sha256-dwlST3Cf4SLSYvuaPBbpkwHG0c57NZ+9tIWXcXsI1wQ="; }; build-system = [ @@ -93,6 +94,7 @@ buildPythonPackage rec { fastapi-github-oidc freetype-py gitpython + kicad-python kicadcliwrapper matplotlib mcp @@ -124,11 +126,6 @@ buildPythonPackage rec { "zstd" ]; - postPatch = '' - substituteInPlace src/atopile/telemetry.py \ - --replace-fail "api_key=" "project_api_key=" - ''; - pythonImportsCheck = [ "atopile" ]; preCheck = '' From 3cf87d340b6acad629aeb5302f175e1ff6e347b5 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 10 Aug 2025 23:08:34 +0200 Subject: [PATCH 35/74] python313Packages.atopile: 0.10.23 -> 0.11.2 --- pkgs/development/python-modules/atopile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix index 080d1bb8aa90..d23011337da9 100644 --- a/pkgs/development/python-modules/atopile/default.nix +++ b/pkgs/development/python-modules/atopile/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { pname = "atopile"; - version = "0.10.23"; + version = "0.11.2"; pyproject = true; disabled = pythonOlder "3.13"; @@ -66,7 +66,7 @@ buildPythonPackage rec { owner = "atopile"; repo = "atopile"; tag = "v${version}"; - hash = "sha256-dwlST3Cf4SLSYvuaPBbpkwHG0c57NZ+9tIWXcXsI1wQ="; + hash = "sha256-JczlQulHlViV9pg0uPXd9Boagp74VBdZ1UMDXh2c3DA="; }; build-system = [ From 93364bdfa0675a8571526668c1e66cd14b589ff2 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 10 Aug 2025 23:06:02 +0200 Subject: [PATCH 36/74] python313Packages.apotile: enable tests --- .../python-modules/atopile/default.nix | 82 +++++++++++++++++-- 1 file changed, 74 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix index d23011337da9..87a79f26dbd4 100644 --- a/pkgs/development/python-modules/atopile/default.nix +++ b/pkgs/development/python-modules/atopile/default.nix @@ -50,9 +50,13 @@ # tests pytestCheckHook, - pytest-xdist, + + pytest-benchmark, pytest-timeout, + pytest-datafiles, + pytest-xdist, hypothesis, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { @@ -128,24 +132,86 @@ buildPythonPackage rec { pythonImportsCheck = [ "atopile" ]; + nativeCheckInputs = [ + writableTmpDirAsHomeHook + pytestCheckHook + pytest-xdist + pytest-benchmark + pytest-datafiles + pytest-timeout + hypothesis + ]; + preCheck = '' # do not report worker logs to filee substituteInPlace test/conftest.py \ --replace-fail "worker_id =" "worker_id = None #" + # unrecognized flags substituteInPlace pyproject.toml \ --replace-fail "--html=artifacts/test-report.html" "" \ - --replace-fail "--self-contained-html" "" + --replace-fail "--self-contained-html" "" \ + --replace-fail "--numprocesses=auto" "" \ + + # Replace this function call that cause test to hang + substituteInPlace \ + test/cli/test_packages.py \ + test/library/test_names.py \ + test/test_examples.py \ + test/test_parse_utils.py \ + --replace-fail "_repo_root()" "Path('$(pwd)')" + + # Fix crash due to empty list in fixture tests + substituteInPlace \ + test/test_examples.py \ + test/test_parse_utils.py \ + --replace-fail "p.stem" "p.stem if isinstance(p, Path) else p" ''; - nativeCheckInputs = [ - pytestCheckHook - pytest-xdist - pytest-timeout - hypothesis + disabledTestPaths = [ + # timouts + "test/test_cli.py" + "test/cli/test_packages.py" + "test/end_to_end/test_net_naming.py" + "test/end_to_end/test_pcb_export.py" + "test/exporters/bom/test_bom.py" + "test/front_end/test_front_end_pick.py" + "test/libs/picker/test_pickers.py" ]; - doCheck = false; # test are hanging + disabledTests = [ + # timeout + "test_build_error_logging" + "test_performance_mifs_bus_params" + "test_resistor" + "test_reserved_attrs" + # requires internet + "test_simple_pick" + "test_simple_negative_pick" + "test_jlcpcb_pick_resistor" + "test_jlcpcb_pick_capacitor" + "test_regression_rp2040_usb_diffpair_full" + "test_model_translations" + # type error + "test_alternate_trait_constructor_with_params" + "test_parameterised_trait_with_params" + "test_trait_alternate_constructor_precedence" + "test_trait_template_enum" + "test_trait_template_enum_invalid" + # failure + "test_solve_voltage_divider_complex" + ]; + + # in order to use pytest marker, we need to use ppytestFlagsArray + # using pytestFlags causes `ERROR: file or directory not found: slow` + pytestFlagsArray = [ + "-m='not slow and not not_in_ci and not regression'" + "--timeout=10" # any test taking long, timouts with more than 60s + "--benchmark-disable" + "--tb=line" + ]; + + doCheck = true; meta = { description = "Design circuit boards with code"; From 6f9520ff54c7f7124a3f2cb5e7d4e3df42b1d5d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Aug 2025 00:36:54 +0000 Subject: [PATCH 37/74] taschenrechner: 1.5.0 -> 2.0.0 --- pkgs/by-name/ta/taschenrechner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/taschenrechner/package.nix b/pkgs/by-name/ta/taschenrechner/package.nix index 2e692de70fc1..c3f0656b211c 100644 --- a/pkgs/by-name/ta/taschenrechner/package.nix +++ b/pkgs/by-name/ta/taschenrechner/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "taschenrechner"; - version = "1.5.0"; + version = "2.0.0"; src = fetchFromGitLab { domain = "gitlab.fem-net.de"; owner = "mabl"; repo = "taschenrechner"; rev = version; - hash = "sha256-ZZVghL0R3p5sE8V9Z0MsmTiCacuE2RXohQQEYJYgp/o="; + hash = "sha256-ZkyZpCOSo30XEjfh6bLiTLQs/efSFtwdlpIu9bO5Sdc="; }; - cargoHash = "sha256-/tgfHU4/B7tes2jU8L/MbWIG1sTLg9exWhmuSA6Davk="; + cargoHash = "sha256-29gqkJe/8ghAgAeioQ2r+AYgOI6lzMnDut4WF0Q59Xg="; meta = with lib; { description = "Cli-calculator written in Rust"; From 4bf7ed2303a26c2b45520189e4e9e5ef5bfcc78a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Aug 2025 08:51:30 +0000 Subject: [PATCH 38/74] hifile: 0.9.11.2 -> 0.9.12.0 --- pkgs/by-name/hi/hifile/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix index e2b6474b8fb0..026c4657132b 100644 --- a/pkgs/by-name/hi/hifile/package.nix +++ b/pkgs/by-name/hi/hifile/package.nix @@ -2,8 +2,8 @@ lib, appimageTools, fetchurl, - version ? "0.9.11.2", - hash ? "sha256-Go2KGEUu93jAxwFQ/yEOvePQpSjFW+dJxQ1tWQXr2fY=", + version ? "0.9.12.0", + hash ? "sha256-nWt/DOzoQ05F+uk9sDSumb19vQib1Vh/8ywB/d87epc=", }: let From 6d24712a865744f593ba59f6cfdab4333a13e42f Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sun, 27 Jul 2025 15:49:50 +0200 Subject: [PATCH 39/74] the-legend-of-edgar: fix cross Signed-off-by: Marcin Serwin --- pkgs/by-name/th/the-legend-of-edgar/package.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/by-name/th/the-legend-of-edgar/package.nix b/pkgs/by-name/th/the-legend-of-edgar/package.nix index 8504e66e4eb7..2f6ea059305b 100644 --- a/pkgs/by-name/th/the-legend-of-edgar/package.nix +++ b/pkgs/by-name/th/the-legend-of-edgar/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, fetchpatch, + buildPackages, SDL2, SDL2_image, SDL2_mixer, @@ -31,11 +32,25 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/riksweeney/edgar/commit/cec80a04d765fd2f6563d1cf060ad5000f9efe0a.patch"; hash = "sha256-RJpIt7M3c989nXkWRTY+dIUGqqttyTTGx8s5u/iTWX4="; }) + + (fetchpatch { + # https://github.com/riksweeney/edgar/pull/68 + name = "add-cross-compilation-support.patch"; + url = "https://github.com/riksweeney/edgar/commit/9cc071d06b97e20aee3841c2eaa8078c6ed396d7.patch"; + hash = "sha256-+yHzLgqBI8qgD40pSCmwF68SDDnC/4QdCXEz/g7l0a4="; + }) ]; + strictDeps = true; + + depsBuildBuild = [ + buildPackages.stdenv.cc + pkg-config + ]; nativeBuildInputs = [ pkg-config gettext + zlib ]; buildInputs = [ @@ -54,6 +69,8 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${placeholder "out"}" "BIN_DIR=${placeholder "out"}/bin/" + "BUILD_CC=$(CC_FOR_BUILD)" + "BUILD_PKG_CONFIG=$(PKG_CONFIG_FOR_BUILD)" ]; enableParallelBuilding = true; From 37c19df121ee90a2903b00169fb56d70acfefd58 Mon Sep 17 00:00:00 2001 From: jefrwld Date: Tue, 12 Aug 2025 19:42:37 +0200 Subject: [PATCH 40/74] lib.attrsets: fix typo in attrVals documentation: 'attribitue' -> 'attribute' --- lib/attrsets.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 124c22a885e1..c68806912321 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -509,7 +509,7 @@ rec { `nameList` - : The list of attributes to fetch from `set`. Each attribute name must exist on the attrbitue set + : The list of attributes to fetch from `set`. Each attribute name must exist on the attribute set `set` From 864a873db9b6986830cfde97629e47d665dfb357 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 12 Aug 2025 22:40:22 +0200 Subject: [PATCH 41/74] nixos/netbird: deprecate phases --- nixos/modules/services/networking/netbird.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/netbird.nix b/nixos/modules/services/networking/netbird.nix index 9d47901baffb..7c3fe93a5678 100644 --- a/nixos/modules/services/networking/netbird.nix +++ b/nixos/modules/services/networking/netbird.nix @@ -295,8 +295,7 @@ in name = "${cfg.package.name}-wrapper-${client.name}"; meta.mainProgram = mkBin "netbird"; nativeBuildInputs = with pkgs; [ makeWrapper ]; - phases = [ "installPhase" ]; - installPhase = concatStringsSep "\n" [ + buildCommand = concatStringsSep "\n" [ '' mkdir -p "$out/bin" makeWrapper ${lib.getExe cfg.package} "$out/bin/${mkBin "netbird"}" \ From 6b65a028d46204de220665df75ad614d2b32ce0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Aug 2025 04:05:35 +0000 Subject: [PATCH 42/74] firebase-tools: 14.11.2 -> 14.12.0 --- pkgs/by-name/fi/firebase-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 24efb57fa935..51f00359fced 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "14.11.2"; + version = "14.12.0"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; tag = "v${version}"; - hash = "sha256-7B1iGjWYfw8e5+JF0YDIZ/o5nR981gNdBM64BcdR3sk="; + hash = "sha256-LShbjULFhwMOj3h+TFqZJSg1wPP69A222w51M0kFPCk="; }; - npmDepsHash = "sha256-HzHTp+lFHTYftmWRxreVkzDKHl9fxw4Da/res5bN1yg="; + npmDepsHash = "sha256-MN3kN2NKYak7/BgU9ZYsb/q42xEbFVeOSZxMowmXctU="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json From fd6621016a30b9cf319a6c0a57d9aca223c383b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Aug 2025 06:04:26 +0000 Subject: [PATCH 43/74] lakectl: 1.64.1 -> 1.65.2 --- pkgs/by-name/la/lakectl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/lakectl/package.nix b/pkgs/by-name/la/lakectl/package.nix index 2f4bdff62f0e..63d31dc98fc4 100644 --- a/pkgs/by-name/la/lakectl/package.nix +++ b/pkgs/by-name/la/lakectl/package.nix @@ -7,18 +7,18 @@ buildGoModule (finalAttrs: { pname = "lakectl"; - version = "1.64.1"; + version = "1.65.2"; src = fetchFromGitHub { owner = "treeverse"; repo = "lakeFS"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZS1dvp5s/6oKRWz59Ooc8lR27OJVYgQ2wi4NYV1IP1M="; + hash = "sha256-X7cjNa9PQFUuvCN8/i8p9kqsvHqc3IGFWL++Mj0KdfY="; }; subPackages = [ "cmd/lakectl" ]; proxyVendor = true; - vendorHash = "sha256-edz4if/u3DH2X56VU8kU8qcJX+zAFiQTLfR2VZ314Ik="; + vendorHash = "sha256-JEAVAXWscq/u+ABvYThlWkpaVRQd2e2gtmYoLDjVx/s="; ldflags = [ "-s" From 9e47fbc5464fc74731ed1b4da13a0052c8f94e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFs=20Postula?= Date: Wed, 13 Aug 2025 08:39:05 +0200 Subject: [PATCH 44/74] maintainers: add mockersf --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 62c4961e2077..28c8254ed3c6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16891,6 +16891,12 @@ githubId = 7831184; name = "John Mercier"; }; + mockersf = { + email = "francois.mockers@vleue.com"; + github = "mockersf"; + githubId = 8672791; + name = "François Mockers"; + }; modderme123 = { email = "modderme123@gmail.com"; github = "milomg"; From d8bf9a81bb63cf4790d591ba795d5b59266e8102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFs=20Postula?= Date: Wed, 13 Aug 2025 08:39:19 +0200 Subject: [PATCH 45/74] maintainers: add NthTensor --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 28c8254ed3c6..969d8df3eb7e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18502,6 +18502,12 @@ githubId = 1839979; name = "Niklas Thörne"; }; + NthTensor = { + email = "miles.silberlingcook@gmail.com"; + github = "NthTensor"; + githubId = 16138381; + name = "Miles Silberling-Cook"; + }; nudelsalat = { email = "nudelsalat@clouz.de"; name = "Fabian Dreßler"; From 9cbf6a09eefd1e7683201a27b6f34d3ad8870441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFs=20Postula?= Date: Wed, 13 Aug 2025 08:39:36 +0200 Subject: [PATCH 46/74] maintainers: update fslabs team --- maintainers/team-list.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 06436b41b626..0a710c3dd49f 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -451,8 +451,9 @@ with lib.maintainers; fslabs = { # Verify additions to this team with at least one already existing member of the team. members = [ - greaka lpostula + mockersf + NthTensor ]; scope = "Group registration for packages maintained by Foresight Spatial Labs."; shortName = "Foresight Spatial Labs employees"; From 82f97c2dc1cdef623067b5093405a6b780171db7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 13 Aug 2025 08:52:08 +0200 Subject: [PATCH 47/74] python313Packages.aiowebostv: 0.7.4 -> 0.7.5 Diff: https://github.com/home-assistant-libs/aiowebostv/compare/refs/tags/v0.7.4...refs/tags/v0.7.5 Changelog: https://github.com/home-assistant-libs/aiowebostv/releases/tag/v0.7.5 --- pkgs/development/python-modules/aiowebostv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiowebostv/default.nix b/pkgs/development/python-modules/aiowebostv/default.nix index 2c8e20c3d8b4..35c15d85f2fb 100644 --- a/pkgs/development/python-modules/aiowebostv/default.nix +++ b/pkgs/development/python-modules/aiowebostv/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiowebostv"; - version = "0.7.4"; + version = "0.7.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aiowebostv"; tag = "v${version}"; - hash = "sha256-VBdHI6aGfhcgDdwspToHp3iNFQRT0Z+Fseq0eNdUwTo="; + hash = "sha256-3O1NiFNzlWIR/9JR2Y7t9tL4t7tJ6haNwsS5r4m7lMM="; }; build-system = [ setuptools ]; From 721991064961125b1a0f33680ab31ab0163a8cd9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 13 Aug 2025 08:53:15 +0200 Subject: [PATCH 48/74] python313Packages.yolink-api: 0.5.7 -> 0.5.8 Diff: https://github.com/YoSmart-Inc/yolink-api/compare/refs/tags/v0.5.7...refs/tags/v0.5.8 Changelog: https://github.com/YoSmart-Inc/yolink-api/releases/tag/v0.5.8 --- pkgs/development/python-modules/yolink-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index a904e37c14fc..dc3b0c8c08e6 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.5.7"; + version = "0.5.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = "yolink-api"; tag = "v${version}"; - hash = "sha256-LfpW2Y2uzqv2RhTItvjxF5XZrjCz/IIKov6OPIqKgF8="; + hash = "sha256-lIwslGErlMGAu8BzM2gt1vVcaWy7S3Rqw7ce+qvQ+WU="; }; build-system = [ setuptools ]; From a52a73c7f2e272bb38e618bedc06bc7968f7e4a0 Mon Sep 17 00:00:00 2001 From: Defelo Date: Wed, 13 Aug 2025 09:41:00 +0000 Subject: [PATCH 49/74] clorinde: 1.0.1 -> 1.1.0 Changelog: https://github.com/halcyonnouveau/clorinde/blob/clorinde-v1.1.0/CHANGELOG.md Diff: https://github.com/halcyonnouveau/clorinde/compare/clorinde-v1.0.1...clorinde-v1.1.0 --- pkgs/by-name/cl/clorinde/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix index c2f30196cf0d..fabc70ba3b2f 100644 --- a/pkgs/by-name/cl/clorinde/package.nix +++ b/pkgs/by-name/cl/clorinde/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "clorinde"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "halcyonnouveau"; repo = "clorinde"; tag = "clorinde-v${finalAttrs.version}"; - hash = "sha256-Bxa30QkBFJaa/Xd4BL5OOcMLLHI6p81kX10zrUQkX5w="; + hash = "sha256-AVDlOMdtzWxd+eZmlSOyZ6lqLXG6qFrYFRUREWyMBIQ="; }; - cargoHash = "sha256-EL2/IgIdP+JZAdDXHwaBqBqjBIJOQeNL48hgTn9UWXw="; + cargoHash = "sha256-3GANdfN3phymRucVx2sFKiP/6I9aKbP2IF1faj7B068="; cargoBuildFlags = [ "--package=clorinde" ]; From 6a2302dafeb8da7d19d5fc094a64f0177371fce9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Aug 2025 09:49:27 +0000 Subject: [PATCH 50/74] libretro.parallel-n64: 0-unstable-2025-03-02 -> 0-unstable-2025-08-05 --- pkgs/applications/emulators/libretro/cores/parallel-n64.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/parallel-n64.nix b/pkgs/applications/emulators/libretro/cores/parallel-n64.nix index 7b4d61f82703..63d6ccfd3da7 100644 --- a/pkgs/applications/emulators/libretro/cores/parallel-n64.nix +++ b/pkgs/applications/emulators/libretro/cores/parallel-n64.nix @@ -9,13 +9,13 @@ }: mkLibretroCore { core = "parallel-n64"; - version = "0-unstable-2025-03-02"; + version = "0-unstable-2025-08-05"; src = fetchFromGitHub { owner = "libretro"; repo = "parallel-n64"; - rev = "f8605345e13c018a30c8f4ed03c05d8fc8f70be8"; - hash = "sha256-6yb/vrcp0pQpNzngDHhcWC1U4ghtSZ0BVoT5NXd8Gwo="; + rev = "50d3ddd55b5774da643d90d7ad1e3cbd2c618883"; + hash = "sha256-l42EKrZH1JwTxpkjl8vTrMsd2NJCeKV9Owgj+EB81eM="; }; extraBuildInputs = [ From c9a03b77708872ca9a19b549a8a44cb18ec370b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Wed, 13 Aug 2025 10:50:51 +0100 Subject: [PATCH 51/74] python3Packages.tidalapi: 0.8.4 -> 0.8.5 --- pkgs/development/python-modules/tidalapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tidalapi/default.nix b/pkgs/development/python-modules/tidalapi/default.nix index 875a2af1cff9..7fa8cb88f628 100644 --- a/pkgs/development/python-modules/tidalapi/default.nix +++ b/pkgs/development/python-modules/tidalapi/default.nix @@ -12,14 +12,14 @@ }: buildPythonPackage rec { pname = "tidalapi"; - version = "0.8.4"; + version = "0.8.5"; pyproject = true; src = fetchFromGitHub { owner = "EbbLabs"; repo = "python-tidal"; tag = "v${version}"; - hash = "sha256-PSM4aLjvG8b2HG86SCLgPjPo8PECVD5XrNZSbiAxcSk="; + hash = "sha256-DI1EtjwHGsdneyW3Av6ZEWoKf0MzkXs0NJkD55W5pD0="; }; build-system = [ From 3b1eea3a6af6e500e781042a68df8f9a0418113c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Wed, 13 Aug 2025 11:01:41 +0100 Subject: [PATCH 52/74] high-tide: add pipewire build input --- pkgs/by-name/hi/high-tide/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/hi/high-tide/package.nix b/pkgs/by-name/hi/high-tide/package.nix index 7aabc641e89c..0b303698d415 100644 --- a/pkgs/by-name/hi/high-tide/package.nix +++ b/pkgs/by-name/hi/high-tide/package.nix @@ -13,6 +13,7 @@ gst_all_1, libsecret, libportal, + pipewire, nix-update-script, }: @@ -41,6 +42,7 @@ python313Packages.buildPythonApplication rec { glib-networking libadwaita libportal + pipewire # provides a gstreamer plugin for pipewiresink ] ++ (with gst_all_1; [ gstreamer From 556a853c492ae69477f3bdfe9c80f95ca306ac70 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Wed, 13 Aug 2025 14:07:21 +0300 Subject: [PATCH 53/74] raycast: 1.102.3 -> 1.102.4 --- pkgs/by-name/ra/raycast/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix index 8c01dd5dd048..37d9ef4606eb 100644 --- a/pkgs/by-name/ra/raycast/package.nix +++ b/pkgs/by-name/ra/raycast/package.nix @@ -12,19 +12,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.102.3"; + version = "1.102.4"; src = { aarch64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm"; - hash = "sha256-rb67RWmv4zJs4osGt/4D5XfV3ZT1YbwhHAhEqPrCxCk="; + hash = "sha256-VYwvU9DWowE+34ZBAsqIjGJGnHVfdVWGl4baL5boN8M="; }; x86_64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64"; - hash = "sha256-1CCIrqDv7h0z/49X9UrObeWmyAz++XpMdZ58ilW4wIM="; + hash = "sha256-LMkHWs/H5ESdp+JaUG0rlI9UVx29WYcU44t0fBAWg8A="; }; } .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported."); From cb974246080f7aad48767cb8c4c7c7430c0c9747 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Aug 2025 11:48:54 +0000 Subject: [PATCH 54/74] vscode-extensions.angular.ng-template: 20.1.1 -> 20.2.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 338a0f149d64..fd54a68ace90 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -260,8 +260,8 @@ let mktplcRef = { name = "ng-template"; publisher = "Angular"; - version = "20.1.1"; - hash = "sha256-fcJXyuGow39uep6Giexft+3a/nnoJSsKdwjtAQKTMj0="; + version = "20.2.1"; + hash = "sha256-oemc2lJDPsWWG+tcJAk8u5lSGUpIoI6K/fE/TZC5bWw="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog"; From f8f392daa858bed30644e728d221834077a82ce9 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Wed, 13 Aug 2025 14:15:16 +0200 Subject: [PATCH 55/74] vencord: 1.12.9 -> 1.12.10 --- pkgs/by-name/ve/vencord/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index 950e292be954..e6db9e23d6fc 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vencord"; - version = "1.12.9"; + version = "1.12.10"; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; rev = "v${finalAttrs.version}"; - hash = "sha256-dvQM4xHRcHLRxEh3+V2LKBPv+Es6T1CTbD9/oY912Ys="; + hash = "sha256-1id5efh9Zr2hpLnLAej2EMDQHpjdM7U5ZZBDE2p5Ljc="; }; pnpmDeps = pnpm_10.fetchDeps { From 9da9be5e524dcbd0d06042c0ab3563dba6105872 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Aug 2025 12:35:39 +0000 Subject: [PATCH 56/74] python3Packages.pynetio: 0.1.8 -> 0.1.9.1 --- pkgs/development/python-modules/pynetio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynetio/default.nix b/pkgs/development/python-modules/pynetio/default.nix index c2c7652c6856..230397e80910 100644 --- a/pkgs/development/python-modules/pynetio/default.nix +++ b/pkgs/development/python-modules/pynetio/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pynetio"; - version = "0.1.8"; + version = "0.1.9.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-SSe6OHubWszOTnwytL/3GhzD4lGIz9kxS75kuJv7vKA="; + hash = "sha256-Z6pLZPcQrPy3z/wCwCO2S4FvkJYKDZ6dy/IlwImPeb8="; }; build-system = [ setuptools ]; From 6b1aac25eb54aee91a469b0f9d4b159bcbc6128c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 13 Aug 2025 13:30:05 +0200 Subject: [PATCH 57/74] python313Packages.supafunc: refactor --- .../python-modules/supafunc/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/supafunc/default.nix b/pkgs/development/python-modules/supafunc/default.nix index 9d56f63351d9..8dfd5301fb06 100644 --- a/pkgs/development/python-modules/supafunc/default.nix +++ b/pkgs/development/python-modules/supafunc/default.nix @@ -2,10 +2,9 @@ lib, buildPythonPackage, fetchPypi, + httpx, poetry-core, strenum, - httpx, - h2, }: buildPythonPackage rec { @@ -18,23 +17,24 @@ buildPythonPackage rec { hash = "sha256-ReTVAIVBZ8JhUVxD96NjMg4KkoEYGC/okyre/d7dtUU="; }; + build-system = [ poetry-core ]; + dependencies = [ strenum httpx - h2 - ]; + ] + ++ httpx.optional-dependencies.http2; - build-system = [ poetry-core ]; + # Tests are not in PyPI package and source is not tagged + doCheck = false; pythonImportsCheck = [ "supafunc" ]; - # tests are not in pypi package - doCheck = false; - meta = { - homepage = "https://github.com/supabase/functions-py"; - license = lib.licenses.mit; description = "Library for Supabase Functions"; + homepage = "https://github.com/supabase/functions-py"; + changelog = "https://github.com/supabase/functions-py/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ siegema ]; }; } From e89ac4d1c09aa86eb794d15111b35432d6899bda Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Aug 2025 12:55:57 +0000 Subject: [PATCH 58/74] arkade: 0.11.40 -> 0.11.41 --- pkgs/by-name/ar/arkade/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix index cd81c15f84fc..c9f657bfd799 100644 --- a/pkgs/by-name/ar/arkade/package.nix +++ b/pkgs/by-name/ar/arkade/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.40"; + version = "0.11.41"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-9jFfYCMAyf6RAz4CjkYYRC68VkqrWCXkVUA2kZm0g7s="; + hash = "sha256-N9NiAsggIJpYe2UfREp5l1srzm+P2LNIQhKJyT7w0rQ="; }; env.CGO_ENABLED = 0; From bcf94dd3f07189b7475d823c8d67d08b58289905 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Tue, 12 Aug 2025 23:28:44 -0700 Subject: [PATCH 59/74] llvmPackages_21: 21.1.0-rc2 -> 21.1.0-rc3 --- pkgs/development/compilers/llvm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 41c1db1c66eb..5bd54197fa05 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -32,7 +32,7 @@ let "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y="; - "21.1.0-rc2".officialRelease.sha256 = "sha256-7qE5MAYuB+gr5NmQm+7jJWCarIjoDUtyd8SDiJwvITw="; + "21.1.0-rc3".officialRelease.sha256 = "sha256-quZuqDIm8OrkDJqu7vJKUP8MF1xCuQNFwW9SnKMFoS8="; "22.0.0-git".gitRelease = { rev = "144cd87088dc82263b25e816c77fc03f29fd1288"; rev-version = "22.0.0-unstable-2025-08-03"; From e82471322e9d20112605cdfa17cbaed9e200a256 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Aug 2025 13:17:21 +0000 Subject: [PATCH 60/74] emmet-language-server: 2.7.0 -> 2.8.0 --- pkgs/by-name/em/emmet-language-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/em/emmet-language-server/package.nix b/pkgs/by-name/em/emmet-language-server/package.nix index e62b1fd2df90..b29dfe084c91 100644 --- a/pkgs/by-name/em/emmet-language-server/package.nix +++ b/pkgs/by-name/em/emmet-language-server/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "emmet-language-server"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "olrtg"; repo = "emmet-language-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-Lojy7y7RnPZPV9x0Mb4Rjm18RHwx6ejEpCo8wmXIOMw="; + hash = "sha256-EY/xfrf6sGnZPbkbf9msauOoZ0h0EjLSwQC0aiS/Kco="; }; pnpmDeps = pnpm_9.fetchDeps { From 87f955c8d7bd5a1127fcc96b1dbc0c52a4b69abb Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 13 Aug 2025 21:46:34 +1000 Subject: [PATCH 61/74] terraform-providers.aws: 5.99.1 -> 6.8.0 --- .../networking/cluster/terraform-providers/default.nix | 2 -- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index b87d7d33db22..b20c1b54dbcf 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -2,7 +2,6 @@ lib, stdenv, buildGoModule, - buildGo123Module, fetchFromGitHub, fetchFromGitLab, callPackage, @@ -97,7 +96,6 @@ let # These are the providers that don't fall in line with the default model special-providers = { - aws = automated-providers.aws.override { mkProviderGoModule = buildGo123Module; }; # github api seems to be broken, doesn't just fail to recognize the license, it's ignored entirely. checkly = automated-providers.checkly.override { spdx = "MIT"; }; gitlab = automated-providers.gitlab.override { diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8e9d016da981..0b13a18e1eb5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -126,13 +126,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-asrIQrhSSHjuOBFomgq9lbHc8rmkcy3OjJ5ig9I7XbU=", + "hash": "sha256-52tdACEZF1AOg1pN25bo0T2pLObjho4fRrMSBhjP1xM=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.99.1", + "rev": "v6.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-low0aq3i3pmqbadYg1VZra+ZzoV6nqyGutf8xzaces0=" + "vendorHash": "sha256-rTQzbI04C92J+IXVX8dHtcbMvOif5jLW8ejm20qfrSA=" }, "awscc": { "hash": "sha256-lsnmPbG5juue8ZQ/JT8zjk4vSDwMqUlIxAqKxbaR3iY=", From cc1cd74c723706e90b7c266e5f61ce10e1bba120 Mon Sep 17 00:00:00 2001 From: serenity <98162476+NekoDrone@users.noreply.github.com> Date: Wed, 13 Aug 2025 21:29:30 +0800 Subject: [PATCH 62/74] atproto-goat: 0-unstable-2025-02-01 -> 0-unstable-2025-08-13 --- pkgs/by-name/at/atproto-goat/package.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/at/atproto-goat/package.nix b/pkgs/by-name/at/atproto-goat/package.nix index daf579357988..7889da55ebd2 100644 --- a/pkgs/by-name/at/atproto-goat/package.nix +++ b/pkgs/by-name/at/atproto-goat/package.nix @@ -11,20 +11,18 @@ buildGoModule rec { src = fetchFromGitHub { owner = "bluesky-social"; - repo = "indigo"; - rev = "fd270fbccf0ca858ed2eccdeff246a303c0be045"; - hash = "sha256-1WK3tMz8WbuIGTHYwD0or+9D0KVezhnv3EDdK11KKp8="; + repo = "goat"; + rev = "e79169f1d8fba9838274b1106d74751fc54eeb9c"; + hash = "sha256-cLS44J6MlSSti7NRd9vSsdWXoYiMGwt3odg5p60W6ew="; }; postPatch = '' - substituteInPlace cmd/goat/main.go \ + substituteInPlace main.go \ --replace-fail "versioninfo.Short()" '"${version}"' \ - --replace-fail '"github.com/carlmjohnson/versioninfo"' "" + --replace-fail '"github.com/earthboundkid/versioninfo/v2"' "" ''; - vendorHash = "sha256-pGc29fgJFq8LP7n/pY1cv6ExZl88PAeFqIbFEhB3xXs="; - - subPackages = [ "cmd/goat" ]; + vendorHash = "sha256-l9oSdTAO1YxfrBjMWJDzlmhaZkbo90FGTk5LedjbZB8="; passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; @@ -32,7 +30,7 @@ buildGoModule rec { meta = { description = "Go AT protocol CLI tool"; - homepage = "https://github.com/bluesky-social/indigo/blob/main/cmd/goat/README.md"; + homepage = "https://github.com/bluesky-social/goat/blob/main/README.md"; license = with lib.licenses; [ mit asl20 From 2942f3b68a19dcdab62ed841d1a9f28a3125201a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Aug 2025 13:51:37 +0000 Subject: [PATCH 63/74] k6: 1.1.0 -> 1.2.1 --- pkgs/by-name/k6/k6/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix index ecb04425e7db..7d16b8fa3317 100644 --- a/pkgs/by-name/k6/k6/package.nix +++ b/pkgs/by-name/k6/k6/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "k6"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "grafana"; repo = "k6"; rev = "v${version}"; - hash = "sha256-Xa0N2+yE886ftEoDJ13RyD4MZc62IswNVkd947fy0dY="; + hash = "sha256-5KOJfGqZbh6+oVfuayg3s4ldSgC0oi9Qv3/bqDK2Zpc="; }; subPackages = [ "./" ]; From f3410aef7de9792105060daa4fc0a857785e9913 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Aug 2025 14:04:04 +0000 Subject: [PATCH 64/74] gh-f: 1.4.0 -> 1.4.1 --- pkgs/by-name/gh/gh-f/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gh/gh-f/package.nix b/pkgs/by-name/gh/gh-f/package.nix index 0e2f3c598629..c1b6c4329f6e 100644 --- a/pkgs/by-name/gh/gh-f/package.nix +++ b/pkgs/by-name/gh/gh-f/package.nix @@ -25,13 +25,13 @@ let in stdenvNoCC.mkDerivation rec { pname = "gh-f"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "gh-f"; rev = "v${version}"; - hash = "sha256-JlMJ5RplEtQ8ApN3x1Sl0Lkutb5kLpuMJrF96oKZC9k="; + hash = "sha256-Jf7sDn/iRB/Lwz21fGLRduvt9/9cs5FFMhazULgj1ik="; }; nativeBuildInputs = [ From ec7268aa6452f9b6f14478c8c0bb922b3a91d275 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 13 Aug 2025 13:53:24 +0800 Subject: [PATCH 65/74] zfs: update supported platforms --- pkgs/os-specific/linux/zfs/generic.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 66d850ad71d6..d27fe8511434 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -341,19 +341,19 @@ let # `boot.zfs.enabled` property is `readOnly`, excluding platforms where ZFS # does not build is the only way to produce a NixOS installer on such # platforms. - # https://github.com/openzfs/zfs/blob/6723d1110f6daf93be93db74d5ea9f6b64c9bce5/config/always-arch.m4#L12 + # https://github.com/openzfs/zfs/blob/077269bfeddf2d35eb20f98289ac9d017b4a32ff/lib/libspl/include/sys/isa_defs.h#L267-L270 platforms = with lib.systems.inspect.patterns; - map (p: p // isLinux) ( - [ - isx86_32 - isx86_64 - isPower - isAarch64 - isSparc - ] - ++ isArmv7 - ); + map (p: p // isLinux) ([ + isx86 + isAarch + isPower + isS390 + isSparc + isMips + isRiscV64 + isLoongArch64 + ]); inherit maintainers; mainProgram = "zfs"; From 2974f70faed9836949a9710bd125334b061e8806 Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Wed, 13 Aug 2025 16:32:18 +0200 Subject: [PATCH 66/74] lux-cli: add missing hook to install shell files --- pkgs/by-name/lu/lux-cli/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix index 0f40eb01ed00..eff278517169 100644 --- a/pkgs/by-name/lu/lux-cli/package.nix +++ b/pkgs/by-name/lu/lux-cli/package.nix @@ -70,6 +70,11 @@ rustPlatform.buildRustPackage (finalAttrs: { cargo xtask dist-completions ''; + postInstall = '' + installManPage target/dist/lx.1 + installShellCompletion target/dist/lx.{bash,fish} --zsh target/dist/_lx + ''; + meta = { description = "Luxurious package manager for Lua"; longDescription = '' From e67667d6f3b89e1acbf4a1f358bf616613ae5453 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Aug 2025 15:08:29 +0000 Subject: [PATCH 67/74] xlights: 2025.07 -> 2025.08 --- pkgs/by-name/xl/xlights/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix index 5600a859cdd0..dffe70ad5962 100644 --- a/pkgs/by-name/xl/xlights/package.nix +++ b/pkgs/by-name/xl/xlights/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "xlights"; - version = "2025.07"; + version = "2025.08"; src = fetchurl { url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage"; - hash = "sha256-zkeRyCfcYlSQ8jkr8KO5YzO7U6BkUoXKKFNrS0I1C54="; + hash = "sha256-8cAn0cSytSJNA1IcU1JKROEObYpRpxVbeSz1PSsaFJg="; }; meta = { From a3e2680ff37438332086fb86ca6ccf886e974768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 12 Aug 2025 14:23:20 -0700 Subject: [PATCH 68/74] paperless-ngx: pin imap-tools at 1.10.0 --- pkgs/by-name/pa/paperless-ngx/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 84e93dc8cb72..dc0a33887179 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -40,6 +40,17 @@ let packageOverrides = final: prev: { django = prev.django_5_1; + # TODO remove when paperless-ngx is updated past 2.17.1 + imap-tools = prev.imap-tools.overridePythonAttrs { + version = "1.10.0"; + src = fetchFromGitHub { + owner = "ikvk"; + repo = "imap_tools"; + tag = "v1.10.0"; + hash = "sha256-lan12cHkoxCKadgyFey4ShcnwFg3Gl/VqKWlYAkvF3Y="; + }; + }; + # tesseract5 may be overwritten in the paperless module and we need to propagate that to make the closure reduction effective ocrmypdf = prev.ocrmypdf.override { tesseract = tesseract5; }; }; From a80d56eea2945d891f752e9d187b9975a1ac0c47 Mon Sep 17 00:00:00 2001 From: Devan Carpenter Date: Mon, 11 Aug 2025 18:37:22 -0500 Subject: [PATCH 69/74] vors: 3.1.0 -> 5.0.0 updateScript was not working due to a URL change, so that is fixed in this commit. I also took the opportunity to move to buildGoModule. --- pkgs/by-name/vo/vors/package.nix | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/vo/vors/package.nix b/pkgs/by-name/vo/vors/package.nix index b8c6dc90f9e5..4852cde0a6fa 100644 --- a/pkgs/by-name/vo/vors/package.nix +++ b/pkgs/by-name/vo/vors/package.nix @@ -11,21 +11,24 @@ pkg-config, opusfile, sox, + libogg, makeWrapper, + buildGoModule, }: -stdenv.mkDerivation (finalAttrs: { +buildGoModule (finalAttrs: { pname = "vors"; - version = "3.1.0"; + version = "5.0.0"; src = fetchurl { url = "http://www.vors.stargrave.org/download/vors-${finalAttrs.version}.tar.zst"; - hash = "sha256-ZRQI96j0n00eh1qxO8NgJeOQPU9bfzHoHa45xQNuzv8="; + hash = "sha256-DpwnhfexF/yw2emn1xrhKbGNbk9Z6wm5A2azQSAdmpA="; }; + vendorHash = null; buildInputs = [ - go opusfile + libogg sox ]; @@ -36,21 +39,26 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ]; + subPackages = [ + "cmd/vad" + "cmd/keygen" + "cmd/server" + "cmd/client" + ]; + preConfigure = "export GOCACHE=$NIX_BUILD_TOP/gocache"; - buildPhase = '' - runHook preBuild + preBuild = '' ./mk-non-static mkdir -p ./local/lib # Required to prevent building libopusfile - ./build - runHook postBuild ''; installPhase = '' runHook preInstall - mkdir -p "$out"/bin - cp -f bin/* "$out"/bin - chmod 755 "$out"/bin/* + install -Dm755 "$GOPATH"/bin/client "$out"/bin/vors-client + install -Dm755 "$GOPATH"/bin/keygen "$out"/bin/vors-keygen + install -Dm755 "$GOPATH"/bin/server "$out"/bin/vors-server + install -Dm755 "$GOPATH"/bin/vad "$out"/bin/vors-vad runHook postInstall ''; @@ -70,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { broken = stdenv.hostPlatform.isDarwin; description = "Very simple and usable multi-user VoIP solution"; - downloadPage = "http://www.vors.stargrave.org/Install.html"; + downloadPage = "http://www.vors.stargrave.org/INSTALL.html"; homepage = "http://www.vors.stargrave.org/"; license = lib.licenses.gpl3Only; longDescription = '' From c7922c88d4089da43983b90b65c1657f4b60f138 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 13 Aug 2025 18:49:18 +0300 Subject: [PATCH 70/74] vors: Sort all inputs --- pkgs/by-name/vo/vors/package.nix | 33 ++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/vo/vors/package.nix b/pkgs/by-name/vo/vors/package.nix index 4852cde0a6fa..c45192b2e6e5 100644 --- a/pkgs/by-name/vo/vors/package.nix +++ b/pkgs/by-name/vo/vors/package.nix @@ -1,19 +1,24 @@ { - curl, - fetchurl, lib, - genericUpdater, - go, - perl, stdenv, - writeShellScript, - zstd, - pkg-config, + buildGoModule, + fetchurl, + + # buildInputs + libogg, opusfile, sox, - libogg, + + # nativeBuildInputs makeWrapper, - buildGoModule, + perl, + pkg-config, + zstd, + + # updateScript + curl, + genericUpdater, + writeShellScript, }: buildGoModule (finalAttrs: { @@ -27,16 +32,16 @@ buildGoModule (finalAttrs: { vendorHash = null; buildInputs = [ - opusfile libogg + opusfile sox ]; nativeBuildInputs = [ - zstd - pkg-config - perl makeWrapper + perl + pkg-config + zstd ]; subPackages = [ From b7801adf4d35d41aed005b62d52c875fc431cee0 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 13 Aug 2025 12:01:06 -0400 Subject: [PATCH 71/74] consul: 1.21.3 -> 1.21.4 Diff: https://github.com/hashicorp/consul/compare/refs/tags/v1.21.3...refs/tags/v1.21.4 Changelog: https://github.com/hashicorp/consul/releases/tag/v1.21.4 --- pkgs/by-name/co/consul/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix index 2fb4a89be3b3..e467356f844b 100644 --- a/pkgs/by-name/co/consul/package.nix +++ b/pkgs/by-name/co/consul/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "consul"; - version = "1.21.3"; + version = "1.21.4"; # Note: Currently only release tags are supported, because they have the Consul UI # vendored. See @@ -22,7 +22,7 @@ buildGoModule rec { owner = "hashicorp"; repo = "consul"; tag = "v${version}"; - hash = "sha256-mWwDAlHbG0L/9xNAmUxAj2S5dDaWZaah/OWPndBRRWE="; + hash = "sha256-z2hyEqC8SnIac01VjB2g2+RAaZEaLlVsqBzwedx5t4Q="; }; # This corresponds to paths with package main - normally unneeded but consul @@ -32,7 +32,7 @@ buildGoModule rec { "connect/certgen" ]; - vendorHash = "sha256-jb/oUcqMHNBlDgqYNDai2Q9ChA98JGXwFHWNxnrMpaU="; + vendorHash = "sha256-fWdzFyRtbTOgAapmVz1ScYEHCZUx7nfqw0y2v4aDuic="; doCheck = false; From 7cd9b1612d99bd791991a900fcd4e10798b599d7 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Wed, 13 Aug 2025 18:14:01 +0200 Subject: [PATCH 72/74] mcp-nixos: 1.0.0 -> 1.0.1 https://github.com/utensils/mcp-nixos/releases/tag/v1.0.1 --- pkgs/by-name/mc/mcp-nixos/package.nix | 15 +++++++++------ .../mc/mcp-nixos/tests-mock-nix-channels.patch | 13 +++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/mc/mcp-nixos/package.nix b/pkgs/by-name/mc/mcp-nixos/package.nix index bc44ee41e5be..5263ca5546b6 100644 --- a/pkgs/by-name/mc/mcp-nixos/package.nix +++ b/pkgs/by-name/mc/mcp-nixos/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "mcp-nixos"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "utensils"; repo = "mcp-nixos"; tag = "v${version}"; - hash = "sha256-NwP+zM1VGLOzIm+mLZVK9/9ImFwuiWhRJ9QK3hGpQsY="; + hash = "sha256-NFy38FrU4N+bk4qGyRnrpf2AaBrlQyC9SyRbCLm/d9Y="; }; patches = [ @@ -25,10 +25,13 @@ python3Packages.buildPythonApplication rec { dependencies = with python3Packages; [ beautifulsoup4 + fastmcp mcp requests ]; + pythonRelaxDeps = [ "fastmcp" ]; + nativeCheckInputs = with python3Packages; [ anthropic pytestCheckHook @@ -43,11 +46,11 @@ python3Packages.buildPythonApplication rec { disabledTestPaths = [ # Require network access - "tests/test_nixhub_evals.py" - "tests/test_mcp_behavior_evals.py" - "tests/test_option_info_improvements.py" + "tests/test_nixhub.py" + "tests/test_mcp_behavior.py" + "tests/test_options.py" # Requires configured channels - "tests/test_dynamic_channels.py" + "tests/test_channels.py" ]; pythonImportsCheck = [ "mcp_nixos" ]; diff --git a/pkgs/by-name/mc/mcp-nixos/tests-mock-nix-channels.patch b/pkgs/by-name/mc/mcp-nixos/tests-mock-nix-channels.patch index b7fc92841ab8..0aca953007cf 100644 --- a/pkgs/by-name/mc/mcp-nixos/tests-mock-nix-channels.patch +++ b/pkgs/by-name/mc/mcp-nixos/tests-mock-nix-channels.patch @@ -1,11 +1,12 @@ diff --git a/tests/conftest.py b/tests/conftest.py -index 0a11295..1172182 100644 +index baae124..2b4bf01 100644 --- a/tests/conftest.py +++ b/tests/conftest.py -@@ -3,6 +3,30 @@ - import pytest # pylint: disable=unused-import +@@ -1,6 +1,27 @@ + """Minimal test configuration for refactored MCP-NixOS.""" ++import pytest +@pytest.fixture(autouse=True) +def mock_get_channels(monkeypatch): + """Mock get_channels function to return fixed channels for all tests.""" @@ -23,11 +24,7 @@ index 0a11295..1172182 100644 + monkeypatch.setattr('mcp_nixos.server.get_channels', mock_channels) + + # Also patch any imported references in test modules -+ monkeypatch.setattr('tests.test_channel_handling.get_channels', mock_channels) -+ monkeypatch.setattr('tests.test_dynamic_channels.get_channels', mock_channels, raising=False) -+ monkeypatch.setattr('tests.test_mcp_behavior_comprehensive.get_channels', mock_channels, raising=False) -+ monkeypatch.setattr('tests.test_real_world_scenarios.get_channels', mock_channels, raising=False) -+ monkeypatch.setattr('tests.test_server_comprehensive.get_channels', mock_channels, raising=False) ++ monkeypatch.setattr('tests.test_server.get_channels', mock_channels) + + def pytest_addoption(parser): From e7221c7ce4d2fe50038713cccae972abc5f4afd3 Mon Sep 17 00:00:00 2001 From: Jeremy Fleischman Date: Wed, 13 Aug 2025 09:56:13 -0700 Subject: [PATCH 73/74] Revert "treewide: drop usage of nixfmt-rfc-style alias" This reverts commit c19b2c3c49ef67868f583c9fd12d43cdabb47c37. As per the discussion [here](https://github.com/NixOS/nixpkgs/pull/433100#issuecomment-3184482777), it's too early to drop usage of the alias in documentation. Removing the references is tracked by , which a member of the Nix Formatting team will do when the time is right. --- doc/languages-frameworks/python.section.md | 2 +- pkgs/applications/editors/vscode/extensions/README.md | 2 +- pkgs/by-name/gr/gren/update.sh | 2 +- pkgs/by-name/ni/nixfmt-tree/package.nix | 2 +- pkgs/os-specific/linux/kernel/update-xanmod.sh | 2 +- pkgs/servers/x11/xorg/update.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index d4b3b0d66928..e79a324b236c 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -2121,7 +2121,7 @@ The following rules are desired to be respected: * `pythonImportsCheck` is set. This is still a good smoke test even if `pytestCheckHook` is set. * `meta.platforms` takes the default value in many cases. It does not need to be set explicitly unless the package requires a specific platform. -* The file is formatted with `nixfmt`. +* The file is formatted with `nixfmt-rfc-style`. * Commit names of Python libraries must reflect that they are Python libraries (e.g. `python313Packages.numpy: 1.11 -> 1.12` rather than `numpy: 1.11 -> 1.12`). * The current default version of python should be included diff --git a/pkgs/applications/editors/vscode/extensions/README.md b/pkgs/applications/editors/vscode/extensions/README.md index 59c45f1b2688..3977dc5a3e13 100644 --- a/pkgs/applications/editors/vscode/extensions/README.md +++ b/pkgs/applications/editors/vscode/extensions/README.md @@ -7,7 +7,7 @@ * When adding a new extension, place its definition in a `default.nix` file in a directory with the extension's ID (e.g. `publisher.extension-name/default.nix`) and refer to it in `./default.nix`, e.g. `publisher.extension-name = callPackage ./publisher.extension-name { };`. -* Currently `nixfmt` formatter is being used to format the VSCode extensions. +* Currently `nixfmt-rfc-style` formatter is being used to format the VSCode extensions. * Respect `alphabetical order` whenever adding extensions. On disorder, please, kindly open a PR re-establishing the order. diff --git a/pkgs/by-name/gr/gren/update.sh b/pkgs/by-name/gr/gren/update.sh index 9ebc456179cc..5c79129f4058 100755 --- a/pkgs/by-name/gr/gren/update.sh +++ b/pkgs/by-name/gr/gren/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p cabal2nix curl jq nix-update nixfmt +#!nix-shell -i bash -p cabal2nix curl jq nix-update nixfmt-rfc-style set -euo pipefail diff --git a/pkgs/by-name/ni/nixfmt-tree/package.nix b/pkgs/by-name/ni/nixfmt-tree/package.nix index 2d5c3a7f1422..d66d23ef3d2e 100644 --- a/pkgs/by-name/ni/nixfmt-tree/package.nix +++ b/pkgs/by-name/ni/nixfmt-tree/package.nix @@ -95,7 +95,7 @@ treefmtWithConfig.overrideAttrs { You can achieve similar results by manually configuring `treefmt`: ```nix pkgs.treefmt.withConfig { - runtimeInputs = [ pkgs.nixfmt ]; + runtimeInputs = [ pkgs.nixfmt-rfc-style ]; settings = { # Log level for files treefmt won't format diff --git a/pkgs/os-specific/linux/kernel/update-xanmod.sh b/pkgs/os-specific/linux/kernel/update-xanmod.sh index 2e1d9724db2d..fd786872fd3c 100755 --- a/pkgs/os-specific/linux/kernel/update-xanmod.sh +++ b/pkgs/os-specific/linux/kernel/update-xanmod.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash nix-prefetch curl jq gawk gnused nixfmt +#!nix-shell -i bash -p bash nix-prefetch curl jq gawk gnused nixfmt-rfc-style set -euo pipefail diff --git a/pkgs/servers/x11/xorg/update.py b/pkgs/servers/x11/xorg/update.py index 65a2fe190a17..a493f3821e5f 100755 --- a/pkgs/servers/x11/xorg/update.py +++ b/pkgs/servers/x11/xorg/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell --pure --keep NIX_PATH -i python3 -p nix git nixfmt "python3.withPackages (ps: [ ps. packaging ps.beautifulsoup4 ps.requests ])" +#!nix-shell --pure --keep NIX_PATH -i python3 -p nix git nixfmt-rfc-style "python3.withPackages (ps: [ ps. packaging ps.beautifulsoup4 ps.requests ])" # Usage: Run ./update.py from the directory containing tarballs.list. The script checks for the # latest versions of all packages, updates the expressions if any update is found, and commits From ae06776b858d4e4811a781b7918ef195efed36a5 Mon Sep 17 00:00:00 2001 From: Jeremy Fleischman Date: Wed, 13 Aug 2025 10:56:45 -0700 Subject: [PATCH 74/74] treewide: drop usage of `nixfmt-rfc-style` alias in update scripts --- pkgs/by-name/gr/gren/update.sh | 2 +- pkgs/os-specific/linux/kernel/update-xanmod.sh | 2 +- pkgs/servers/x11/xorg/update.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/gren/update.sh b/pkgs/by-name/gr/gren/update.sh index 5c79129f4058..9ebc456179cc 100755 --- a/pkgs/by-name/gr/gren/update.sh +++ b/pkgs/by-name/gr/gren/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p cabal2nix curl jq nix-update nixfmt-rfc-style +#!nix-shell -i bash -p cabal2nix curl jq nix-update nixfmt set -euo pipefail diff --git a/pkgs/os-specific/linux/kernel/update-xanmod.sh b/pkgs/os-specific/linux/kernel/update-xanmod.sh index fd786872fd3c..2e1d9724db2d 100755 --- a/pkgs/os-specific/linux/kernel/update-xanmod.sh +++ b/pkgs/os-specific/linux/kernel/update-xanmod.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash nix-prefetch curl jq gawk gnused nixfmt-rfc-style +#!nix-shell -i bash -p bash nix-prefetch curl jq gawk gnused nixfmt set -euo pipefail diff --git a/pkgs/servers/x11/xorg/update.py b/pkgs/servers/x11/xorg/update.py index a493f3821e5f..65a2fe190a17 100755 --- a/pkgs/servers/x11/xorg/update.py +++ b/pkgs/servers/x11/xorg/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell --pure --keep NIX_PATH -i python3 -p nix git nixfmt-rfc-style "python3.withPackages (ps: [ ps. packaging ps.beautifulsoup4 ps.requests ])" +#!nix-shell --pure --keep NIX_PATH -i python3 -p nix git nixfmt "python3.withPackages (ps: [ ps. packaging ps.beautifulsoup4 ps.requests ])" # Usage: Run ./update.py from the directory containing tarballs.list. The script checks for the # latest versions of all packages, updates the expressions if any update is found, and commits