From 757e22cb180e659cafb7e7bc532e42294c84dd5d Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 24 Dec 2024 12:40:30 +0100 Subject: [PATCH 01/97] tclPackages.tclcsv: init at 2.4.3 --- .../tcl-modules/by-name/tc/tclcsv/package.nix | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 pkgs/development/tcl-modules/by-name/tc/tclcsv/package.nix diff --git a/pkgs/development/tcl-modules/by-name/tc/tclcsv/package.nix b/pkgs/development/tcl-modules/by-name/tc/tclcsv/package.nix new file mode 100644 index 000000000000..d6fd55c06ad5 --- /dev/null +++ b/pkgs/development/tcl-modules/by-name/tc/tclcsv/package.nix @@ -0,0 +1,24 @@ +{ + lib, + mkTclDerivation, + fetchzip, +}: + +mkTclDerivation rec { + pname = "tclcsv"; + version = "2.4.3"; + + src = fetchzip { + url = "mirror://sourceforge/tclcsv/tclcsv${version}-src.tar.gz"; + hash = "sha256-bNRMgIyUSy4TnOGq9FPCXr79NIkcRfy2SqO5/i+DC/w="; + }; + + meta = { + changelog = "https://tclcsv.magicsplat.com/#_version_history"; + description = "Tcl extension for reading and writing CSV files"; + downloadPage = "https://sourceforge.net/projects/tclcsv/files/"; + homepage = "https://tclcsv.magicsplat.com/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fgaz ]; + }; +} From 6723f3050ba5f01bf2a7cce7df88f08f05ab67bc Mon Sep 17 00:00:00 2001 From: Matt Schreiber Date: Wed, 19 Mar 2025 13:49:12 -0400 Subject: [PATCH 02/97] nixos/gemstash: add `package` option --- nixos/modules/services/development/gemstash.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/development/gemstash.nix b/nixos/modules/services/development/gemstash.nix index 442a6630af8d..23611b41a358 100644 --- a/nixos/modules/services/development/gemstash.nix +++ b/nixos/modules/services/development/gemstash.nix @@ -36,6 +36,8 @@ in ''; }; + package = lib.mkPackageOption pkgs "gemstash" { }; + settings = lib.mkOption { default = { }; description = '' @@ -96,7 +98,7 @@ in after = [ "network.target" ]; serviceConfig = lib.mkMerge [ { - ExecStart = "${pkgs.gemstash}/bin/gemstash start --no-daemonize --config-file ${settingsFormat.generate "gemstash.yaml" (prefixColon cfg.settings)}"; + ExecStart = "${lib.getExe cfg.package} start --no-daemonize --config-file ${settingsFormat.generate "gemstash.yaml" (prefixColon cfg.settings)}"; NoNewPrivileges = true; User = "gemstash"; Group = "gemstash"; From b5070c775ca8fd367b23c17589ba8ea90eee4dfb Mon Sep 17 00:00:00 2001 From: trev Date: Mon, 22 Sep 2025 19:01:56 -0400 Subject: [PATCH 03/97] maintainers: add spotdemo4 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 09ca05897dba..1fe7246b5fd1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -24411,6 +24411,12 @@ name = "sportshead"; keys = [ { fingerprint = "A6B6 D031 782E BDF7 631A 8E7E A874 DB2C BFD3 CFD0"; } ]; }; + spotdemo4 = { + email = "me@trev.xyz"; + github = "spotdemo4"; + githubId = 3732640; + name = "spotdemo4"; + }; spreetin = { email = "spreetin@protonmail.com"; name = "David Falk"; From 4fd94463f1d1f39dc165a53b230ee96c6e63184d Mon Sep 17 00:00:00 2001 From: Wilaz <98198668+Wilaz@users.noreply.github.com> Date: Fri, 24 Oct 2025 23:52:47 -0400 Subject: [PATCH 04/97] maintainers: add wilaz --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1a80919715aa..3218c0c287f1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -27869,6 +27869,11 @@ } ]; }; + wilaz = { + name = "Wilaz"; + github = "Wilaz"; + githubId = 98198668; + }; wildsebastian = { name = "Sebastian Wild"; email = "sebastian@wild-siena.com"; From 44ec67a335e10fad6f664c1839fcf906d920650b Mon Sep 17 00:00:00 2001 From: spotdemo4 Date: Tue, 20 Jan 2026 14:04:56 -0500 Subject: [PATCH 05/97] bobgen: init at 0.42.0 --- pkgs/by-name/bo/bobgen/package.nix | 40 ++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/bo/bobgen/package.nix diff --git a/pkgs/by-name/bo/bobgen/package.nix b/pkgs/by-name/bo/bobgen/package.nix new file mode 100644 index 000000000000..ddb7529aac7b --- /dev/null +++ b/pkgs/by-name/bo/bobgen/package.nix @@ -0,0 +1,40 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "bobgen"; + version = "0.42.0"; + + src = fetchFromGitHub { + owner = "stephenafamo"; + repo = "bob"; + tag = "v${finalAttrs.version}"; + hash = "sha256-reTvQDUqsRmdl0RyCWoUoF8dc/ZrSZxR8x8++VC4H3A="; + }; + + vendorHash = "sha256-Jqlah37+tfNqsgeL/MnbVUmSfU2JWMJDb9AQrEqXnXU="; + + subPackages = [ + "gen/bobgen-sql" + "gen/bobgen-psql" + "gen/bobgen-mysql" + "gen/bobgen-sqlite" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "SQL query builder and ORM/Factory generator for Go"; + homepage = "https://github.com/stephenafamo/bob"; + changelog = "https://github.com/stephenafamo/bob/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + spotdemo4 + ]; + platforms = lib.platforms.all; + }; +}) From d01533ba4e52a4b6eb2b55811fe9b9935ba7ebd0 Mon Sep 17 00:00:00 2001 From: ricmaps Date: Thu, 19 Feb 2026 19:39:36 -0300 Subject: [PATCH 06/97] maintainers: add ricardomaps --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fdba52e7b39f..da913e21fadf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -22612,6 +22612,13 @@ githubId = 61013287; name = "Ricardo Steijn"; }; + ricardomaps = { + email = "ricardomapurungajunior@gmail.com"; + github = "ricardomaps"; + githubId = 49507078; + name = "Ricardo Mapurunga Junior"; + matrix = "@ricmaps:matrix.org"; + }; richar = { github = "ri-char"; githubId = 17962023; From 52e826e1b4b0d3e74f16004c23c4ac14ae6a280d Mon Sep 17 00:00:00 2001 From: ricmaps Date: Thu, 19 Feb 2026 19:40:24 -0300 Subject: [PATCH 07/97] leet-helix: init at 0.2.3-unstable-2026-02-24 --- pkgs/by-name/le/leet-helix/package.nix | 49 ++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/le/leet-helix/package.nix diff --git a/pkgs/by-name/le/leet-helix/package.nix b/pkgs/by-name/le/leet-helix/package.nix new file mode 100644 index 000000000000..fe4b233459d2 --- /dev/null +++ b/pkgs/by-name/le/leet-helix/package.nix @@ -0,0 +1,49 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + nix-update-script, +}: + +python3Packages.buildPythonApplication { + pname = "leet-helix"; + version = "0.2.3-unstable-2026-02-24"; + + src = fetchFromGitHub { + owner = "Jarrlist"; + repo = "LeetHelix"; + rev = "d6e07920242ce852453d3d3b47d9418fda8baa8a"; + hash = "sha256-29RMI66tvSJxh1P2osRCJLvIXbwPy2lPPqtEsKQIWe4="; + }; + + pyproject = true; + + dependencies = with python3Packages; [ + typer + rich + sqlmodel + sqlite-utils + ]; + + build-system = [ python3Packages.hatchling ]; + + # necessary for tests which require a writable home + preBuild = '' + export HOME=$(mktemp -d) + ''; + + doCheck = true; + + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=HEAD" ]; }; + + meta = { + description = "Game to practice your Helix editor skills with code challenges"; + license = lib.licenses.mit; + homepage = "https://github.com/Jarrlist/LeetHelix"; + maintainers = [ lib.maintainers.ricardomaps ]; + platforms = lib.platforms.all; + mainProgram = "leet"; + }; +} From 033ce4d4815b92d816958c84b22c977c9190eebc Mon Sep 17 00:00:00 2001 From: Wilaz <98198668+Wilaz@users.noreply.github.com> Date: Sat, 25 Oct 2025 00:00:05 -0400 Subject: [PATCH 08/97] chameleonultragui: init at 1.3 chameleonultragui: init at 1.3 --- .../ch/chameleonultragui/git_hashes.json | 5 + pkgs/by-name/ch/chameleonultragui/package.nix | 56 + .../ch/chameleonultragui/pubspec.lock.json | 1211 +++++++++++++++++ 3 files changed, 1272 insertions(+) create mode 100644 pkgs/by-name/ch/chameleonultragui/git_hashes.json create mode 100644 pkgs/by-name/ch/chameleonultragui/package.nix create mode 100644 pkgs/by-name/ch/chameleonultragui/pubspec.lock.json diff --git a/pkgs/by-name/ch/chameleonultragui/git_hashes.json b/pkgs/by-name/ch/chameleonultragui/git_hashes.json new file mode 100644 index 000000000000..e7579ded4f02 --- /dev/null +++ b/pkgs/by-name/ch/chameleonultragui/git_hashes.json @@ -0,0 +1,5 @@ +{ + "file_saver": "sha256-3T4UVDkhjTmLakQqJ0/WCP9NOQlONHAzeK+y5gY7qa8=", + "flutter_libserialport": "sha256-Ksj5U94kCoe5FQ85m4Ui0t+Z4ME94E6TcDq45Xms0dE=", + "usb_serial": "sha256-sqGd5ECWVkqsW5ZGlnCV1veHsp0p7inBX2240Xe6NiU=" +} \ No newline at end of file diff --git a/pkgs/by-name/ch/chameleonultragui/package.nix b/pkgs/by-name/ch/chameleonultragui/package.nix new file mode 100644 index 000000000000..f5f34d959b93 --- /dev/null +++ b/pkgs/by-name/ch/chameleonultragui/package.nix @@ -0,0 +1,56 @@ +{ + lib, + flutter335, + fetchFromGitHub, + autoPatchelfHook, + zenity, + ninja, +}: + +flutter335.buildFlutterApplication rec { + pname = "chameleonultragui"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "GameTec-live"; + repo = "ChameleonUltraGUI"; + tag = version; + hash = "sha256-9Hwjx1nt/QD520eLMAB5xyFjOGfjZSwS83ARNn8GsFo="; + }; + + sourceRoot = "${src.name}/chameleonultragui"; + + # curl https://raw.githubusercontent.com/GameTec-live/ChameleonUltraGUI/main/chameleonultragui/pubspec.lock | yq > pubspec.lock.json + pubspecLock = lib.importJSON ./pubspec.lock.json; + gitHashes = lib.importJSON ./git_hashes.json; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + zenity + ninja + ]; + + postPatch = '' + substituteInPlace linux/main.cc \ + --replace-fail '"../shared", "librecovery.so"' '"lib", "librecovery.so"' + ''; + + postInstall = '' + install -Dm0644 aur/chameleonultragui.desktop $out/share/applications/chameleonultragui.desktop + install -Dm0644 aur/chameleonultragui.png $out/share/pixmaps/chameleonultragui.png + install -Dm0644 build/linux/*/release/shared/librecovery.so $out/app/chameleonultragui/lib + ''; + + meta = { + description = "Cross platform GUI for the Chameleon Ultra written in flutter"; + homepage = "https://github.com/GameTec-live/ChameleonUltraGUI"; + changelog = "https://github.com/GameTec-live/ChameleonUltraGUI/releases/${version}"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + mainProgram = "chameleonultragui"; + maintainers = with lib.maintainers; [ wilaz ]; + }; +} diff --git a/pkgs/by-name/ch/chameleonultragui/pubspec.lock.json b/pkgs/by-name/ch/chameleonultragui/pubspec.lock.json new file mode 100644 index 000000000000..cc59cd58d1d8 --- /dev/null +++ b/pkgs/by-name/ch/chameleonultragui/pubspec.lock.json @@ -0,0 +1,1211 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "91.0.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "a40a0cee526a7e1f387c6847bd8a5ccbf510a75952ef8a28338e989558072cb0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.4.0" + }, + "archive": { + "dependency": "direct main", + "description": { + "name": "archive", + "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.7" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "async": { + "dependency": "direct main", + "description": { + "name": "async", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.13.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", + "url": "https://pub.dev" + }, + "source": "hosted", + "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", + "description": { + "name": "clock", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "convert": { + "dependency": "direct main", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4+2" + }, + "crypto": { + "dependency": "direct main", + "description": { + "name": "crypto", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.6" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.11" + }, + "dio": { + "dependency": "transitive", + "description": { + "name": "dio", + "sha256": "d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.9.0" + }, + "dio_web_adapter": { + "dependency": "transitive", + "description": { + "name": "dio_web_adapter", + "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "dylib": { + "dependency": "direct main", + "description": { + "name": "dylib", + "sha256": "bf609b3eb6492a3309b3d1dbe8f83a4031de5535dd7686be33487051cc760bb0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.3" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.3" + }, + "ffi": { + "dependency": "direct main", + "description": { + "name": "ffi", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "ffigen": { + "dependency": "direct main", + "description": { + "name": "ffigen", + "sha256": "2bd9a420ca42cb5ce8cff5d80f88547b547a042ae26807704b1698714e4464a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "19.1.0" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "file_picker": { + "dependency": "direct main", + "description": { + "name": "file_picker", + "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.3.3" + }, + "file_saver": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "fix-windows", + "resolved-ref": "f479ab01e15caf4b69027e3efe53bda5abc3ff1b", + "url": "https://github.com/ChameleonUltraGUI/file_saver.git" + }, + "source": "git", + "version": "0.2.14" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_colorpicker": { + "dependency": "direct main", + "description": { + "name": "flutter_colorpicker", + "sha256": "969de5f6f9e2a570ac660fb7b501551451ea2a1ab9e2097e89475f60e07816ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "flutter_launcher_icons": { + "dependency": "direct dev", + "description": { + "name": "flutter_launcher_icons", + "sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.14.4" + }, + "flutter_libserialport": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "main", + "resolved-ref": "dc2899f2b2139c7cf1352bdb57e51ca8ee833635", + "url": "https://github.com/ChameleonUltraGUI/flutter_libserialport.git" + }, + "source": "git", + "version": "0.5.0" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "flutter_localizations": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "306f0596590e077338312f38837f595c04f28d6cdeeac392d3d74df2f0003687", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.32" + }, + "flutter_reactive_ble": { + "dependency": "direct main", + "description": { + "name": "flutter_reactive_ble", + "sha256": "3ca8430bc7a6cabe5529aab4afaa2e3cb285941f7f7ab7472604074e347c1302", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.4.0" + }, + "flutter_staggered_grid_view": { + "dependency": "direct main", + "description": { + "name": "flutter_staggered_grid_view", + "sha256": "19e7abb550c96fbfeb546b23f3ff356ee7c59a019a651f8f102a4ba9b7349395", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "functional_data": { + "dependency": "transitive", + "description": { + "name": "functional_data", + "sha256": "76d17dc707c40e552014f5a49c0afcc3f1e3f05e800cd6b7872940bfe41a5039", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "image": { + "dependency": "transitive", + "description": { + "name": "image", + "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.4" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.20.2" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.0.2" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.10" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "libserialport": { + "dependency": "transitive", + "description": { + "name": "libserialport", + "sha256": "392e1592def65282429832ec66fa25e9e163d3b37716b97691482e2406720727", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.0+1" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "logger": { + "dependency": "direct main", + "description": { + "name": "logger", + "sha256": "a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.2" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.17" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.17.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "mobile_scanner": { + "dependency": "direct main", + "description": { + "name": "mobile_scanner", + "sha256": "023a71afb4d7cfb5529d0f2636aa8b43db66257905b9486d702085989769c5f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.1.3" + }, + "nested": { + "dependency": "transitive", + "description": { + "name": "nested", + "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.0.0" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "path_provider": { + "dependency": "transitive", + "description": { + "name": "path_provider", + "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.5" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "e122c5ea805bb6773bb12ce667611265980940145be920cd09a4b0ec0285cb16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.20" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "efaec349ddfc181528345c56f8eda9d6cccd71c177511b132c6a0ddaefaa2738", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.3" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "permission_handler": { + "dependency": "direct main", + "description": { + "name": "permission_handler", + "sha256": "bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.0.1" + }, + "permission_handler_android": { + "dependency": "transitive", + "description": { + "name": "permission_handler_android", + "sha256": "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "13.0.1" + }, + "permission_handler_apple": { + "dependency": "transitive", + "description": { + "name": "permission_handler_apple", + "sha256": "f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.4.7" + }, + "permission_handler_html": { + "dependency": "transitive", + "description": { + "name": "permission_handler_html", + "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3+5" + }, + "permission_handler_platform_interface": { + "dependency": "transitive", + "description": { + "name": "permission_handler_platform_interface", + "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "permission_handler_windows": { + "dependency": "transitive", + "description": { + "name": "permission_handler_windows", + "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.3" + }, + "protobuf": { + "dependency": "direct main", + "description": { + "name": "protobuf", + "sha256": "01dd9bd0fa02548bf2ceee13545d4a0ec6046459d847b6b061d8a27237108a08", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "provider": { + "dependency": "direct main", + "description": { + "name": "provider", + "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.5+1" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "qr": { + "dependency": "transitive", + "description": { + "name": "qr", + "sha256": "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "qr_flutter": { + "dependency": "direct main", + "description": { + "name": "qr_flutter", + "sha256": "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "quiver": { + "dependency": "transitive", + "description": { + "name": "quiver", + "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "reactive_ble_mobile": { + "dependency": "transitive", + "description": { + "name": "reactive_ble_mobile", + "sha256": "78af92cfb184770a277a8bdaa76b396a28dbada8931f3d8d0ff552414681f5db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.4.0" + }, + "reactive_ble_platform_interface": { + "dependency": "transitive", + "description": { + "name": "reactive_ble_platform_interface", + "sha256": "d0e6f86c7ee3865b74d8a7b6deb1fb8320b24176dfd9a3e475f84b7117eb42c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.4.0" + }, + "shared_preferences": { + "dependency": "direct main", + "description": { + "name": "shared_preferences", + "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.3" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "34266009473bf71d748912da4bf62d439185226c03e01e2d9687bc65bbfcb713", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.15" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "1c33a907142607c40a7542768ec9badfd16293bac51da3a4482623d15845f88b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.5" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.3" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.1" + }, + "sprintf": { + "dependency": "transitive", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.7" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.2" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "5c8b6c2d89a78f5a1cca70a73d9d5f86c701b36b42f9c9dac7bad592113c28e9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.24" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "6b63f1441e4f653ae799166a72b50b1767321ecc263a57aadf825a7a2a5477d9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.5" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "8262208506252a3ed4ff5c0dc1e973d2c0e0ef337d0a074d35634da5d44397c9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.4" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.4" + }, + "usb_serial": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "fix-usbserial", + "resolved-ref": "6e546df992f0e62589b592d81beed5f6bd24784c", + "url": "https://github.com/ChameleonUltraGUI/usbserial.git" + }, + "source": "git", + "version": "0.5.1" + }, + "uuid": { + "dependency": "direct main", + "description": { + "name": "uuid", + "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.1" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "15.0.2" + }, + "wakelock_plus": { + "dependency": "direct main", + "description": { + "name": "wakelock_plus", + "sha256": "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "wakelock_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "wakelock_plus_platform_interface", + "sha256": "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.4" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.15.0" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.6.1" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "yaml_edit": { + "dependency": "transitive", + "description": { + "name": "yaml_edit", + "sha256": "fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.2" + } + }, + "sdks": { + "dart": ">=3.9.0 <4.0.0", + "flutter": ">=3.35.0" + } +} From 2c8076cce1e35aac1a3f182cfaebf03bc78bb232 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 20 Apr 2026 15:12:31 +0200 Subject: [PATCH 09/97] ci/OWNERS: add myself to some critical components Those are currently missing any maintainer, but they really should have some that get pinged if they are touched. I also personally edited them at some point and read them to the level of having at least the basic understanding of how to perform a review for them. --- ci/OWNERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ci/OWNERS b/ci/OWNERS index 7d5d50fd8ff4..dae0de66ef2c 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -56,6 +56,12 @@ /pkgs/top-level/splice.nix @Ericson2314 /pkgs/top-level/release-cross.nix @Ericson2314 /pkgs/top-level/by-name-overlay.nix @infinisil @philiptaron +/pkgs/top-level/config.nix @jopejoe1 +/pkgs/top-level/make-tarball.nix @jopejoe1 +/pkgs/top-level/packages-config.nix @jopejoe1 +/pkgs/top-level/packages-info.nix @jopejoe1 +/pkgs/top-level/release-lib.nix @jopejoe1 +/pkgs/top-level/release.nix @jopejoe1 /pkgs/stdenv @philiptaron @NixOS/stdenv /pkgs/stdenv/generic @Ericson2314 @NixOS/stdenv /pkgs/stdenv/generic/problems.nix @infinisil From e7fe386d335c4c63d83c3e6d1fae4ca4a4d320a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= Date: Sat, 25 Apr 2026 14:45:03 +0200 Subject: [PATCH 10/97] fwupd: 2.1.1 -> 2.1.2 Diff: https://github.com/fwupd/fwupd/compare/2.1.1...2.1.2 Changelog: https://github.com/fwupd/fwupd/releases/tag/2.1.2 --- pkgs/by-name/fw/fwupd/package.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index 9e679f45d6d2..9a6ff382fc2e 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -3,7 +3,6 @@ { lib, stdenv, - fetchpatch, # runPythonCommand runCommand, @@ -37,7 +36,6 @@ fwupd-efi, gnutls, gusb, - libcbor, libdrm, libgudev, libjcat, @@ -129,7 +127,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "2.1.1"; + version = "2.1.2"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -147,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; tag = finalAttrs.version; - hash = "sha256-pb5BBA+3KTeZZ8WyNDaY9EKNTxp4MT/3G/MEgQ+Nysk="; + hash = "sha256-lNbm1E2Lqo8gXMNl6NodFNWhSizSxVIG1p5PI8Wj1Xw="; }; patches = [ @@ -168,18 +166,6 @@ stdenv.mkDerivation (finalAttrs: { # EFI capsule is located in fwupd-efi now. ./0004-Get-the-efi-app-from-fwupd-efi.patch - - # FIXME: remove patches that fix CI on aarch64 after next release - (fetchpatch { - url = "https://github.com/fwupd/fwupd/commit/b3d721360faa4de7dd6960d8f9f8f13aa310715f.patch"; - sha256 = "sha256-x37QCK7XBzUUjUj1m3jaNe1qvaqtszB9DGFyF8gC3Ig="; - name = "fix-mtdram-test-for-missing-kernel-module.patch"; - }) - (fetchpatch { - url = "https://github.com/fwupd/fwupd/commit/9ad8b76dc6c5af005a2c712ae3a6f352b51e9eea.patch"; - sha256 = "sha256-h9zLTHeJbfDoamdfICKc0ohQ51yJC4I/CK0SQ4H6rRk="; - name = "fix-test_get_devices-on-non-x86-architectures.patch"; - }) ]; postPatch = '' @@ -230,7 +216,6 @@ stdenv.mkDerivation (finalAttrs: { fwupd-efi gnutls gusb - libcbor libdrm libgudev libjcat From 536344fcfb22818e3e46faece30d1bea9008bb5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= Date: Sat, 25 Apr 2026 14:45:04 +0200 Subject: [PATCH 11/97] fwupd: put jcat-tool on path for tests --- pkgs/by-name/fw/fwupd/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index 9a6ff382fc2e..1828d32f54cb 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (finalAttrs: { gettext gi-docgen gobject-introspection + libjcat.bin libxml2 meson ninja From 6fe767482459784ff84968092eb7b678edcce098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= Date: Sat, 25 Apr 2026 14:45:04 +0200 Subject: [PATCH 12/97] fwupd: rm superfluous meson feature enable flags Because stdenv instructs meson to enable all features automatically, it's redundant to have any lib.mesonEnable that just sets a literal true. Keeping the `supported_build` feature flag to explicitly convey the intention behind it. --- pkgs/by-name/fw/fwupd/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index 1828d32f54cb..8612011cc8cc 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -239,7 +239,6 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - (lib.mesonEnable "docs" true) # We are building the official releases. (lib.mesonEnable "supported_build" true) (lib.mesonOption "systemd_root_prefix" "${placeholder "out"}") @@ -248,7 +247,6 @@ stdenv.mkDerivation (finalAttrs: { "--sysconfdir=/etc" (lib.mesonOption "sysconfdir_install" "${placeholder "out"}/etc") (lib.mesonOption "efi_os_dir" "nixos") - (lib.mesonEnable "plugin_modem_manager" true) # HSI is auto-disabled on non-x86 upstream; auto_features=enabled overrides # that, breaking the fwupdtool installed test which expects rc=1 on non-x86. (lib.mesonEnable "hsi" isx86) From 2a451d7b9d118c0cba74e09b013ab69ac1a79ae7 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 1 May 2026 16:51:12 -0400 Subject: [PATCH 13/97] python313Packages.flask-admin: 2.0.2 -> 2.1.0 Diff: https://github.com/flask-admin/flask-admin/compare/v2.0.2...v2.1.0 Changelog: https://github.com/flask-admin/flask-admin/releases/tag/v2.1.0 --- .../development/python-modules/flask-admin/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index 0ce8626d7114..1cc2e1fbc908 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -13,6 +13,8 @@ # sqlalchemy flask-sqlalchemy, sqlalchemy, + # sqlalchemy-lite + flask-sqlalchemy-lite, # sqlalchemy-with-utils arrow, colour, @@ -50,14 +52,14 @@ buildPythonPackage rec { pname = "flask-admin"; - version = "2.0.2"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "flask-admin"; repo = "flask-admin"; tag = "v${version}"; - hash = "sha256-HjK+ddMtT8QJ/KSFj9v28jflf2f6M+Gx1rJjCdWUUFM="; + hash = "sha256-xEVsYYwpcHMyvlmUYDviM5MLVz8bWLShUW6GOpfAmro="; }; build-system = [ flit-core ]; @@ -75,6 +77,9 @@ buildPythonPackage rec { flask-sqlalchemy sqlalchemy ]; + sqlalchemy-lite = [ + flask-sqlalchemy-lite + ]; sqlalchemy-with-utils = optional-dependencies.sqlalchemy ++ [ arrow colour @@ -121,6 +126,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten [ + optional-dependencies.sqlalchemy-lite optional-dependencies.sqlalchemy-with-utils optional-dependencies.mongoengine optional-dependencies.peewee From a9962768fe0b12024a41876df8ef51db867caff7 Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Fri, 8 May 2026 02:57:32 +0200 Subject: [PATCH 14/97] minizip-ng: fixup cmake options and make use of lib.cmakeBool --- pkgs/by-name/mi/minizip-ng/package.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/mi/minizip-ng/package.nix b/pkgs/by-name/mi/minizip-ng/package.nix index e58665f269d3..ceee5ea293a7 100644 --- a/pkgs/by-name/mi/minizip-ng/package.nix +++ b/pkgs/by-name/mi/minizip-ng/package.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config ]; + buildInputs = [ zlib bzip2 @@ -36,19 +37,16 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - "-DMZ_OPENSSL=ON" - "-DMZ_BUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" - "-DMZ_BUILD_UNIT_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" - "-DMZ_LIB_SUFFIX='-ng'" + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + (lib.cmakeBool "MZ_OPENSSL" true) + (lib.cmakeBool "MZ_LIBCOMP" false) # builds only on Darwin by default where it fails due to mising headers + (lib.cmakeBool "MZ_BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "MZ_BUILD_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeFeature "MZ_LIB_SUFFIX" "-ng") ] ++ lib.optionals stdenv.hostPlatform.isi686 [ # tests fail - "-DMZ_PKCRYPT=OFF" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # missing header file - "-DMZ_LIBCOMP=OFF" + (lib.cmakeBool "MZ_PKCRYPT" false) ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-register"; From b8e97ce15685cbfb57b4d11691d615ba1383a0c8 Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Fri, 8 May 2026 02:41:17 +0200 Subject: [PATCH 15/97] minizip-ng: 4.1.0 -> 4.2.1 --- pkgs/by-name/mi/minizip-ng/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/minizip-ng/package.nix b/pkgs/by-name/mi/minizip-ng/package.nix index ceee5ea293a7..811fa61093be 100644 --- a/pkgs/by-name/mi/minizip-ng/package.nix +++ b/pkgs/by-name/mi/minizip-ng/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizip-ng"; - version = "4.1.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "minizip-ng"; rev = finalAttrs.version; - hash = "sha256-H6ttsVBs437lWMBsq5baVDb9e5I6Fh+xggFre/hxGKU="; + hash = "sha256-gpjM8Cqoe4kafXgl2wXhhCRx39WC94qJ1DIDyd2n0G8="; }; nativeBuildInputs = [ @@ -39,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "MZ_OPENSSL" true) + (lib.cmakeBool "MZ_PPMD" false) # PPMD support requres internet access to make a git clone (lib.cmakeBool "MZ_LIBCOMP" false) # builds only on Darwin by default where it fails due to mising headers (lib.cmakeBool "MZ_BUILD_TESTS" finalAttrs.doCheck) (lib.cmakeBool "MZ_BUILD_UNIT_TESTS" finalAttrs.doCheck) From 7a93b978268f705ce5498433c81b9aaf6b220b1c Mon Sep 17 00:00:00 2001 From: Marius Niveri Date: Sun, 10 May 2026 21:31:21 +0200 Subject: [PATCH 16/97] maintainers: add m4r1vs --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8d804af54824..12fdb4015293 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16390,6 +16390,12 @@ githubId = 8094643; keys = [ { fingerprint = "BAA9 7711 58CA D457 B4AE 8B06 8188 423D 2FA2 0A65"; } ]; }; + m4r1vs = { + email = "marius.niveri@gmail.com"; + name = "Marius Niveri"; + github = "m4r1vs"; + githubId = 26097311; + }; m7medvision = { name = "Mohammed"; github = "m7medVision"; From 6f2c0a34f359f019a961a8b63d92c70c4995ff5f Mon Sep 17 00:00:00 2001 From: Sean Gilligan Date: Tue, 12 May 2026 22:00:45 -0700 Subject: [PATCH 17/97] jextract: fix build on Darwin Apply the Linux patch to the initialization string for `clang_path_include` instead of replacing `clang_path_include` with the patched string. This allows the correct value for Darwin to be selected by the ternary expression. --- pkgs/by-name/je/jextract/copy_lib_clang.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/je/jextract/copy_lib_clang.patch b/pkgs/by-name/je/jextract/copy_lib_clang.patch index 4b910ae275bd..5c636b5ea21c 100644 --- a/pkgs/by-name/je/jextract/copy_lib_clang.patch +++ b/pkgs/by-name/je/jextract/copy_lib_clang.patch @@ -1,13 +1,13 @@ diff --git a/build.gradle b/build.gradle -index 9ce544a..0c77609 100644 +index 9ce544a..9445e97 100644 --- a/build.gradle +++ b/build.gradle -@@ -79,7 +79,7 @@ task copyLibClang(type: Sync) { - "libclang.so.${clang_version}" : "*clang*" +@@ -76,7 +76,7 @@ task copyLibClang(type: Sync) { + // make sure we only pick up the "real" shared library file from LLVM installation + // (e.g. exclude symlinks on Linux) + def clang_path_include = (Os.isFamily(Os.FAMILY_UNIX) && !Os.isFamily(Os.FAMILY_MAC)) ? +- "libclang.so.${clang_version}" : "*clang*" ++ "libclang.so*" : "*clang*" from("${libclang_dir}") { -- include(clang_path_include) -+ include("libclang.so*") - include("libLLVM.*") - exclude("clang.exe") - into("libs") + include(clang_path_include) From 5254c12c214c19b56f54fc610bc6974e01ce94e4 Mon Sep 17 00:00:00 2001 From: Sean Gilligan Date: Wed, 13 May 2026 16:57:57 -0700 Subject: [PATCH 18/97] jextract-21: remove Upstream was an early-access release and is unmaintained. Note also that the first LTS release of Java to support the FFM API is JDK 25. jextract (currently based on JDK 25) should be used instead. --- pkgs/by-name/je/jextract-21/package.nix | 54 ------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 pkgs/by-name/je/jextract-21/package.nix diff --git a/pkgs/by-name/je/jextract-21/package.nix b/pkgs/by-name/je/jextract-21/package.nix deleted file mode 100644 index ee87170a7011..000000000000 --- a/pkgs/by-name/je/jextract-21/package.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - makeBinaryWrapper, - gradle, - jdk21, - llvmPackages, -}: - -stdenv.mkDerivation { - pname = "jextract"; - version = "unstable-2023-11-27"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jextract"; - rev = "8730fcf05c229d035b0db52ee6bd82622e9d03e9"; # Update jextract 21 with latest fixes - hash = "sha256-Wct/yx5C0EjDtDyXNYDH5LRmrfq7islXbPVIGBR6x5Y="; - }; - - nativeBuildInputs = [ - gradle - makeBinaryWrapper - ]; - - gradleFlags = [ - "-Pllvm_home=${lib.getLib llvmPackages.libclang}" - "-Pjdk21_home=${jdk21}" - ]; - - doCheck = true; - - gradleCheckTask = "verify"; - - installPhase = '' - runHook preInstall - - mkdir -p $out/opt/ - cp -r ./build/jextract $out/opt/jextract - makeBinaryWrapper "$out/opt/jextract/bin/jextract" "$out/bin/jextract" - - runHook postInstall - ''; - - meta = { - description = "Tool which mechanically generates Java bindings from a native library headers"; - mainProgram = "jextract"; - homepage = "https://github.com/openjdk/jextract"; - platforms = jdk21.meta.platforms; - license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ sharzy ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c94f1eb11bd1..43d0e06f4ad5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -999,6 +999,7 @@ mapAliases { jellyfin-media-player = jellyfin-desktop; # Added 2025-12-14 jellyseerr = warnAlias "'jellyseerr' has been renamed to 'seerr'" seerr; # Added 2026-03-17 jesec-rtorrent = throw "'jesec-rtorrent' has been removed due to lack of maintenance upstream."; # Added 2025-11-20 + jextract-21 = throw "'jextract-21' has been removed due to lack of maintenance upstream. Please use 'jextract'"; # Added 2026-05-13 jhentai = throw "'jhentai' has been removed, as it is unmaintained"; # Added 2026-01-25 jikespg = throw "'jikespg' has been removed due to lack of maintenance upstream."; # Added 2025-06-10 jing = jing-trang; # Added 2025-09-18 From edd5f73d9cbf703734853d1094a43d06d544a735 Mon Sep 17 00:00:00 2001 From: Marius Niveri Date: Sun, 10 May 2026 21:31:34 +0200 Subject: [PATCH 19/97] clippy-copy: init at 1.6.9 --- pkgs/by-name/cl/clippy-copy/package.nix | 49 +++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/cl/clippy-copy/package.nix diff --git a/pkgs/by-name/cl/clippy-copy/package.nix b/pkgs/by-name/cl/clippy-copy/package.nix new file mode 100644 index 000000000000..dee187308cb4 --- /dev/null +++ b/pkgs/by-name/cl/clippy-copy/package.nix @@ -0,0 +1,49 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "clippy-copy"; + version = "1.6.9"; + + src = fetchFromGitHub { + owner = "neilberkman"; + repo = "clippy"; + tag = "v${finalAttrs.version}"; + hash = "sha256-8OdT+R4dvJCLhelIAsAgVoWGGwmWueTsiJFpCm1uQEc="; + }; + + vendorHash = "sha256-7do+KgoiIocS+mq2hsgv3NOd+TjMl2I9ew2Emx3/Bbg="; + + ldflags = [ + "-s" + "-X=github.com/neilberkman/clippy/cmd/internal/common.Version=${finalAttrs.version}" + "-X=github.com/neilberkman/clippy/cmd/internal/common.Commit=${finalAttrs.src.tag}" + "-X=github.com/neilberkman/clippy/cmd/internal/common.Date=1970-01-01T00:00:00Z" + ]; + + # Tests require access to the system clipboard (unavailable in sandbox) + doCheck = false; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + __structuredAttrs = true; + + meta = { + description = "Clipboard tool supporting both text and binary files"; + homepage = "https://github.com/neilberkman/clippy"; + changelog = "https://github.com/neilberkman/clippy/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ m4r1vs ]; + mainProgram = "clippy"; + platforms = lib.platforms.darwin; + }; +}) From cce1c60fb4ea8c82d6383f2e53b570cb7c9461d7 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Sat, 16 May 2026 04:49:29 -0400 Subject: [PATCH 20/97] zathura_core: set strictDeps, structuredAttrs, add versionCheckHook Signed-off-by: Ethan Carter Edwards --- pkgs/applications/misc/zathura/core/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 082909847351..8b9cb7023887 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -28,12 +28,16 @@ librsvg, gtk-mac-integration, webp-pixbuf-loader, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "zathura"; version = "2026.02.09"; + strictDeps = true; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "pwmt"; repo = "zathura"; @@ -102,6 +106,9 @@ stdenv.mkDerivation (finalAttrs: { doCheck = !stdenv.hostPlatform.isDarwin; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + passthru.updateScript = gitUpdater { }; meta = { From 35d4d899932bf76482b54888fbaa201cfb093e31 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Sat, 16 May 2026 15:56:41 -0400 Subject: [PATCH 21/97] zathura: set meta.mainProgram Signed-off-by: Ethan Carter Edwards --- pkgs/applications/misc/zathura/core/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 8b9cb7023887..97c5933093f3 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -117,5 +117,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.zlib; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ mithicspirit ]; + mainProgram = "zathura"; }; }) From 4d07bd6b46605f7f2f4dd404c0a768a5f589f0c3 Mon Sep 17 00:00:00 2001 From: Sean Gilligan Date: Sun, 17 May 2026 16:37:15 -0700 Subject: [PATCH 22/97] jspecify: build fromSource with gradle Use jdk21 and gradle to build JSpecify from source. Note: this produces an identical binary to the jspecify-1.0.0.jar on Maven Central: sha256 = 1fad6e6be7557781e4d33729d49ae1cdc8fdda6fe477bb0cc68ce351eafdfbab --- pkgs/by-name/js/jspecify/deps.json | 469 +++++++++++++++++++++++++++ pkgs/by-name/js/jspecify/package.nix | 49 ++- 2 files changed, 508 insertions(+), 10 deletions(-) create mode 100644 pkgs/by-name/js/jspecify/deps.json diff --git a/pkgs/by-name/js/jspecify/deps.json b/pkgs/by-name/js/jspecify/deps.json new file mode 100644 index 000000000000..c57c1108fa22 --- /dev/null +++ b/pkgs/by-name/js/jspecify/deps.json @@ -0,0 +1,469 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "biz/aQute/bnd#biz.aQute.bnd.embedded-repo/7.0.0": { + "jar": "sha256-pCxnvPjZxR9NzYYlTWKYdjWpaXzRDGSRtXSYOLqr6+A=", + "pom": "sha256-3Prn96stJjHK9pLazzn6yGK3GNEdCwu294+aW6gCjLo=" + }, + "biz/aQute/bnd#biz.aQute.bnd.gradle/7.0.0": { + "jar": "sha256-LMWmnBybMoqsR38mKt0K2MW8K355tbw5OWNCCl4EQhE=", + "pom": "sha256-x2EBfWRP4nI9Gxxlx38fGYKXT0RtqEBoianDvjp07B0=" + }, + "biz/aQute/bnd#biz.aQute.bnd.util/7.0.0": { + "jar": "sha256-OVddFQJJliqcbUbM5+Zy53fIqGIKHS0iDH8sCnmediM=", + "pom": "sha256-+dgDJLl2Hp3ipFoP6naPWZRH9AxuQZ8gje2MrxIYAMU=" + }, + "biz/aQute/bnd#biz.aQute.bndlib/7.0.0": { + "jar": "sha256-gKVp0AbzLpJc7kzor5Jrfm/aqqtcy/1f5MnN/5xN0t8=", + "pom": "sha256-mOuywO2iBtxb79bFJsjCAneApDvymekXyzwDXwOYp9I=" + }, + "biz/aQute/bnd#biz.aQute.repository/7.0.0": { + "jar": "sha256-ggIaWyICKD8J9XpW0zsh+rxvemSFC5FnNdaiZI8nYzc=", + "pom": "sha256-f1ar8LnsiL40/ZCDaYYdnlQwxnu6FROItbf0shvwOTU=" + }, + "biz/aQute/bnd#biz.aQute.resolve/7.0.0": { + "jar": "sha256-nVjTmv0Y/d2LTSHnC4Ui+KUmiH4UUH2UDcfK/p8NCZo=", + "pom": "sha256-UVIg7ZyoHFkzGz/zyuQfkUGMmn0Atavq0nEYS8rNp1Y=" + }, + "biz/aQute/bnd/builder#biz.aQute.bnd.builder.gradle.plugin/7.0.0": { + "pom": "sha256-gzK8DdCVA5r6+Tb/l4L6A3jKPvJNV+6Q++QsA3pVa9c=" + }, + "com/diffplug/durian#durian-collect/1.2.0": { + "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=", + "pom": "sha256-i7diCGoKT9KmRzu/kFx0R2OvodWaVjD3O7BLeHLAn/M=" + }, + "com/diffplug/durian#durian-core/1.2.0": { + "jar": "sha256-F+0KrLOjwWMjMyFou96thpTzKACytH1p1KTEmxFNXa4=", + "pom": "sha256-hwMg6QdVNxsBeW/oG6Ul/R3ui3A0b1VFUe7dQonwtmI=" + }, + "com/diffplug/durian#durian-io/1.2.0": { + "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=", + "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4=" + }, + "com/diffplug/durian#durian-swt.os/4.2.2": { + "jar": "sha256-a1Mca0vlgaizLq2GHdwVwsk7IMZl+00z4DgUg8JERfQ=", + "module": "sha256-rVlQLGknZu48M0vkliigDctNka4aSPJjLitxUStDXPk=", + "pom": "sha256-GzxJFP1eLM4pZq1wdWY5ZBFFwdNCB3CTV4Py3yY2kIU=" + }, + "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/6.25.0": { + "pom": "sha256-9FyCsS+qzYWs1HTrppkyL6XeqIQIskfQ5L3pQSkIIjo=" + }, + "com/diffplug/spotless#spotless-lib-extra/2.45.0": { + "jar": "sha256-YCy7zTgo7pz7LjCn+bMDNcaScTB3FBTUzdKU0h/ly2c=", + "module": "sha256-9pnkNfTlzgPbYJpHaO6wNj1uB8ZfvPrx/GKcTnbuf7A=", + "pom": "sha256-5x2LkRDdSNLn9KVLi/uozlWpbmteu9T0OpJGZJz1b7A=" + }, + "com/diffplug/spotless#spotless-lib/2.45.0": { + "jar": "sha256-sllply4dmAKAyirlKRl+2bMWCq5ItQbPGTXwG9Exhmc=", + "module": "sha256-+x+8+TUAczrHWcp99E8P9mVTEze0LaAS4on/CINNiQ8=", + "pom": "sha256-WKd8IsQLIc8m29tCEwFu9HrM9bBwchfHkyqQ9D+PMNw=" + }, + "com/diffplug/spotless#spotless-plugin-gradle/6.25.0": { + "jar": "sha256-9euQikxdpGKZ51Q/qtoEAtLEt31Yx7Qy1Lblk0mygKM=", + "module": "sha256-RoHRe/PJIF2DeOynBcAAywzJjcx40DATy2iJjGvSx0Q=", + "pom": "sha256-q1ZuPYS2w/rHqPySXy279TzZdZywOvPAfQ3EN9OXqNo=" + }, + "com/fasterxml#oss-parent/48": { + "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + }, + "com/fasterxml/jackson#jackson-base/2.14.2": { + "pom": "sha256-OuJFud+VEnMh8fkF9wO9MndP5VcVip06nlB9grK8TtQ=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.2": { + "pom": "sha256-mqIJuzI5HL9fG9Pn+hGQFnYWms0ZDZiWtcHod8mZ/rw=" + }, + "com/fasterxml/jackson#jackson-parent/2.14": { + "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.14.2": { + "jar": "sha256-LGhp1QXPYNwGZzS31QM5+XW9OtxjXianirtxrLRHPA0=", + "module": "sha256-sBSmTMGESUn4JNNGcSk1Qfq3IyI6yLgyIrV3IRO97Bc=", + "pom": "sha256-hK4DQYN9dpamEEPYCeQyYKXrB3Iy0dyqRkyNpUnNnqA=" + }, + "com/fasterxml/jackson/core#jackson-core/2.14.2": { + "jar": "sha256-tdN6d8iCd7l+NZPIdAklIWwG345BcrveBYUo3wStPno=", + "module": "sha256-knOeO8vgmyZJ4YfrftJawlK1h3B82SKrlbrc3orqEtw=", + "pom": "sha256-9EzGPWEvA7Hb/IKJLc2zL9t1vxYEn9hZVWHnx6M7xFE=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.14.2": { + "jar": "sha256-UB06vOTRjcw4EFjsWTxblEd5Brum77rBTa5ApkL3dCQ=", + "module": "sha256-YTDKm5VwfM1PgPYlhWmZCnzkADmqNTxGNckA02vuxwU=", + "pom": "sha256-IoCOu0t12MQDfZzuEgitxlvHgqmIVzIjSjG3tXTF2Qw=" + }, + "com/github/node-gradle#gradle-node-plugin/7.0.2": { + "jar": "sha256-v9jLZEWT5/a2txkBH9rKSvDAJIXigXaQRHDzAOSKGeI=", + "module": "sha256-G2LnH/Ks/cHhFyJH+Fe+Z3h025jTNvTWKefkVcBLM8A=", + "pom": "sha256-fd8NZzuvE+4XBkng91ll/M40v8Hd01UQ5iyY2MUH3Us=" + }, + "com/github/node-gradle/node#com.github.node-gradle.node.gradle.plugin/7.0.2": { + "pom": "sha256-4s4LCFDNobq3v3EBMrGDXFMlfynXzXDr5fSNsGiUuBw=" + }, + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "com/google/code/gson#gson/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": { + "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=", + "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE=" + }, + "com/googlecode/javaewah#JavaEWAH/1.2.3": { + "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=", + "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM=" + }, + "com/squareup/okhttp3#okhttp/4.12.0": { + "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=", + "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=", + "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg=" + }, + "com/squareup/okio#okio-jvm/3.6.0": { + "jar": "sha256-Z1Q/Bzb8QirpJ+0OUEuYvF4mn9oNNQBXkzfLcT2ihBI=", + "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=", + "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8=" + }, + "com/squareup/okio#okio/3.6.0": { + "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", + "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" + }, + "commons-codec#commons-codec/1.16.0": { + "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=", + "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ=" + }, + "dev/equo/ide#solstice/1.7.5": { + "jar": "sha256-BuFLxDrMMx2ra16iAfxnNk7RI/mCyF+lEx8IF+1lrk8=", + "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=", + "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8=" + }, + "io/github/gradle-nexus#publish-plugin/1.3.0": { + "jar": "sha256-wU5VY3a6Rpie4AZ1lOwkJlb53YSt1g0OJUxI/luWy0g=", + "module": "sha256-klkymGly24u3D0EsRvQyAsuYIaYTC5pjcN16SDgBmyE=", + "pom": "sha256-cXyUDliFlWFRQyRayjL9Wy00qDlm1lXvnWoHVEhU55I=" + }, + "io/github/gradle-nexus/publish-plugin#io.github.gradle-nexus.publish-plugin.gradle.plugin/1.3.0": { + "pom": "sha256-UWNK9md64JmtzpKZnDBz7y18u0mDOio/W13RuQiVN4o=" + }, + "net/ltgt/errorprone#net.ltgt.errorprone.gradle.plugin/3.0.1": { + "pom": "sha256-9kCBE12Jn+VplFrNuCjimjaqAykdtUVEECbn99wpitI=" + }, + "net/ltgt/gradle#gradle-errorprone-plugin/3.0.1": { + "jar": "sha256-FJItCrBiuDCP2pBWImaSfP4ThX0iQOy6DgZ062U0eOg=", + "module": "sha256-27VuKSZyVE5474ij6hmWqwb4sIavldYbSTjvjzprGRs=", + "pom": "sha256-vfktmirDLDtija5V54qy7C/oYgpLtuda3p+Y+eSPGh8=" + }, + "org/apache#apache/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "org/apache/commons#commons-parent/58": { + "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/6.7.0.202309050840-r": { + "pom": "sha256-u56FQW2Y0HMfx2f41w6EaAQWAdZnKuItsqx5n3qjkR8=" + }, + "org/eclipse/jgit#org.eclipse.jgit/6.7.0.202309050840-r": { + "jar": "sha256-tWRHfQkiQaqrUMhKxd0aw3XAGCBE1+VlnTpgqQ4ugBo=", + "pom": "sha256-BNB83b8ZjfpuRIuan7lA94HAEq2T2eqCBv4KTTplwZI=" + }, + "org/eclipse/platform#org.eclipse.osgi/3.18.300": { + "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=", + "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ=" + }, + "org/gradle/toolchains#foojay-resolver/0.8.0": { + "jar": "sha256-+Q5pNRY46QueyYSOdZ0hhjWQfAklQRkRUAN7CyLlFAw=", + "module": "sha256-jDzPVNoHLGSkDgaIKqplIzbLKe7C6iMPBtaEOrs4TVE=", + "pom": "sha256-pxZyrK0MCu4576V1P1yU+aSjWh2sBl4ii8rDQt6nxUg=" + }, + "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.8.0": { + "pom": "sha256-O2ciN72cwejoyobvWnkgpnj2nQTS9L+9DFouedRcXLU=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": { + "jar": "sha256-zeM0G6GKK6JisLfPbFWyDJDo1DTkLJoT5qP3cNuWWog=", + "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { + "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": { + "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=", + "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { + "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": { + "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", + "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": { + "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.10": { + "jar": "sha256-VemJxRK4CQd5n4VDCfO8d4LFs9E5MkQtA3nVxHJxFQQ=", + "pom": "sha256-fin79z/fceBnnT3ufmgP1XNGT6AWRKT1irgZ0sCI09I=" + }, + "org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "org/osgi#org.osgi.dto/1.0.0": { + "jar": "sha256-y3Xzx+SOWjGjHfIuJoczRvW/ZZ4tyrI2ngMeSFDS/0M=", + "pom": "sha256-XDHfk5LAR5tfgS9/hIDPsvcrbUmu8oVLfZFuBrCxDKw=" + }, + "org/osgi#org.osgi.framework/1.8.0": { + "jar": "sha256-7BlLeHGvJ2gXFv8FJZMZpcPJuXJ+gADp6DJJm5NIS04=", + "pom": "sha256-Z9tZJwa+xs7fS932a6ZJrVEkDN8SnjSQXm78j5AhCTM=" + }, + "org/osgi#org.osgi.resource/1.0.0": { + "jar": "sha256-gfxQ8fHTikryjhMZB9Sv4hMkmqsFBgSE7coOYMSvm0o=", + "pom": "sha256-g6zfIl/7mkp7xYL1OkFFofLDvbtCjgM8AJZvY8YQ6CA=" + }, + "org/osgi#org.osgi.service.coordinator/1.0.2": { + "jar": "sha256-sA3LUHuCQ/vlTubn+FNEmoRa+OfYQxPH1JdJSf2qsis=", + "pom": "sha256-DR2KkKB+CBsBIewegopVu51NRK7SK9qUKZEqIQFGi2o=" + }, + "org/osgi#org.osgi.service.log/1.3.0": { + "jar": "sha256-/2cQxIVtMmhM8+vcRSSPQQNv9zTysDu8CMRgmmH+z6A=", + "pom": "sha256-IcKVDBCS/bOOwIRYa471pU5dHQSV9UqCR+Auuu1EMos=" + }, + "org/osgi#org.osgi.service.repository/1.1.0": { + "jar": "sha256-xVU+lbRZUpGSQzSG1MTMIv9FourkloSE+fcXMZJkpTI=", + "pom": "sha256-QGb8pxWqwy/jzgvHv4Epe/1xMOu2CQzJZSrfeyqAfxk=" + }, + "org/osgi#org.osgi.service.resolver/1.1.1": { + "jar": "sha256-0hLyvLRc++yQcxDXj1MNmJjeDM97B5Os8Ys4bwPH3jk=", + "pom": "sha256-uPMUllLomdnRY/zyBKSD1Cq79OoT/+zI2aMyLIF84cI=" + }, + "org/osgi#org.osgi.util.function/1.2.0": { + "jar": "sha256-IIgZx8cWkMFaa7ixh0dOf50BR5RraAGCpiufIirgFOw=", + "pom": "sha256-9O3YQYEVfUNoGNRlZdSAN5wbBwAdXLEwtAZxlykRXqg=" + }, + "org/osgi#org.osgi.util.promise/1.2.0": { + "jar": "sha256-/vhuZPWE0BKhagMGFgdk9heWY7kJiKImxGQbkg86SzY=", + "pom": "sha256-m6aVb+n6Frge8Q6O8UED4WwEuKACQVC20DKfkX7y4hY=" + }, + "org/osgi#org.osgi.util.tracker/1.5.4": { + "jar": "sha256-fXjCzJvLZCHCTxeqCXhmzo2RFcIZpPjWzHU7xN+5fvo=", + "pom": "sha256-L3oSGrysdT5csPguP+4NpHlZV5hp4wTYwvtuh2PkMSk=" + }, + "org/osgi#osgi.annotation/8.0.1": { + "jar": "sha256-oOikw2K9NgCBLzew6kX7qWbHvASdAf7Vagnsx0CCdZ4=", + "pom": "sha256-iC0Hao4lypIH95ywk4DEcvazxBUIFivSuqBpF74d7XM=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/tukaani#xz/1.9": { + "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", + "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" + } + }, + "https://repo.maven.apache.org/maven2": { + "aopalliance#aopalliance/1.0": { + "jar": "sha256-Ct3sZw/tzT8RPFyAkdeDKA0j9146y4QbYanNsHk3agg=", + "pom": "sha256-JugjMBV9a4RLZ6gGSUXiBlgedyl3GD4+Mf7GBYqppZs=" + }, + "com/github/ben-manes/caffeine#caffeine/3.0.5": { + "jar": "sha256-iptU01BqO5LuRrIXvO55GWshym1S3ClnxoaiBfsvnBU=", + "module": "sha256-MNqUAgRzgsSZ0djzcgH8Ead8mTTSxYa8WkKvrEr6wrI=", + "pom": "sha256-vM/bJH7Xa1K7sUMMIoLEO61BjtPGl7TiqVrQmbvyXPg=" + }, + "com/github/kevinstern#software-and-algorithms/1.0": { + "jar": "sha256-YauCQ5zvNzQ7FPUxVMRhYZN1NzpWuTOOiVcJ+1Tghkw=", + "pom": "sha256-7ZcfAJNU5owJQUyWT74aLIXCyLvUYBIrdJenuMXU84g=" + }, + "com/google#google/5": { + "pom": "sha256-4J00XnPKP7yn8+BfMN63Tp053Wt5qT/ujFEfI0F7aCg=" + }, + "com/google/auto#auto-common/1.2.1": { + "jar": "sha256-9D8p/ipuuvBLJZjN7sMqTjRtSalATpkPX8GcGfOijQ4=", + "pom": "sha256-E7S1AGKUn4sTQ5J8WBU207sFG4r+pQmqb5AvTeKLwbI=" + }, + "com/google/auto/service#auto-service-aggregator/1.0.1": { + "pom": "sha256-BIFGDbWZAzYrJvq9O9zV7CAHUPk5G7tlAv48fcLfPkw=" + }, + "com/google/auto/service#auto-service-annotations/1.0.1": { + "jar": "sha256-x77FS3tViLWWfocDQQkcVpEYHZVM8gOfG/Cm7rg3Rzs=", + "pom": "sha256-6bvxs9ZsoYAEpqB6INv6EMos6DZzSPdB3i/o/vzmjMI=" + }, + "com/google/auto/value#auto-value-annotations/1.9": { + "jar": "sha256-+lRp9MRO5Zii2PAzqwqdy8ZJigxeDJmN+gwq31E1gEQ=", + "pom": "sha256-kiCj2r51x5M08GGw5A34M0SGZrrCiouCO8Ho/VL4yYo=" + }, + "com/google/auto/value#auto-value-parent/1.9": { + "pom": "sha256-Lj2d/2OWAcq4gdfhcIBry9jgMffr/yWcu0W+V7TL14c=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/errorprone#error_prone_annotation/2.20.0": { + "jar": "sha256-vxzaySKIajd7p3JCooEo9+tADXxzyQXff7p26qw1fmc=", + "pom": "sha256-IiHmp48/e26RUynjfoKk1oKEKxWuKM9yukunHMBoKTE=" + }, + "com/google/errorprone#error_prone_annotations/2.20.0": { + "jar": "sha256-oTbT3OZxaNiHURFfoiO+yA6ubMBiqi+Bc+g0SpgjXsQ=", + "pom": "sha256-lPUGU69lm+HRoNeF+Xy6doVx95TS5lX8PSLk7uZRKzk=" + }, + "com/google/errorprone#error_prone_check_api/2.20.0": { + "jar": "sha256-thTVZZmyzoi8lmEdiUO3RlchSjJV3r5euDoLldal+Zc=", + "pom": "sha256-BbHZZjPswo4T2Wjcco+CO9MCyuEoeOQxiOSe3fGP9bo=" + }, + "com/google/errorprone#error_prone_core/2.20.0": { + "jar": "sha256-noHXvKX6GDtUBZ/Kx0+949/u3kY5Dn46F+4Lxm2ERxM=", + "pom": "sha256-yoqZNJJyasGFAEokY9RSdOJk9VxtcUEaw30yc9sTFeE=" + }, + "com/google/errorprone#error_prone_parent/2.20.0": { + "pom": "sha256-4Li8d/x5TSLVCqSFGJbYICphZhAWGxPL/yoUj/HhAsI=" + }, + "com/google/errorprone#error_prone_type_annotations/2.20.0": { + "jar": "sha256-MNugplH9X7qPyugfkpOMWQIwMA+SZeqEn0MUlPf5LBY=", + "pom": "sha256-1r8/bVHn1ynBmTMkZtVp3Gay7yHuwSnD0aC4kSDYzz8=" + }, + "com/google/errorprone#javac/9+181-r4173-1": { + "jar": "sha256-HY00eg4VefP8hqwE0ZdOSJr8ZjV/AAmsmASnrDCRLtY=", + "pom": "sha256-FWnAgfqDWKBhZDcvn1Qbig6l7Alkkx9fdOrTb/UrQBU=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/31.1-jre": { + "pom": "sha256-RDliZ4O0StJe8F/wdiHdS7eWzE608pZqSkYf6kEw4Pw=" + }, + "com/google/guava#guava/31.1-jre": { + "jar": "sha256-pC7cnKt5Ljn+ObuU8/ymVe0Vf/h6iveOHWulsHxKAKs=", + "pom": "sha256-kZPQe/T2YBCNc1jliyfSG0TjToDWc06Y4hkWN28nDeI=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/inject#guice-parent/5.1.0": { + "pom": "sha256-Y9XAxkF5feumwFHEfV9pI/OhA+9x5OvDqF0Bw+h4WWw=" + }, + "com/google/inject#guice/5.1.0": { + "jar": "sha256-QTDlC/rEgJnIYPDZA7kYYMgaJJyQ84JF+P7Vj8gXvCY=", + "pom": "sha256-s7jcZSE9Yj+3DteVjb3WFjJCVrqDajFlJWDDiJmf2c0=" + }, + "com/google/j2objc#j2objc-annotations/1.3": { + "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=", + "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" + }, + "com/google/protobuf#protobuf-bom/3.19.6": { + "pom": "sha256-8tqbt1IIO0yJDV69ZjFMRyb1M67+dvbCQn6dcfKIIxE=" + }, + "com/google/protobuf#protobuf-java/3.19.6": { + "jar": "sha256-apot/5Hc9x+FvnGulx9hZLWmMdzTS/8I8GGFNcpErQI=", + "pom": "sha256-0QlO6w21FqBQC7C+xZATbmBoqD0P94K3wcdxqeidHaQ=" + }, + "com/google/protobuf#protobuf-parent/3.19.6": { + "pom": "sha256-rM3kgjBu27qah3rfuxBoD+pME2tueX5TupuEaeolqlw=" + }, + "io/github/eisop#dataflow-errorprone/3.34.0-eisop1": { + "jar": "sha256-ibT10r1QWfBnxZgqDlmIuH38ioI0eV1oxvMXiEbeMxk=", + "pom": "sha256-JaaDYJh6NnhrrYk/EEAXAM1iVkRhR0wdosukpTmpzgY=" + }, + "io/github/java-diff-utils#java-diff-utils/4.0": { + "jar": "sha256-gQIyN052qVSUnw4hhc19lRWt25GM89o0gfd+B8NWtJo=", + "pom": "sha256-ujdnHK74ki0M+eDt8437+8a8ztiRbD1XWzdYp+wog0c=" + }, + "javax/inject#javax.inject/1": { + "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=", + "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o=" + }, + "org/apiguardian#apiguardian-api/1.1.0": { + "pom": "sha256-qUW5y1zZt3sscRhE5lnEPsBw71nZ9Qn6n0wYYbSGJxE=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/checkerframework#checker-qual/3.12.0": { + "module": "sha256-0EeUnBuBCRwsORN3H6wvMqL6VJuj1dVIzIwLbfpJN3c=", + "pom": "sha256-d1t6425iggs7htwao5rzfArEuF/0j3/khakionkPRrk=" + }, + "org/checkerframework#checker-qual/3.19.0": { + "jar": "sha256-qCfEkYPzpjInfSegpGc2hss0FQdEe51XAmEJS9dIqmg=", + "module": "sha256-U+GJnd48UTyh79N2q/+sDmkH6OhKvV+WYkJjTJXk0Vc=", + "pom": "sha256-KbqcXOGpS3AL2CPE7WEvWCe1kPGaSXdf1+uPmX+Ko3E=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/4.4.1.201607150455-r": { + "pom": "sha256-p3SkgFVcUSpqo47j/00FmVTUeLvh6QB9zRFdz4CaGKM=" + }, + "org/eclipse/jgit#org.eclipse.jgit/4.4.1.201607150455-r": { + "jar": "sha256-CyRHsyToY1HjXgjgkUNhlKhG1GnXnpdkQ5hTPHPQH+A=", + "pom": "sha256-SCeAj6Q/+4NN512OpzT0ImVPlFwxtM/+P7xdWjepUIk=" + }, + "org/junit#junit-bom/5.7.0": { + "module": "sha256-Jd5FSzrdZ2VNZpG1PedZO1ApZ7X/VJVHsQTXlh8aUr0=", + "pom": "sha256-NfsV+NC+4rWQCiKDJ2I2ZVL5o0nFbO1guhI85Hc4/wA=" + }, + "org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "org/junit/jupiter#junit-jupiter-api/5.9.3": { + "jar": "sha256-2JXj7t9PobEN4xqRvlWjAbswe/GO8yWz+l2z+A7pLRw=", + "module": "sha256-ba7jABTiBFWh7MbW0LOsYERECtE+9CA5jikZCYDpuHo=", + "pom": "sha256-f3KVZWK+1JEdMhf5DeCw0kDdklb4V99aJLvrAVS0FBs=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.9.3": { + "jar": "sha256-tV4wSxzS6PEWwat3pdw+yoxNm0amnghLY6ylHN61Xw8=", + "module": "sha256-lY9TIPRbNNCmZ24W/1ScsBDhQm3KUs/bEFh2vM9Pdog=", + "pom": "sha256-D1/XZ2n95tJHMI+Dbf8TTItS9lpC5UuNCtoEFvMKc3o=" + }, + "org/junit/platform#junit-platform-commons/1.9.3": { + "jar": "sha256-hRkVffgTwhDoX8FBS3QQnj2F9D1wklY+1wTEPEjw1eY=", + "module": "sha256-eWpB8nJB+2dgjwGazPTBw2cVe3MjinavhvbeuuNZnrQ=", + "pom": "sha256-4Xof3keC8vwjtC3sp1wLBWbVwphQ0DBr5lxdpzuAIXg=" + }, + "org/junit/platform#junit-platform-engine/1.9.3": { + "jar": "sha256-DDlVPZoDUQdXIn9aHGzGUwKHsaMh7WJYRQZkh0qioWo=", + "module": "sha256-nQVThnLcRrITlxJjbv3B8Xg9Q5qhwktp0Ckrgci36o8=", + "pom": "sha256-HFq3/OvjpgEYOXm6r78vQOVUOIKnyiPp+etxkZWnR9U=" + }, + "org/junit/platform#junit-platform-launcher/1.7.0": { + "module": "sha256-zpTSugJQT8kavcC3lzUOUlKHGdBJ7swEOCh+yVuWS6Q=", + "pom": "sha256-JNBcKPWp6tLAZ4/REnnqgfHLfvnUY0QdkQT60VADgpo=" + }, + "org/junit/platform#junit-platform-launcher/1.9.3": { + "jar": "sha256-hRXpGAignIya9eNZGFtZkbXna4rc8YW5o9q07I5bqP8=", + "module": "sha256-RbWyPx6RsuZm2Z8Mk1V7bdL2ffBiftKaZpKws4hfGa0=", + "pom": "sha256-C3zLRCXoIJoDNc+D1jzDZyv42REMaWbv55d9EWZkjyc=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/pcollections#pcollections/3.1.4": { + "jar": "sha256-NPV5ugdcjaLIoP7dDwTiHqwvtsZg2Q0Pq7Vz6LTcaRg=", + "pom": "sha256-umQabIK+0ira2CImO960nS1/iE1NQg2hXAPEJMajjB8=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/by-name/js/jspecify/package.nix b/pkgs/by-name/js/jspecify/package.nix index 9cd7fbff736c..1cfc2178590f 100644 --- a/pkgs/by-name/js/jspecify/package.nix +++ b/pkgs/by-name/js/jspecify/package.nix @@ -1,34 +1,63 @@ { lib, - stdenvNoCC, - fetchMavenArtifact, + stdenv, + fetchFromGitHub, + writeShellScript, + nix-update, + gradle, + jdk21, jre_minimal, }: -stdenvNoCC.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "jspecify"; version = "1.0.0"; - src = fetchMavenArtifact { - groupId = "org.jspecify"; - artifactId = "jspecify"; - version = finalAttrs.version; - hash = "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s="; + src = fetchFromGitHub { + owner = "jspecify"; + repo = "jspecify"; + tag = "v${finalAttrs.version}"; + hash = "sha256-WgVRaGm9lYhMeMM6QWUezXtUsXkaK/iPt1gj2koWNu8="; }; + nativeBuildInputs = [ + gradle + jdk21 + ]; + + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; + + # JSpecify's build.gradle reads JAVA_VERSION (defaults to 11). Pin it so Gradle's + # toolchain machinery resolves to the JDK we provide instead of trying + # to auto-download one. + env.JAVA_VERSION = lib.versions.major jdk21.version; + + gradleBuildTask = "assemble"; + + doCheck = true; + installPhase = '' runHook preInstall - install -Dm444 ${finalAttrs.src.jar} $out/share/java/${finalAttrs.pname}-${finalAttrs.version}.jar + install -Dm644 build/libs/jspecify-${finalAttrs.version}.jar \ + $out/share/java/jspecify-${finalAttrs.version}.jar runHook postInstall ''; + passthru.updateScript = writeShellScript "update-jspecify" '' + ${lib.getExe nix-update} jspecify + $(nix-build -A jspecify.mitmCache.updateScript) + ''; + meta = { homepage = "https://jspecify.dev"; description = "Standard Annotations for Java Static Analysis"; license = lib.licenses.asl20; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; inherit (jre_minimal.meta) platforms; maintainers = with lib.maintainers; [ msgilligan ]; }; From 306eb06af290436be78c0d6b874cd8dd149eca77 Mon Sep 17 00:00:00 2001 From: noradtux Date: Wed, 20 May 2026 16:20:22 +0200 Subject: [PATCH 23/97] prusa-slicer: 2.9.4 -> 2.9.5 --- pkgs/by-name/pr/prusa-slicer/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prusa-slicer/package.nix b/pkgs/by-name/pr/prusa-slicer/package.nix index d9661ec1d9c4..2529acf23b33 100644 --- a/pkgs/by-name/pr/prusa-slicer/package.nix +++ b/pkgs/by-name/pr/prusa-slicer/package.nix @@ -19,6 +19,7 @@ gmp, gtk3, hicolor-icon-theme, + hidapi, libpng, mpfr, nanosvg, @@ -61,14 +62,14 @@ let in clangStdenv.mkDerivation (finalAttrs: { pname = "prusa-slicer"; - version = "2.9.4"; + version = "2.9.5"; # Build with clang even on Linux, because GCC uses absolutely obscene amounts of memory # on this particular code base (OOM with 32GB memory and --cores 16 on GCC, succeeds # with --cores 32 on clang). src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - hash = "sha256-1ilgr9RaIoWvj0TDVc20XjjUUcNtnicR7KlE0ii3GQE="; + hash = "sha256-tVC/hIykg0flc9HgB4ddJqUEVolZ4Lu/Cx5I10Z2eCI="; rev = "version_${finalAttrs.version}"; }; @@ -132,6 +133,7 @@ clangStdenv.mkDerivation (finalAttrs: { gmp gtk3 hicolor-icon-theme + hidapi libpng mpfr nanosvg-fltk From 4ef45c6639d2041de61c3a06dbdc3f2f7bee5e88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 May 2026 18:39:31 +0000 Subject: [PATCH 24/97] nakama: 3.38.0 -> 3.39.0 --- pkgs/by-name/na/nakama/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/nakama/package.nix b/pkgs/by-name/na/nakama/package.nix index 29dbc3db77a2..e382cee9fa4f 100644 --- a/pkgs/by-name/na/nakama/package.nix +++ b/pkgs/by-name/na/nakama/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "nakama"; - version = "3.38.0"; + version = "3.39.0"; src = fetchFromGitHub { owner = "heroiclabs"; repo = "nakama"; tag = "v${finalAttrs.version}"; - hash = "sha256-sI+uTjP/ONLhYC3kqVlKNEqbrI8fABOHckrz0pg7Hi0="; + hash = "sha256-+yHQ2KxH/Kzv8s3hPsOh3IQZvSPeAwWHYHHHh3NR8VA="; }; vendorHash = null; From 6ac6e68eb0d375e544f55d261c7b2072919b289c Mon Sep 17 00:00:00 2001 From: Aiden Schembri Date: Sat, 23 May 2026 01:22:07 +0200 Subject: [PATCH 25/97] ladybird: add maintainer schembriaiden --- pkgs/by-name/la/ladybird/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index 8c74b38a637f..f31731a18c96 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -179,6 +179,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ fgaz jk + schembriaiden ]; platforms = [ "x86_64-linux" From 5db64038cbb3872ec078b061c5580db9abcee37d Mon Sep 17 00:00:00 2001 From: Aiden Schembri Date: Sun, 24 May 2026 19:45:59 +0200 Subject: [PATCH 26/97] ladybird: fix wrong icu error --- pkgs/by-name/la/ladybird/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index f31731a18c96..47d584108578 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -19,6 +19,7 @@ libxcrypt, mimalloc, openssl, + perl, python3, qt6Packages, woff2, @@ -58,6 +59,10 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' sed -i '/iconutil/d' UI/CMakeLists.txt + perl -0pi -e \ + 's/find_package\(ICU 78\.[0-9]+ EXACT REQUIRED COMPONENTS data i18n uc\)/find_package(ICU ${icu78.version} EXACT REQUIRED COMPONENTS data i18n uc)/ or die "ICU dependency not found\n"' \ + Meta/CMake/check_for_dependencies.cmake + # Don't set absolute paths in RPATH substituteInPlace Meta/CMake/lagom_install_options.cmake \ --replace-fail "\''${CMAKE_INSTALL_BINDIR}" "bin" \ @@ -86,6 +91,7 @@ stdenv.mkDerivation (finalAttrs: { cargo cmake ninja + perl pkg-config python3 rustPlatform.cargoSetupHook From 199418b360f6c1daf94394dd6962c71a3ae23fe7 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Mon, 25 May 2026 17:32:40 -0400 Subject: [PATCH 27/97] eslint: 10.3.0 -> 10.4.0 Changelog: https://github.com/eslint/eslint/blob/refs/tags/v10.4.0/CHANGELOG.md --- pkgs/by-name/es/eslint/package-lock.json | 1924 +++++++++++++--------- pkgs/by-name/es/eslint/package.nix | 6 +- 2 files changed, 1155 insertions(+), 775 deletions(-) diff --git a/pkgs/by-name/es/eslint/package-lock.json b/pkgs/by-name/es/eslint/package-lock.json index 00063ec5eba8..d39e6d96a96d 100644 --- a/pkgs/by-name/es/eslint/package-lock.json +++ b/pkgs/by-name/es/eslint/package-lock.json @@ -1,18 +1,18 @@ { "name": "eslint", - "version": "10.3.0", + "version": "10.4.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "eslint", - "version": "10.3.0", + "version": "10.4.0", "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.2", "@eslint/config-array": "^0.23.5", - "@eslint/config-helpers": "^0.5.5", + "@eslint/config-helpers": "^0.6.0", "@eslint/core": "^1.2.1", "@eslint/plugin-kit": "^0.7.1", "@humanfs/node": "^0.16.6", @@ -76,7 +76,7 @@ "got": "^11.8.3", "gray-matter": "^4.0.3", "jiti": "^2.6.1", - "knip": "^5.60.2", + "knip": "^6.13.1", "lint-staged": "^11.0.0", "markdown-it": "^12.2.0", "markdown-it-container": "^3.0.0", @@ -94,7 +94,6 @@ "prettier": "3.8.3", "progress": "^2.0.3", "proxyquire": "^2.0.1", - "recast": "^0.23.0", "regenerator-runtime": "^0.14.0", "semver": "^7.5.3", "shelljs": "^0.10.0", @@ -237,13 +236,13 @@ "license": "MIT" }, "node_modules/@babel/code-frame": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz", - "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz", + "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.28.5", + "@babel/helper-validator-identifier": "^7.29.7", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" }, @@ -252,9 +251,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.29.3", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.3.tgz", - "integrity": "sha512-LIVqM46zQWZhj17qA8wb4nW/ixr2y1Nw+r1etiAWgRM6U1IqP+LNhL1yg440jYZR72jCWcWbLWzIosH+uP1fqg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.7.tgz", + "integrity": "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==", "dev": true, "license": "MIT", "engines": { @@ -262,21 +261,21 @@ } }, "node_modules/@babel/core": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz", - "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz", + "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.29.0", - "@babel/generator": "^7.29.0", - "@babel/helper-compilation-targets": "^7.28.6", - "@babel/helper-module-transforms": "^7.28.6", - "@babel/helpers": "^7.28.6", - "@babel/parser": "^7.29.0", - "@babel/template": "^7.28.6", - "@babel/traverse": "^7.29.0", - "@babel/types": "^7.29.0", + "@babel/code-frame": "^7.29.7", + "@babel/generator": "^7.29.7", + "@babel/helper-compilation-targets": "^7.29.7", + "@babel/helper-module-transforms": "^7.29.7", + "@babel/helpers": "^7.29.7", + "@babel/parser": "^7.29.7", + "@babel/template": "^7.29.7", + "@babel/traverse": "^7.29.7", + "@babel/types": "^7.29.7", "@jridgewell/remapping": "^2.3.5", "convert-source-map": "^2.0.0", "debug": "^4.1.0", @@ -303,14 +302,14 @@ } }, "node_modules/@babel/generator": { - "version": "7.29.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz", - "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.7.tgz", + "integrity": "sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^7.29.0", - "@babel/types": "^7.29.0", + "@babel/parser": "^7.29.7", + "@babel/types": "^7.29.7", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" @@ -320,27 +319,27 @@ } }, "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.27.3", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz", - "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.29.7.tgz", + "integrity": "sha512-OoK6239jHPuSQOoS0kfTVKn0b/rVTk0seKq4Gd2UMLtmOVLjDC0ki3e+c90Trqv2gMfvJFqkiljrr568+qddiw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.27.3" + "@babel/types": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz", - "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz", + "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.28.6", - "@babel/helper-validator-option": "^7.27.1", + "@babel/compat-data": "^7.29.7", + "@babel/helper-validator-option": "^7.29.7", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" @@ -377,18 +376,18 @@ "license": "ISC" }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.29.3", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.29.3.tgz", - "integrity": "sha512-RpLYy2sb51oNLjuu1iD3bwBqCBWUzjO0ocp+iaCP/lJtb2CPLcnC2Fftw+4sAzaMELGeWTgExSKADbdo0GFVzA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.29.7.tgz", + "integrity": "sha512-IY3ZD9Tmooqr3TUhc3DUWxiuo8xx1DWLhd5M7hQ+ZWJamqM2BbalrBJb2MisSLoYorOj75U03qULCxQTY9r3hg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.27.3", - "@babel/helper-member-expression-to-functions": "^7.28.5", - "@babel/helper-optimise-call-expression": "^7.27.1", - "@babel/helper-replace-supers": "^7.28.6", - "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1", - "@babel/traverse": "^7.29.0", + "@babel/helper-annotate-as-pure": "^7.29.7", + "@babel/helper-member-expression-to-functions": "^7.29.7", + "@babel/helper-optimise-call-expression": "^7.29.7", + "@babel/helper-replace-supers": "^7.29.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7", + "@babel/traverse": "^7.29.7", "semver": "^6.3.1" }, "engines": { @@ -409,13 +408,13 @@ } }, "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.28.5.tgz", - "integrity": "sha512-N1EhvLtHzOvj7QQOUCCS3NrPJP8c5W6ZXCHDn7Yialuy1iu4r5EmIYkXlKNqT99Ciw+W0mDqWoR6HWMZlFP3hw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.29.7.tgz", + "integrity": "sha512-907Uymvqgg1dwUA+7IGwFAOSYzQOuzPXKNJ1yxzwPffzkYFg2q2eHi1fIOs6sXkG9NbIUMunnUlkYsfRFNvomg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.27.3", + "@babel/helper-annotate-as-pure": "^7.29.7", "regexpu-core": "^6.3.1", "semver": "^6.3.1" }, @@ -454,9 +453,9 @@ } }, "node_modules/@babel/helper-globals": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz", - "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz", + "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==", "dev": true, "license": "MIT", "engines": { @@ -464,43 +463,43 @@ } }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.28.5.tgz", - "integrity": "sha512-cwM7SBRZcPCLgl8a7cY0soT1SptSzAlMH39vwiRpOQkJlh53r5hdHwLSCZpQdVLT39sZt+CRpNwYG4Y2v77atg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.29.7.tgz", + "integrity": "sha512-j+7JYmk1JYDtACIGj0QJqqWZjoUpMoEikQGADMaHgCMCSDqd2+P32rfcibUNrGOMWrlzK1WJBdxrB3JJQZwWtg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/traverse": "^7.28.5", - "@babel/types": "^7.28.5" + "@babel/traverse": "^7.29.7", + "@babel/types": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz", - "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz", + "integrity": "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/traverse": "^7.28.6", - "@babel/types": "^7.28.6" + "@babel/traverse": "^7.29.7", + "@babel/types": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz", - "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz", + "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.28.6", - "@babel/helper-validator-identifier": "^7.28.5", - "@babel/traverse": "^7.28.6" + "@babel/helper-module-imports": "^7.29.7", + "@babel/helper-validator-identifier": "^7.29.7", + "@babel/traverse": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -510,22 +509,22 @@ } }, "node_modules/@babel/helper-optimise-call-expression": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz", - "integrity": "sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.29.7.tgz", + "integrity": "sha512-+kmGVjcT9RGYzoDwdwEqEvGgKe3BYq+O1iGzjFubaNgZHwYHP6lsF2Yghf4kEuv9BV7tYDZ913aBW9am6YKong==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.27.1" + "@babel/types": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz", - "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.29.7.tgz", + "integrity": "sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw==", "dev": true, "license": "MIT", "engines": { @@ -533,15 +532,15 @@ } }, "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.27.1.tgz", - "integrity": "sha512-7fiA521aVw8lSPeI4ZOD3vRFkoqkJcS+z4hFo82bFSH/2tNd6eJ5qCVMS5OzDmZh/kaHQeBaeyxK6wljcPtveA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.29.7.tgz", + "integrity": "sha512-16AMiW26DbXWBbr3B8wNozKM0ydMLB892vaOaJW/fPJdnT8vJk5sdkQcU/isqUxyCE0cEoa8wZOcbgDuC4b6Og==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.27.1", - "@babel/helper-wrap-function": "^7.27.1", - "@babel/traverse": "^7.27.1" + "@babel/helper-annotate-as-pure": "^7.29.7", + "@babel/helper-wrap-function": "^7.29.7", + "@babel/traverse": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -551,15 +550,15 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.28.6.tgz", - "integrity": "sha512-mq8e+laIk94/yFec3DxSjCRD2Z0TAjhVbEJY3UQrlwVo15Lmt7C2wAUbK4bjnTs4APkwsYLTahXRraQXhb1WCg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.29.7.tgz", + "integrity": "sha512-atfGXWSeCiF4DnKZIfmJfQRkSw9b9gNNXR1kqKjbhG4pGYCOnkp8OcTB8E3NXjBu8NpheSnOeNKz8KT7UNFTmQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-member-expression-to-functions": "^7.28.5", - "@babel/helper-optimise-call-expression": "^7.27.1", - "@babel/traverse": "^7.28.6" + "@babel/helper-member-expression-to-functions": "^7.29.7", + "@babel/helper-optimise-call-expression": "^7.29.7", + "@babel/traverse": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -569,23 +568,23 @@ } }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.27.1.tgz", - "integrity": "sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.29.7.tgz", + "integrity": "sha512-brcMGQaVzIeUb+6/bs1Av0f8YuNNjKY2JyvfRCsFuFsdKccEQ5Ges2y74D74NZ1Rz8lKJ9ksJkfqwQFJ/iNEyQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/traverse": "^7.27.1", - "@babel/types": "^7.27.1" + "@babel/traverse": "^7.29.7", + "@babel/types": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", - "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz", + "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==", "dev": true, "license": "MIT", "engines": { @@ -593,9 +592,9 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", - "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", + "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", "dev": true, "license": "MIT", "engines": { @@ -603,9 +602,9 @@ } }, "node_modules/@babel/helper-validator-option": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz", - "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz", + "integrity": "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==", "dev": true, "license": "MIT", "engines": { @@ -613,42 +612,42 @@ } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.28.6.tgz", - "integrity": "sha512-z+PwLziMNBeSQJonizz2AGnndLsP2DeGHIxDAn+wdHOGuo4Fo1x1HBPPXeE9TAOPHNNWQKCSlA2VZyYyyibDnQ==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.29.7.tgz", + "integrity": "sha512-iES0Skag9ERIF68aXadpO6dbXa03mNWK3sEqJaMnLNs/eC3l0lkImdfoy6Y09/SfkpawdAB4RjQ7PVA7TcVGdw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/template": "^7.28.6", - "@babel/traverse": "^7.28.6", - "@babel/types": "^7.28.6" + "@babel/template": "^7.29.7", + "@babel/traverse": "^7.29.7", + "@babel/types": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.29.2", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.2.tgz", - "integrity": "sha512-HoGuUs4sCZNezVEKdVcwqmZN8GoHirLUcLaYVNBK2J0DadGtdcqgr3BCbvH8+XUo4NGjNl3VOtSjEKNzqfFgKw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.7.tgz", + "integrity": "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/template": "^7.28.6", - "@babel/types": "^7.29.0" + "@babel/template": "^7.29.7", + "@babel/types": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.29.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.3.tgz", - "integrity": "sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.7.tgz", + "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.29.0" + "@babel/types": "^7.29.7" }, "bin": { "parser": "bin/babel-parser.js" @@ -658,14 +657,14 @@ } }, "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.28.5.tgz", - "integrity": "sha512-87GDMS3tsmMSi/3bWOte1UblL+YUTFMV8SZPZ2eSEL17s74Cw/l63rR6NmGVKMYW2GYi85nE+/d6Hw5N0bEk2Q==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.29.7.tgz", + "integrity": "sha512-j8SrR0zLZrRsC09DlszEx8FpMiwukKffYXMK0d5LmOglO7vGG6sz/BR/20yHqWH+Lnn31JTt2PE3hIWNgM2J6w==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1", - "@babel/traverse": "^7.28.5" + "@babel/helper-plugin-utils": "^7.29.7", + "@babel/traverse": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -675,13 +674,13 @@ } }, "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.27.1.tgz", - "integrity": "sha512-qNeq3bCKnGgLkEXUuFry6dPlGfCdQNZbn7yUAPCInwAJHMU7THJfrBSozkcWq5sNM6RcF3S8XyQL2A52KNR9IA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.29.7.tgz", + "integrity": "sha512-r8j8escF+U2FUHo0KOhPUdMzUO+jp9fInva6+ACVAF3Y97Ev+5iNZwiqTghmzNeWwDkOPlYuTcfb1vDaoZKmAQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -691,13 +690,13 @@ } }, "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.27.1.tgz", - "integrity": "sha512-g4L7OYun04N1WyqMNjldFwlfPCLVkgB54A/YCXICZYBsvJJE3kByKv9c9+R/nAfmIfjl2rKYLNyMHboYbZaWaA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.29.7.tgz", + "integrity": "sha512-GE1TFSiuFeGsCxmYXZl8HwoPrVlwe4rHPFE8weieGKZqnDORK+Ar3vgWMgW+AOxQ6/2TgLSKx9p6W7O4rC6qgQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -707,14 +706,14 @@ } }, "node_modules/@babel/plugin-bugfix-safari-rest-destructuring-rhs-array": { - "version": "7.29.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-rest-destructuring-rhs-array/-/plugin-bugfix-safari-rest-destructuring-rhs-array-7.29.3.tgz", - "integrity": "sha512-SRS46DFR4HqzUzCVgi90/xMoL+zeBDBvWdKYXSEzh79kXswNFEglUpMKxR04//dPqwYXWUBJ3mpUd933ru9Kmg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-rest-destructuring-rhs-array/-/plugin-bugfix-safari-rest-destructuring-rhs-array-7.29.7.tgz", + "integrity": "sha512-oBNVCvnO5tND+xSopWvV8WNGfpTfgP4Zr/YXXSj8zfmcPktp5Ku/aZlsIowgSD4fjmgHn6sGmB9APVsU5zOdhA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.28.6", - "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -724,15 +723,15 @@ } }, "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.27.1.tgz", - "integrity": "sha512-oO02gcONcD5O1iTLi/6frMJBIwWEHceWGSGqrpCmEL8nogiS6J9PBlE48CaK20/Jx1LuRml9aDftLgdjXT8+Cw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.29.7.tgz", + "integrity": "sha512-QQt9qKHZ2sg/kivaLr7lnQr8HVrQDdBNSfCsTjiDxRuX/K5ORyKq+Bu8Xr0cDE3Dfkv0cw28Ve0EKyKMvulkOw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1", - "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1", - "@babel/plugin-transform-optional-chaining": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7", + "@babel/plugin-transform-optional-chaining": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -742,14 +741,14 @@ } }, "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.28.6.tgz", - "integrity": "sha512-a0aBScVTlNaiUe35UtfxAN7A/tehvvG4/ByO6+46VPKTRSlfnAFsgKy0FUh+qAkQrDTmhDkT+IBOKlOoMUxQ0g==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.29.7.tgz", + "integrity": "sha512-pn6QacGLgvCcwc+syUhKE/qSjV2D1IHDB84RNxWYSt1mW3K/SCtjinZ2p0cETJxAWBjPy3K/1lHwG5BjjPxNlw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.28.6", - "@babel/traverse": "^7.28.6" + "@babel/helper-plugin-utils": "^7.29.7", + "@babel/traverse": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -772,13 +771,13 @@ } }, "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.28.6.tgz", - "integrity": "sha512-pSJUpFHdx9z5nqTSirOCMtYVP2wFgoWhP0p3g8ONK/4IHhLIBd0B9NYqAvIUAhq+OkhO4VM1tENCt0cjlsNShw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.29.7.tgz", + "integrity": "sha512-/An1OCBN93thpBAGyfsK2pcf0jvju1SAtKkL2Ny++B5Sy6sqgzXDQH1cZxWbF96Wuk+bn41MDA9bLd4VVAw6rw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -788,13 +787,13 @@ } }, "node_modules/@babel/plugin-syntax-import-attributes": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.28.6.tgz", - "integrity": "sha512-jiLC0ma9XkQT3TKJ9uYvlakm66Pamywo+qwL+oL8HJOvc6TWdZXVfhqJr8CCzbSGUAbDOzlGHJC1U+vRfLQDvw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.29.7.tgz", + "integrity": "sha512-zGYcYfq/WmZ4V+kBIXQon9dSSc8ircGZqw9ZaNhhGj9nZkeBu1jHLBDQqYYi5WA9uawvA2sIMbry2nCFhf5Djg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -821,13 +820,13 @@ } }, "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.27.1.tgz", - "integrity": "sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.29.7.tgz", + "integrity": "sha512-N7zArUXWzAMzm+/N0uPBeVB3Fam5lMxtUwMmDK5f/IBBS7a7p1qeUoxd/6CckXoxUdgsntq1Dh8xNW06maZbDQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -837,15 +836,15 @@ } }, "node_modules/@babel/plugin-transform-async-generator-functions": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.29.0.tgz", - "integrity": "sha512-va0VdWro4zlBr2JsXC+ofCPB2iG12wPtVGTWFx2WLDOM3nYQZZIGP82qku2eW/JR83sD+k2k+CsNtyEbUqhU6w==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.29.7.tgz", + "integrity": "sha512-d98gXZkgswvkyohMBABkhm3GeXhYj8psWfwQ2C7gtfrKGTykQa/iOIi+JJhwMjPlZ6Vm2XN+DCf3Es1EoG4ZLA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.28.6", - "@babel/helper-remap-async-to-generator": "^7.27.1", - "@babel/traverse": "^7.29.0" + "@babel/helper-plugin-utils": "^7.29.7", + "@babel/helper-remap-async-to-generator": "^7.29.7", + "@babel/traverse": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -855,15 +854,15 @@ } }, "node_modules/@babel/plugin-transform-async-to-generator": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.28.6.tgz", - "integrity": "sha512-ilTRcmbuXjsMmcZ3HASTe4caH5Tpo93PkTxF9oG2VZsSWsahydmcEHhix9Ik122RcTnZnUzPbmux4wh1swfv7g==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.29.7.tgz", + "integrity": "sha512-pcUb2SS+RMo9TWVBwKGI5ShtoG7R+zBsFmCKDa6fe8c+hPr3XJlZgoE5j6i8W7gDjhyvy+85vmYexanvXh3d1w==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.28.6", - "@babel/helper-plugin-utils": "^7.28.6", - "@babel/helper-remap-async-to-generator": "^7.27.1" + "@babel/helper-module-imports": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7", + "@babel/helper-remap-async-to-generator": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -873,13 +872,13 @@ } }, "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.27.1.tgz", - "integrity": "sha512-cnqkuOtZLapWYZUYM5rVIdv1nXYuFVIltZ6ZJ7nIj585QsjKM5dhL2Fu/lICXZ1OyIAFc7Qy+bvDAtTXqGrlhg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.29.7.tgz", + "integrity": "sha512-cUSmjh72N+rN4PrkFlN1dJwNCwjVp5d38/CQrEsFggkD10UiFlBFgdH3tv5dNsLuHY+3S8db2xCHjhZcv5WgvA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -889,13 +888,13 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.6.tgz", - "integrity": "sha512-tt/7wOtBmwHPNMPu7ax4pdPz6shjFrmHDghvNC+FG9Qvj7D6mJcoRQIF5dy4njmxR941l6rgtvfSB2zX3VlUIw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.29.7.tgz", + "integrity": "sha512-ONyr4+AZhKh8yKWInVxU9AXA9EbsyeLcL6V0dJy6M2/62vuvpGm29zzuymbTpdc451GEpDIdAyPLP3r+P61yKQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -905,14 +904,14 @@ } }, "node_modules/@babel/plugin-transform-class-properties": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.28.6.tgz", - "integrity": "sha512-dY2wS3I2G7D697VHndN91TJr8/AAfXQNt5ynCTI/MpxMsSzHp+52uNivYT5wCPax3whc47DR8Ba7cmlQMg24bw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.29.7.tgz", + "integrity": "sha512-GtcpjFvanPfzNQi3eTitsCqtRRmmqzpy/A+yhTR1HaZo1Ly3EA8ZXxlPyHdR8/IuRMYc3E4wdGBewB2QKQjAaA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.28.6", - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-create-class-features-plugin": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -922,14 +921,14 @@ } }, "node_modules/@babel/plugin-transform-class-static-block": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.28.6.tgz", - "integrity": "sha512-rfQ++ghVwTWTqQ7w8qyDxL1XGihjBss4CmTgGRCTAC9RIbhVpyp4fOeZtta0Lbf+dTNIVJer6ych2ibHwkZqsQ==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.29.7.tgz", + "integrity": "sha512-kibJgmEdX2iMwsHY2tSZNDgj8PwIlCQz7FK9KuGKO8zsuoUwSEhoNnNVp/emKWrbY4HeO6kkXfdMqRKKKXBm2A==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.28.6", - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-create-class-features-plugin": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -939,18 +938,18 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.6.tgz", - "integrity": "sha512-EF5KONAqC5zAqT783iMGuM2ZtmEBy+mJMOKl2BCvPZ2lVrwvXnB6o+OBWCS+CoeCCpVRF2sA2RBKUxvT8tQT5Q==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.29.7.tgz", + "integrity": "sha512-qV0OGGBVacduzQHE649JyCneOFI/maT+YKsO+K4Yi3xv2wTPNjM/W2o2gdzMwEAZz7fXNTHAe0NcSg30bIN69g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.27.3", - "@babel/helper-compilation-targets": "^7.28.6", - "@babel/helper-globals": "^7.28.0", - "@babel/helper-plugin-utils": "^7.28.6", - "@babel/helper-replace-supers": "^7.28.6", - "@babel/traverse": "^7.28.6" + "@babel/helper-annotate-as-pure": "^7.29.7", + "@babel/helper-compilation-targets": "^7.29.7", + "@babel/helper-globals": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7", + "@babel/helper-replace-supers": "^7.29.7", + "@babel/traverse": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -960,14 +959,14 @@ } }, "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.28.6.tgz", - "integrity": "sha512-bcc3k0ijhHbc2lEfpFHgx7eYw9KNXqOerKWfzbxEHUGKnS3sz9C4CNL9OiFN1297bDNfUiSO7DaLzbvHQQQ1BQ==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.29.7.tgz", + "integrity": "sha512-RK7/IyU5phpuCdBAuig5VkzG/EnbDaui5SQGdU9BFrHdV+mV4cUjLMQ9lJDjLNtWHsqtiefpGZUXQP2BiTYMsA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.28.6", - "@babel/template": "^7.28.6" + "@babel/helper-plugin-utils": "^7.29.7", + "@babel/template": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -977,14 +976,14 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.28.5.tgz", - "integrity": "sha512-Kl9Bc6D0zTUcFUvkNuQh4eGXPKKNDOJQXVyyM4ZAQPMveniJdxi8XMJwLo+xSoW3MIq81bD33lcUe9kZpl0MCw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.29.7.tgz", + "integrity": "sha512-iPX8aD6H9zV5s7ZsqTdNocPN/MGQ5sSMnElKrktxjJRMnB2jN/1p2+R7GkfD6CAYoVFqy5A4XnSIUeGgJzIWpg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1", - "@babel/traverse": "^7.28.5" + "@babel/helper-plugin-utils": "^7.29.7", + "@babel/traverse": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -994,14 +993,14 @@ } }, "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.28.6.tgz", - "integrity": "sha512-SljjowuNKB7q5Oayv4FoPzeB74g3QgLt8IVJw9ADvWy3QnUb/01aw8I4AVv8wYnPvQz2GDDZ/g3GhcNyDBI4Bg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.29.7.tgz", + "integrity": "sha512-3qc18hsD2RdZiyJNDNc7HQpv6xbncwh8FYtxNFFzclSyh/trPD9KkVR9BDECUjDLvb7yJVF15GfYUuC+LMkkiQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.28.5", - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-create-regexp-features-plugin": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1011,13 +1010,13 @@ } }, "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.27.1.tgz", - "integrity": "sha512-MTyJk98sHvSs+cvZ4nOauwTTG1JeonDjSGvGGUNHreGQns+Mpt6WX/dVzWBHgg+dYZhkC4X+zTDfkTU+Vy9y7Q==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.29.7.tgz", + "integrity": "sha512-6IvRRriEMqnBwD6chtxdLpMYCHWEzN+oL5cyQtjykya19UgzbmKhxmhZgKC/LHxS2nYr9Q/qYPZ5Lr6jOL9+yQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1027,14 +1026,14 @@ } }, "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.29.0.tgz", - "integrity": "sha512-zBPcW2lFGxdiD8PUnPwJjag2J9otbcLQzvbiOzDxpYXyCuYX9agOwMPGn1prVH0a4qzhCKu24rlH4c1f7yA8rw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.29.7.tgz", + "integrity": "sha512-2wiIyo2BjtgU7HufSeDnL9L2O7zr8jmhFKuSr65VpRkUiRKRNpb0mdlk56+XPPKoIrfHqzbMuglDvZun0RISsA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.28.5", - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-create-regexp-features-plugin": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1044,13 +1043,13 @@ } }, "node_modules/@babel/plugin-transform-dynamic-import": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.27.1.tgz", - "integrity": "sha512-MHzkWQcEmjzzVW9j2q8LGjwGWpG2mjwaaB0BNQwst3FIjqsg8Ct/mIZlvSPJvfi9y2AC8mi/ktxbFVL9pZ1I4A==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.29.7.tgz", + "integrity": "sha512-giOlEm/EFjfjr+te9NsdjkUo2v4f8rS/SXPumRVHAtbNcyNlvtREkU1dZzaIDclNpnaVhlCqRdFKhJBjBikzLg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1060,14 +1059,14 @@ } }, "node_modules/@babel/plugin-transform-explicit-resource-management": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-explicit-resource-management/-/plugin-transform-explicit-resource-management-7.28.6.tgz", - "integrity": "sha512-Iao5Konzx2b6g7EPqTy40UZbcdXE126tTxVFr/nAIj+WItNxjKSYTEw3RC+A2/ZetmdJsgueL1KhaMCQHkLPIg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-explicit-resource-management/-/plugin-transform-explicit-resource-management-7.29.7.tgz", + "integrity": "sha512-Rstj7coNz8sE+7Ju7ihpHLI564lsK5pUpNNlvptCIC/16E/S5hbl6n3kESPKdNRmqEWlpn5xpS5Q2dvXBsySLw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.28.6", - "@babel/plugin-transform-destructuring": "^7.28.5" + "@babel/helper-plugin-utils": "^7.29.7", + "@babel/plugin-transform-destructuring": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1077,13 +1076,13 @@ } }, "node_modules/@babel/plugin-transform-exponentiation-operator": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.28.6.tgz", - "integrity": "sha512-WitabqiGjV/vJ0aPOLSFfNY1u9U3R7W36B03r5I2KoNix+a3sOhJ3pKFB3R5It9/UiK78NiO0KE9P21cMhlPkw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.29.7.tgz", + "integrity": "sha512-zFpMOTLZBdW5LfObqcSbL6kefg4R4eLdmvS0wbN9M6D5Mym/sKm9toOoWyVOa+xDjvCnuWcHls2YonXwHvH3CQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1093,13 +1092,13 @@ } }, "node_modules/@babel/plugin-transform-export-namespace-from": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.27.1.tgz", - "integrity": "sha512-tQvHWSZ3/jH2xuq/vZDy0jNn+ZdXJeM8gHvX4lnJmsc3+50yPlWdZXIc5ay+umX+2/tJIqHqiEqcJvxlmIvRvQ==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.29.7.tgz", + "integrity": "sha512-24B2nOy2TeJSMheqwPD4DDQOV/elLSIlKxjZt4i05H5AgdPdWR3n18HnNrcJ+j76WJd9gbwb9jPjNYUy6RautA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1109,14 +1108,14 @@ } }, "node_modules/@babel/plugin-transform-for-of": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.27.1.tgz", - "integrity": "sha512-BfbWFFEJFQzLCQ5N8VocnCtA8J1CLkNTe2Ms2wocj75dd6VpiqS5Z5quTYcUoo4Yq+DN0rtikODccuv7RU81sw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.29.7.tgz", + "integrity": "sha512-zeSIHh0+E1Um1WJRXCFlHQYu2ieJNdivLLjlBEp+dIBu3S51n+SZZmIXjxnItw6pz56Cn+KvK68BIBVsxq2JiQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1", - "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1126,15 +1125,15 @@ } }, "node_modules/@babel/plugin-transform-function-name": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.27.1.tgz", - "integrity": "sha512-1bQeydJF9Nr1eBCMMbC+hdwmRlsv5XYOMu03YSWFwNs0HsAmtSxxF1fyuYPqemVldVyFmlCU7w8UE14LupUSZQ==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.29.7.tgz", + "integrity": "sha512-otRWaHXE6fbAGkePvaj/kvs3HsqXfPhlnzwSOlnFgbqCPMd975dW+4wZ00WFBt+/YlBGcJwNrARQTOJOb4ZrIg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.27.1", - "@babel/helper-plugin-utils": "^7.27.1", - "@babel/traverse": "^7.27.1" + "@babel/helper-compilation-targets": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7", + "@babel/traverse": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1144,13 +1143,13 @@ } }, "node_modules/@babel/plugin-transform-json-strings": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.28.6.tgz", - "integrity": "sha512-Nr+hEN+0geQkzhbdgQVPoqr47lZbm+5fCUmO70722xJZd0Mvb59+33QLImGj6F+DkK3xgDi1YVysP8whD6FQAw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.29.7.tgz", + "integrity": "sha512-RRnE2+eon1rJAq8MnoF1b5kTpY1vU88twHcvcKMrsqP/jxIRqDVs9iJB5fqPuqyeFAW0wJo4MlUIPpQCq/aRsg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1160,13 +1159,13 @@ } }, "node_modules/@babel/plugin-transform-literals": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.27.1.tgz", - "integrity": "sha512-0HCFSepIpLTkLcsi86GG3mTUzxV5jpmbv97hTETW3yzrAij8aqlD36toB1D0daVFJM8NK6GvKO0gslVQmm+zZA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.29.7.tgz", + "integrity": "sha512-DZ/oLP21ZuWx1vKqnoNv6/tvEK48AQOBRai40CX9dTjGluvT/YZCyY3rryDtyUqCEoyNroy5KKPwX2iQCiRvyw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1176,13 +1175,13 @@ } }, "node_modules/@babel/plugin-transform-logical-assignment-operators": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.28.6.tgz", - "integrity": "sha512-+anKKair6gpi8VsM/95kmomGNMD0eLz1NQ8+Pfw5sAwWH9fGYXT50E55ZpV0pHUHWf6IUTWPM+f/7AAff+wr9A==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.29.7.tgz", + "integrity": "sha512-A0H91hh6W8MFRkp5TqJmMr39jzGD1A1E1Ysiv2O06Sfbhkapm+XyIzxWCEh5kqwOZ1/8QZ0dY3SeQ7XBqfJd5Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1192,13 +1191,13 @@ } }, "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.27.1.tgz", - "integrity": "sha512-hqoBX4dcZ1I33jCSWcXrP+1Ku7kdqXf1oeah7ooKOIiAdKQ+uqftgCFNOSzA5AMS2XIHEYeGFg4cKRCdpxzVOQ==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.29.7.tgz", + "integrity": "sha512-hl1kwFZCCiDyfH25Xmco9jTrkPgnS9pmOzSG7W5I4SaGbLeqKv417hcU2RKmaxoPEgsoJh7ZPOrnPGq99bHoUg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1208,14 +1207,14 @@ } }, "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.27.1.tgz", - "integrity": "sha512-iCsytMg/N9/oFq6n+gFTvUYDZQOMK5kEdeYxmxt91fcJGycfxVP9CnrxoliM0oumFERba2i8ZtwRUCMhvP1LnA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.29.7.tgz", + "integrity": "sha512-fxtQoH3m5ywUSIfaH0FGCzWu4McsYon5bD3K4XnskC7f+OyQMj7rsOMi4NvvmJ83WwBAg4UCe+ov4VZlqEvyew==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.27.1", - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-module-transforms": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1225,14 +1224,14 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.28.6.tgz", - "integrity": "sha512-jppVbf8IV9iWWwWTQIxJMAJCWBuuKx71475wHwYytrRGQ2CWiDvYlADQno3tcYpS/T2UUWFQp3nVtYfK/YBQrA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.29.7.tgz", + "integrity": "sha512-j0vCldybPC5b5dwCQOJ21uKtHzt7hxLygJTg9eF1ScfaikEDNfzn94XoW5Fi+seBR0nCyL23xaBFFkq7dTM8XQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.28.6", - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-module-transforms": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1242,16 +1241,16 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.0.tgz", - "integrity": "sha512-PrujnVFbOdUpw4UHiVwKvKRLMMic8+eC0CuNlxjsyZUiBjhFdPsewdXCkveh2KqBA9/waD0W1b4hXSOBQJezpQ==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.7.tgz", + "integrity": "sha512-TM2ZcQLoG2/y4HODiStCo10DibYhWhGWAwVv+EQKmG/7GFl0N+AAmUiXOMKM+aiJ9XBJ9AHVZBvTzMnJ2sM3cQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.28.6", - "@babel/helper-plugin-utils": "^7.28.6", - "@babel/helper-validator-identifier": "^7.28.5", - "@babel/traverse": "^7.29.0" + "@babel/helper-module-transforms": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7", + "@babel/helper-validator-identifier": "^7.29.7", + "@babel/traverse": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1261,14 +1260,14 @@ } }, "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.27.1.tgz", - "integrity": "sha512-iQBE/xC5BV1OxJbp6WG7jq9IWiD+xxlZhLrdwpPkTX3ydmXdvoCpyfJN7acaIBZaOqTfr76pgzqBJflNbeRK+w==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.29.7.tgz", + "integrity": "sha512-B4UkaTK3QpgCwJnrxKfMPKdo92CN7OKXAlpAAnM3UPu0Q0lCCk57ylA9AJbRy2v8dDKOPAAWcoR6CMyeoHwRCA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.27.1", - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-module-transforms": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1278,14 +1277,14 @@ } }, "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.29.0.tgz", - "integrity": "sha512-1CZQA5KNAD6ZYQLPw7oi5ewtDNxH/2vuCh+6SmvgDfhumForvs8a1o9n0UrEoBD8HU4djO2yWngTQlXl1NDVEQ==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.29.7.tgz", + "integrity": "sha512-vuFoLwr4qnv2xbZ16SQd6uPcH5FNrLHhk/Jzo++0XJFcaDsr4gjJVg6j398oMHiC+83k/GiBzviwF5KBJkPUtQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.28.5", - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-create-regexp-features-plugin": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1295,13 +1294,13 @@ } }, "node_modules/@babel/plugin-transform-new-target": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.27.1.tgz", - "integrity": "sha512-f6PiYeqXQ05lYq3TIfIDu/MtliKUbNwkGApPUvyo6+tc7uaR4cPjPe7DFPr15Uyycg2lZU6btZ575CuQoYh7MQ==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.29.7.tgz", + "integrity": "sha512-fEo41GmsOUhOBlw8ioo6zvjX5Xc2Lqkzlyfqbpsk3eB6TReV18uhxZ0esfEokVbY2+PVJAQHNKxER6lGrzNd3A==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1311,13 +1310,13 @@ } }, "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.28.6.tgz", - "integrity": "sha512-3wKbRgmzYbw24mDJXT7N+ADXw8BC/imU9yo9c9X9NKaLF1fW+e5H1U5QjMUBe4Qo4Ox/o++IyUkl1sVCLgevKg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.29.7.tgz", + "integrity": "sha512-idmp1dFaekP9GbcMvG24Kvw2BfhFZjHnNJCkV4WuIY4PskJzwI3f1N5OdgYke38T7rftO6ERulFRn2cFeZwRkg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1327,13 +1326,13 @@ } }, "node_modules/@babel/plugin-transform-numeric-separator": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.28.6.tgz", - "integrity": "sha512-SJR8hPynj8outz+SlStQSwvziMN4+Bq99it4tMIf5/Caq+3iOc0JtKyse8puvyXkk3eFRIA5ID/XfunGgO5i6w==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.29.7.tgz", + "integrity": "sha512-zR7fv/z14OjgHl4AgRtkDBvBMhIzCxqV/qN/2BCRC7LjFwvuzjYe7gDWxC4Wl/SNsLM6SE1IWvRPYMgSJaUvNw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1343,17 +1342,17 @@ } }, "node_modules/@babel/plugin-transform-object-rest-spread": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.6.tgz", - "integrity": "sha512-5rh+JR4JBC4pGkXLAcYdLHZjXudVxWMXbB6u6+E9lRL5TrGVbHt1TjxGbZ8CkmYw9zjkB7jutzOROArsqtncEA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.29.7.tgz", + "integrity": "sha512-Ld98jn4c0smUywL57m7SgsHq3OpThOa6LqZJif3G6jYOovPleoFhVrBJ1WegRApSFB2wu4+RelAj9AC9G08Z4A==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.28.6", - "@babel/helper-plugin-utils": "^7.28.6", - "@babel/plugin-transform-destructuring": "^7.28.5", - "@babel/plugin-transform-parameters": "^7.27.7", - "@babel/traverse": "^7.28.6" + "@babel/helper-compilation-targets": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7", + "@babel/plugin-transform-destructuring": "^7.29.7", + "@babel/plugin-transform-parameters": "^7.29.7", + "@babel/traverse": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1363,14 +1362,14 @@ } }, "node_modules/@babel/plugin-transform-object-super": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.27.1.tgz", - "integrity": "sha512-SFy8S9plRPbIcxlJ8A6mT/CxFdJx/c04JEctz4jf8YZaVS2px34j7NXRrlGlHkN/M2gnpL37ZpGRGVFLd3l8Ng==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.29.7.tgz", + "integrity": "sha512-Ea/diGcw0twB5IlZPO5sgET6fJsLJqPABqTuFWIR+iMPGPZJkATEIWx0wa+aEQ5UY1CBQyP/gkAiLEqn1vBiQA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1", - "@babel/helper-replace-supers": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7", + "@babel/helper-replace-supers": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1380,13 +1379,13 @@ } }, "node_modules/@babel/plugin-transform-optional-catch-binding": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.28.6.tgz", - "integrity": "sha512-R8ja/Pyrv0OGAvAXQhSTmWyPJPml+0TMqXlO5w+AsMEiwb2fg3WkOvob7UxFSL3OIttFSGSRFKQsOhJ/X6HQdQ==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.29.7.tgz", + "integrity": "sha512-sLsyndxK2VwX6yNUOakMb7Sh553ZTe/vVM1XJ+9Z5aW1ytsc8xOIwmyk05NNjN60vkc5/KqoTH6hB4V41LJhng==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1396,14 +1395,14 @@ } }, "node_modules/@babel/plugin-transform-optional-chaining": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.28.6.tgz", - "integrity": "sha512-A4zobikRGJTsX9uqVFdafzGkqD30t26ck2LmOzAuLL8b2x6k3TIqRiT2xVvA9fNmFeTX484VpsdgmKNA0bS23w==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.29.7.tgz", + "integrity": "sha512-6GM1dhvK3gNODkXcEcMCOLEDCLSoZ/sBbro2Ax8HURyasQ4NshagQixkRFdh5niI6E4gmA/jYI/4aT7rRos3ZQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.28.6", - "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1413,13 +1412,13 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.27.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.27.7.tgz", - "integrity": "sha512-qBkYTYCb76RRxUM6CcZA5KRu8K4SM8ajzVeUgVdMVO9NN9uI/GaVmBg/WKJJGnNokV9SY8FxNOVWGXzqzUidBg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.29.7.tgz", + "integrity": "sha512-ZDOBqV/qLYJI0YElr8DcENEyARsFQeESqWXH6gZlghYXuPPjvweuDhP4VyEi4BlUBlLRFZVjxoZDMjxhLW766g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1429,14 +1428,14 @@ } }, "node_modules/@babel/plugin-transform-private-methods": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.28.6.tgz", - "integrity": "sha512-piiuapX9CRv7+0st8lmuUlRSmX6mBcVeNQ1b4AYzJxfCMuBfB0vBXDiGSmm03pKJw1v6cZ8KSeM+oUnM6yAExg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.29.7.tgz", + "integrity": "sha512-/6Rz4DK1ETDEM/bWHsPHcaEe7ZaT1EqSXjtSP/L0DijOYuaUhiRiOKcwpZ8P7zR4xXEHc2ITdiCgBm9Tpyv9ug==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.28.6", - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-create-class-features-plugin": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1446,15 +1445,15 @@ } }, "node_modules/@babel/plugin-transform-private-property-in-object": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.28.6.tgz", - "integrity": "sha512-b97jvNSOb5+ehyQmBpmhOCiUC5oVK4PMnpRvO7+ymFBoqYjeDHIU9jnrNUuwHOiL9RpGDoKBpSViarV+BU+eVA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.29.7.tgz", + "integrity": "sha512-+BNo06dnrzdNNqCm1X6YUaVv0DKk8Q+JYcoZfOkLhYWNCXzlwTSRq8zGWayT1csjcpNXV9CQTBRRbmTLZac5cA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.27.3", - "@babel/helper-create-class-features-plugin": "^7.28.6", - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-annotate-as-pure": "^7.29.7", + "@babel/helper-create-class-features-plugin": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1464,13 +1463,13 @@ } }, "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.27.1.tgz", - "integrity": "sha512-oThy3BCuCha8kDZ8ZkgOg2exvPYUlprMukKQXI1r1pJ47NCvxfkEy8vK+r/hT9nF0Aa4H1WUPZZjHTFtAhGfmQ==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.29.7.tgz", + "integrity": "sha512-bOMRLQuI0A5ZqHq3OWJ89/rXpJ/NJrbVhXiP4zwPGMs6kpcVsuTUNjwoE30K0Qm3mf48a/TnRYYD6vPNqcg6jA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1480,13 +1479,13 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.29.0.tgz", - "integrity": "sha512-FijqlqMA7DmRdg/aINBSs04y8XNTYw/lr1gJ2WsmBnnaNw1iS43EPkJW+zK7z65auG3AWRFXWj+NcTQwYptUog==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.29.7.tgz", + "integrity": "sha512-rNNFV0DBAJp988xW2DOntfDoYn1eR8GGF5AT5vYc+rjyfaQkM242c9tZUHHPe7KYaiJizXPWhQTzzdbXySyhBw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1496,14 +1495,14 @@ } }, "node_modules/@babel/plugin-transform-regexp-modifiers": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.28.6.tgz", - "integrity": "sha512-QGWAepm9qxpaIs7UM9FvUSnCGlb8Ua1RhyM4/veAxLwt3gMat/LSGrZixyuj4I6+Kn9iwvqCyPTtbdxanYoWYg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.29.7.tgz", + "integrity": "sha512-mB5Fs0VWrJ42ZCmc8114v60qetdaUVNkj9PmSZRmanCZM3S9hm0CFRLjRmYIsuXav14l2jvZ+4T8iiCGnhj3nQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.28.5", - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-create-regexp-features-plugin": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1513,13 +1512,13 @@ } }, "node_modules/@babel/plugin-transform-reserved-words": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.27.1.tgz", - "integrity": "sha512-V2ABPHIJX4kC7HegLkYoDpfg9PVmuWy/i6vUM5eGK22bx4YVFD3M5F0QQnWQoDs6AGsUWTVOopBiMFQgHaSkVw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.29.7.tgz", + "integrity": "sha512-5+YhdpVgmfSmwZyLMftfaiffLRMHjzIRHFHHLdibcSyJm2pasMrKHrO3Ptrt2DRshjvpgjEJJ1zVW14WPq/6QA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1529,13 +1528,13 @@ } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.27.1.tgz", - "integrity": "sha512-N/wH1vcn4oYawbJ13Y/FxcQrWk63jhfNa7jef0ih7PHSIHX2LB7GWE1rkPrOnka9kwMxb6hMl19p7lidA+EHmQ==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.29.7.tgz", + "integrity": "sha512-I+WYbGBAiCn7nA6xBrlgPH+MB7HWb4u8pv5S0Pv7OtwNvIFvCCb24YlttKEeUFVurfBCEaOTnuhlqsb7f0Z5Dg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1545,14 +1544,14 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.28.6.tgz", - "integrity": "sha512-9U4QObUC0FtJl05AsUcodau/RWDytrU6uKgkxu09mLR9HLDAtUMoPuuskm5huQsoktmsYpI+bGmq+iapDcriKA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.29.7.tgz", + "integrity": "sha512-/u5K1QWada7tbYNqTjMh96718g9NTwh9tfPJMsSmVsQwGT447FskV+KcfeXkXq2GWki4EM/MuTdmBec+hOuVTQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.28.6", - "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7", + "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1562,13 +1561,13 @@ } }, "node_modules/@babel/plugin-transform-sticky-regex": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.27.1.tgz", - "integrity": "sha512-lhInBO5bi/Kowe2/aLdBAawijx+q1pQzicSgnkB6dUPc1+RC8QmJHKf2OjvU+NZWitguJHEaEmbV6VWEouT58g==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.29.7.tgz", + "integrity": "sha512-BCHzNYJGe9l7EpwwDBN/ztlL2NYFFq8hp9ddjtUEM9f2O7S7kKV/lL6Fwo7IF7NSkYhPK2vO+86nIGltA90MsA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1578,13 +1577,13 @@ } }, "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.27.1.tgz", - "integrity": "sha512-fBJKiV7F2DxZUkg5EtHKXQdbsbURW3DZKQUWphDum0uRP6eHGGa/He9mc0mypL680pb+e/lDIthRohlv8NCHkg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.29.7.tgz", + "integrity": "sha512-NCSEJ4sLFU2gqAub45HYh4fus2yQ36rr6ei6vpU7NdoJqCpxvEG8E6eJpscGyXP3VHD2Ny+fSXr04k1hoUrFqA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1594,13 +1593,13 @@ } }, "node_modules/@babel/plugin-transform-typeof-symbol": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.27.1.tgz", - "integrity": "sha512-RiSILC+nRJM7FY5srIyc4/fGIwUhyDuuBSdWn4y6yT6gm652DpCHZjIipgn6B7MQ1ITOUnAKWixEUjQRIBIcLw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.29.7.tgz", + "integrity": "sha512-223mNGoTkBiTEWFoK+Q6Go3tueMRclO8vxxxxquNCYuNI4jWOofFKJRRDu6SDrB8Sgo1UEGW9T4GAQ8ZyRso1A==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1610,13 +1609,13 @@ } }, "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.27.1.tgz", - "integrity": "sha512-Ysg4v6AmF26k9vpfFuTZg8HRfVWzsh1kVfowA23y9j/Gu6dOuahdUVhkLqpObp3JIv27MLSii6noRnuKN8H0Mg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.29.7.tgz", + "integrity": "sha512-jCfXxSjf94lf4E0hKE0AByxF6F3/pVFqRdUUNkDJhsY0m1ZKjnN6ZYyMeHNpzflxb/0q5b7t3p+BE+SLF1WOtA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1626,14 +1625,14 @@ } }, "node_modules/@babel/plugin-transform-unicode-property-regex": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.28.6.tgz", - "integrity": "sha512-4Wlbdl/sIZjzi/8St0evF0gEZrgOswVO6aOzqxh1kDZOl9WmLrHq2HtGhnOJZmHZYKP8WZ1MDLCt5DAWwRo57A==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.29.7.tgz", + "integrity": "sha512-OgZ+zoAJgZLUCunsTRQ5LAjOywDv5zzZ2/hQ5aMw1pGXyY2rtE8/chXYUmu3AlVHKpm10KEdG9aMwbI/K76ZGw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.28.5", - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-create-regexp-features-plugin": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1643,14 +1642,14 @@ } }, "node_modules/@babel/plugin-transform-unicode-regex": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.27.1.tgz", - "integrity": "sha512-xvINq24TRojDuyt6JGtHmkVkrfVV3FPT16uytxImLeBZqW3/H52yN+kM1MGuyPkIQxrzKwPHs5U/MP3qKyzkGw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.29.7.tgz", + "integrity": "sha512-7D/x/23/d/3VqZ0QA+LGbZMlGwZjztBygSWWWsfTPoQ1oQ6Q1P6Mr3d0kk42XabyUVw+fha3LqdRsFqeKqvCyA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.27.1", - "@babel/helper-plugin-utils": "^7.27.1" + "@babel/helper-create-regexp-features-plugin": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1660,14 +1659,14 @@ } }, "node_modules/@babel/plugin-transform-unicode-sets-regex": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.28.6.tgz", - "integrity": "sha512-/wHc/paTUmsDYN7SZkpWxogTOBNnlx7nBQYfy6JJlCT7G3mVhltk3e++N7zV0XfgGsrqBxd4rJQt9H16I21Y1Q==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.29.7.tgz", + "integrity": "sha512-BLOhLht9DOJwIxlmp91wHvkXv1lguuHS3/FwUO8HL1H0u8s4hR1gASVFyilu9iGtcTRYqjTZmlsFFeQletntEg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.28.5", - "@babel/helper-plugin-utils": "^7.28.6" + "@babel/helper-create-regexp-features-plugin": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1677,77 +1676,77 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.29.3", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.29.3.tgz", - "integrity": "sha512-ySZypNLAIH1ClygLDQzVMoGQRViATnkHkYYV6TcNDz+8+jwZCdsguGvsb3EY5d9wyWyhmF1iSuFM0Yh5XPnqSA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.29.7.tgz", + "integrity": "sha512-GYzX36n1nsciIb0uyH0GHwxwtNwPQIcpxSeiVLDtG/B7jB5xXgchnmL1f/jCX5o+pwnaDBtO60ONSJhEBJfxYA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.29.3", - "@babel/helper-compilation-targets": "^7.28.6", - "@babel/helper-plugin-utils": "^7.28.6", - "@babel/helper-validator-option": "^7.27.1", - "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.28.5", - "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.27.1", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.27.1", - "@babel/plugin-bugfix-safari-rest-destructuring-rhs-array": "^7.29.3", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.27.1", - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.28.6", + "@babel/compat-data": "^7.29.7", + "@babel/helper-compilation-targets": "^7.29.7", + "@babel/helper-plugin-utils": "^7.29.7", + "@babel/helper-validator-option": "^7.29.7", + "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.29.7", + "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.29.7", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.29.7", + "@babel/plugin-bugfix-safari-rest-destructuring-rhs-array": "^7.29.7", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.29.7", + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.29.7", "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", - "@babel/plugin-syntax-import-assertions": "^7.28.6", - "@babel/plugin-syntax-import-attributes": "^7.28.6", + "@babel/plugin-syntax-import-assertions": "^7.29.7", + "@babel/plugin-syntax-import-attributes": "^7.29.7", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", - "@babel/plugin-transform-arrow-functions": "^7.27.1", - "@babel/plugin-transform-async-generator-functions": "^7.29.0", - "@babel/plugin-transform-async-to-generator": "^7.28.6", - "@babel/plugin-transform-block-scoped-functions": "^7.27.1", - "@babel/plugin-transform-block-scoping": "^7.28.6", - "@babel/plugin-transform-class-properties": "^7.28.6", - "@babel/plugin-transform-class-static-block": "^7.28.6", - "@babel/plugin-transform-classes": "^7.28.6", - "@babel/plugin-transform-computed-properties": "^7.28.6", - "@babel/plugin-transform-destructuring": "^7.28.5", - "@babel/plugin-transform-dotall-regex": "^7.28.6", - "@babel/plugin-transform-duplicate-keys": "^7.27.1", - "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.29.0", - "@babel/plugin-transform-dynamic-import": "^7.27.1", - "@babel/plugin-transform-explicit-resource-management": "^7.28.6", - "@babel/plugin-transform-exponentiation-operator": "^7.28.6", - "@babel/plugin-transform-export-namespace-from": "^7.27.1", - "@babel/plugin-transform-for-of": "^7.27.1", - "@babel/plugin-transform-function-name": "^7.27.1", - "@babel/plugin-transform-json-strings": "^7.28.6", - "@babel/plugin-transform-literals": "^7.27.1", - "@babel/plugin-transform-logical-assignment-operators": "^7.28.6", - "@babel/plugin-transform-member-expression-literals": "^7.27.1", - "@babel/plugin-transform-modules-amd": "^7.27.1", - "@babel/plugin-transform-modules-commonjs": "^7.28.6", - "@babel/plugin-transform-modules-systemjs": "^7.29.0", - "@babel/plugin-transform-modules-umd": "^7.27.1", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.29.0", - "@babel/plugin-transform-new-target": "^7.27.1", - "@babel/plugin-transform-nullish-coalescing-operator": "^7.28.6", - "@babel/plugin-transform-numeric-separator": "^7.28.6", - "@babel/plugin-transform-object-rest-spread": "^7.28.6", - "@babel/plugin-transform-object-super": "^7.27.1", - "@babel/plugin-transform-optional-catch-binding": "^7.28.6", - "@babel/plugin-transform-optional-chaining": "^7.28.6", - "@babel/plugin-transform-parameters": "^7.27.7", - "@babel/plugin-transform-private-methods": "^7.28.6", - "@babel/plugin-transform-private-property-in-object": "^7.28.6", - "@babel/plugin-transform-property-literals": "^7.27.1", - "@babel/plugin-transform-regenerator": "^7.29.0", - "@babel/plugin-transform-regexp-modifiers": "^7.28.6", - "@babel/plugin-transform-reserved-words": "^7.27.1", - "@babel/plugin-transform-shorthand-properties": "^7.27.1", - "@babel/plugin-transform-spread": "^7.28.6", - "@babel/plugin-transform-sticky-regex": "^7.27.1", - "@babel/plugin-transform-template-literals": "^7.27.1", - "@babel/plugin-transform-typeof-symbol": "^7.27.1", - "@babel/plugin-transform-unicode-escapes": "^7.27.1", - "@babel/plugin-transform-unicode-property-regex": "^7.28.6", - "@babel/plugin-transform-unicode-regex": "^7.27.1", - "@babel/plugin-transform-unicode-sets-regex": "^7.28.6", + "@babel/plugin-transform-arrow-functions": "^7.29.7", + "@babel/plugin-transform-async-generator-functions": "^7.29.7", + "@babel/plugin-transform-async-to-generator": "^7.29.7", + "@babel/plugin-transform-block-scoped-functions": "^7.29.7", + "@babel/plugin-transform-block-scoping": "^7.29.7", + "@babel/plugin-transform-class-properties": "^7.29.7", + "@babel/plugin-transform-class-static-block": "^7.29.7", + "@babel/plugin-transform-classes": "^7.29.7", + "@babel/plugin-transform-computed-properties": "^7.29.7", + "@babel/plugin-transform-destructuring": "^7.29.7", + "@babel/plugin-transform-dotall-regex": "^7.29.7", + "@babel/plugin-transform-duplicate-keys": "^7.29.7", + "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.29.7", + "@babel/plugin-transform-dynamic-import": "^7.29.7", + "@babel/plugin-transform-explicit-resource-management": "^7.29.7", + "@babel/plugin-transform-exponentiation-operator": "^7.29.7", + "@babel/plugin-transform-export-namespace-from": "^7.29.7", + "@babel/plugin-transform-for-of": "^7.29.7", + "@babel/plugin-transform-function-name": "^7.29.7", + "@babel/plugin-transform-json-strings": "^7.29.7", + "@babel/plugin-transform-literals": "^7.29.7", + "@babel/plugin-transform-logical-assignment-operators": "^7.29.7", + "@babel/plugin-transform-member-expression-literals": "^7.29.7", + "@babel/plugin-transform-modules-amd": "^7.29.7", + "@babel/plugin-transform-modules-commonjs": "^7.29.7", + "@babel/plugin-transform-modules-systemjs": "^7.29.7", + "@babel/plugin-transform-modules-umd": "^7.29.7", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.29.7", + "@babel/plugin-transform-new-target": "^7.29.7", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.29.7", + "@babel/plugin-transform-numeric-separator": "^7.29.7", + "@babel/plugin-transform-object-rest-spread": "^7.29.7", + "@babel/plugin-transform-object-super": "^7.29.7", + "@babel/plugin-transform-optional-catch-binding": "^7.29.7", + "@babel/plugin-transform-optional-chaining": "^7.29.7", + "@babel/plugin-transform-parameters": "^7.29.7", + "@babel/plugin-transform-private-methods": "^7.29.7", + "@babel/plugin-transform-private-property-in-object": "^7.29.7", + "@babel/plugin-transform-property-literals": "^7.29.7", + "@babel/plugin-transform-regenerator": "^7.29.7", + "@babel/plugin-transform-regexp-modifiers": "^7.29.7", + "@babel/plugin-transform-reserved-words": "^7.29.7", + "@babel/plugin-transform-shorthand-properties": "^7.29.7", + "@babel/plugin-transform-spread": "^7.29.7", + "@babel/plugin-transform-sticky-regex": "^7.29.7", + "@babel/plugin-transform-template-literals": "^7.29.7", + "@babel/plugin-transform-typeof-symbol": "^7.29.7", + "@babel/plugin-transform-unicode-escapes": "^7.29.7", + "@babel/plugin-transform-unicode-property-regex": "^7.29.7", + "@babel/plugin-transform-unicode-regex": "^7.29.7", + "@babel/plugin-transform-unicode-sets-regex": "^7.29.7", "@babel/preset-modules": "0.1.6-no-external-plugins", "babel-plugin-polyfill-corejs2": "^0.4.15", "babel-plugin-polyfill-corejs3": "^0.14.0", @@ -1788,33 +1787,33 @@ } }, "node_modules/@babel/template": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz", - "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz", + "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.28.6", - "@babel/parser": "^7.28.6", - "@babel/types": "^7.28.6" + "@babel/code-frame": "^7.29.7", + "@babel/parser": "^7.29.7", + "@babel/types": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz", - "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.7.tgz", + "integrity": "sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.29.0", - "@babel/generator": "^7.29.0", - "@babel/helper-globals": "^7.28.0", - "@babel/parser": "^7.29.0", - "@babel/template": "^7.28.6", - "@babel/types": "^7.29.0", + "@babel/code-frame": "^7.29.7", + "@babel/generator": "^7.29.7", + "@babel/helper-globals": "^7.29.7", + "@babel/parser": "^7.29.7", + "@babel/template": "^7.29.7", + "@babel/types": "^7.29.7", "debug": "^4.3.1" }, "engines": { @@ -1822,14 +1821,14 @@ } }, "node_modules/@babel/types": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz", - "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz", + "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.27.1", - "@babel/helper-validator-identifier": "^7.28.5" + "@babel/helper-string-parser": "^7.29.7", + "@babel/helper-validator-identifier": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1884,9 +1883,9 @@ } }, "node_modules/@csstools/css-calc": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-3.2.0.tgz", - "integrity": "sha512-bR9e6o2BDB12jzN/gIbjHa5wLJ4UjD1CB9pM7ehlc0ddk6EBz+yYS1EV2MF55/HUxrHcB/hehAyt5vhsA3hx7w==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-3.2.1.tgz", + "integrity": "sha512-DtdHlgXh5ZkA43cwBcAm+huzgJiwx3ZTWVjBs94kwz2xKqSimDA3lBgCjphYgwgVUMWatSM0pDd8TILB1yrVVg==", "dev": true, "funding": [ { @@ -1908,9 +1907,9 @@ } }, "node_modules/@csstools/css-color-parser": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.1.0.tgz", - "integrity": "sha512-U0KhLYmy2GVj6q4T3WaAe6NPuFYCPQoE3b0dRGxejWDgcPp8TP7S5rVdM5ZrFaqu4N67X8YaPBw14dQSYx3IyQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.1.1.tgz", + "integrity": "sha512-eZ5XOtyhK+mggRafYUWzA0tvaYOFgdY8AkgQiCJF9qNAePnUo/zmsqqYubBBb3sQ8uNUaSKTY9s9klfRaAXL0g==", "dev": true, "funding": [ { @@ -1925,7 +1924,7 @@ "license": "MIT", "dependencies": { "@csstools/color-helpers": "^6.0.2", - "@csstools/css-calc": "^3.2.0" + "@csstools/css-calc": "^3.2.1" }, "engines": { "node": ">=20.19.0" @@ -1959,9 +1958,9 @@ } }, "node_modules/@csstools/css-syntax-patches-for-csstree": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.3.tgz", - "integrity": "sha512-SH60bMfrRCJF3morcdk57WklujF4Jr/EsQUzqkarfHXEFcAR1gg7fS/chAE922Sehgzc1/+Tz5H3Ypa1HiEKrg==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.4.tgz", + "integrity": "sha512-wgsqt92b7C7tQhIdPNxj0n9zuUbQlvAuI1exyzeNrOKOi62SD7ren8zqszmpVREjAOqg8cD2FqYhQfAuKjk4sw==", "dev": true, "funding": [ { @@ -2090,7 +2089,6 @@ "dev": true, "license": "MIT", "optional": true, - "peer": true, "dependencies": { "@emnapi/wasi-threads": "1.2.1", "tslib": "^2.4.0" @@ -2103,7 +2101,6 @@ "dev": true, "license": "MIT", "optional": true, - "peer": true, "dependencies": { "tslib": "^2.4.0" } @@ -2115,7 +2112,6 @@ "dev": true, "license": "MIT", "optional": true, - "peer": true, "dependencies": { "tslib": "^2.4.0" } @@ -2231,9 +2227,9 @@ } }, "node_modules/@eslint/config-helpers": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.5.5.tgz", - "integrity": "sha512-eIJYKTCECbP/nsKaaruF6LW967mtbQbsw4JTtSVkUQc9MneSkbrgPJAbKl9nWr0ZeowV8BfsarBmPpBzGelA2w==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.6.0.tgz", + "integrity": "sha512-ii6Bw9jJ2zi2cWA2Z+9/QZ/+3DX6kwaV5Q986D/CdP3Lap3w/pgQZ373FV7byY/i7L4IRH/G43I5dz1ClsCbpA==", "license": "Apache-2.0", "dependencies": { "@eslint/core": "^1.2.1" @@ -2427,9 +2423,9 @@ } }, "node_modules/@exodus/bytes": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/@exodus/bytes/-/bytes-1.15.0.tgz", - "integrity": "sha512-UY0nlA+feH81UGSHv92sLEPLCeZFjXOuHhrIo0HQydScuQc8s0A7kL/UdgwgDq8g8ilksmuoF35YVTNphV2aBQ==", + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/@exodus/bytes/-/bytes-1.15.1.tgz", + "integrity": "sha512-S6mL0yNB/Abt9Ei4tq8gDhcczc4S3+vQ4ra7vxnAf+YHC02srtqxKKZghx2Dq6p0e66THKwR6r8N6P95wEty7Q==", "dev": true, "license": "MIT", "engines": { @@ -2697,9 +2693,9 @@ } }, "node_modules/@loaderkit/resolve": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@loaderkit/resolve/-/resolve-1.0.5.tgz", - "integrity": "sha512-fhkdGM57xhJ7CO91MUgbQlb0ClP0AJ9vB3yoVnBTslYJqrJOCVEbOprZcxZlexdMbmTBPQqVcQYr+j4oRRtIZA==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@loaderkit/resolve/-/resolve-1.0.6.tgz", + "integrity": "sha512-G8FdIoF5CypfwmD9rl8BXod5HDn8JqB0CCNBXDTaRZ+yRYhARrrSToX1zg1zy9jX3zLqigsELwhT4gNtkdQAUg==", "dev": true, "license": "ISC", "dependencies": { @@ -2813,6 +2809,382 @@ "node": ">= 8" } }, + "node_modules/@oxc-parser/binding-android-arm-eabi": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-android-arm-eabi/-/binding-android-arm-eabi-0.130.0.tgz", + "integrity": "sha512-h/xYU8/7ADWzVSf5I+YalLpj33LOy9CI/zgbJNIZ5eunRBG+Czqa3lZsvuPHHf3rOt6z1c5+UzoxjbAzAvhwVw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-parser/binding-android-arm64": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-android-arm64/-/binding-android-arm64-0.130.0.tgz", + "integrity": "sha512-oFWFJrsGv9siFM4HjMqKNB7IuIZD/SMmZdCXl8xyx7lDplGvPKyewpOo272rSWgMXe2Wx7bWI0Yj+gkHv4qbeg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-parser/binding-darwin-arm64": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-arm64/-/binding-darwin-arm64-0.130.0.tgz", + "integrity": "sha512-sGUzupdTplK9jQg7eJZ878HfEgQjJNBc6dAYVWJ9W5aU+J8rLfRJhTVsKThiu1pNwm6Y1qKCcbC6WhNWSXR3Ig==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-parser/binding-darwin-x64": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-x64/-/binding-darwin-x64-0.130.0.tgz", + "integrity": "sha512-PsB4cdCISbC00Uy8eiD8bc2AkGWjZqrSrJnkBFuG2ptrrf6mZ2F5gLFSjOAVMMgZPg8B1D7OydJwLWSfyI2Plg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-parser/binding-freebsd-x64": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-freebsd-x64/-/binding-freebsd-x64-0.130.0.tgz", + "integrity": "sha512-DgABp3l38hS77JbXCV4qk1+n6DPym5u8zzwuweokezm2tX194nDSJDENbDRECxVsiNbprKATLbk+Z5wlHT0OHw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-parser/binding-linux-arm-gnueabihf": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-0.130.0.tgz", + "integrity": "sha512-4Kn3CTEmwFrzhTSC/JuUW16qovmaMdX7jeSKbL8w0pLtLww7To1a2XJi9Z5uD8QWUkfUHhqfV+VD6dVzBnWzoA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-parser/binding-linux-arm-musleabihf": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-0.130.0.tgz", + "integrity": "sha512-D35KZM3F4rRu1uAFKyBlg3Gaf/ybCjyaPR1hfgvk5ex8NtcTmRgc0JgSighEyNg96TPrFhemFba68SZuxaha8w==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-parser/binding-linux-arm64-gnu": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.130.0.tgz", + "integrity": "sha512-Q9o7oVlo955KHwS8l1u0bCzIx+JsZUA3XToLXC+MsMhye/9LeBQbt84nh120cl2XLy+TEzvugYDiHShg5yaX6Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-parser/binding-linux-arm64-musl": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.130.0.tgz", + "integrity": "sha512-EiJ/gC0ljbcwVpycC8YWw6ggMbtsPX8XMOt0mPx0aqWeMsNR+L9m05Flbvd5T+GlivG+GkSWQL7tM9SRFpM/dw==", + "cpu": [ + "arm64" + ], + "dev": true, + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-parser/binding-linux-ppc64-gnu": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-0.130.0.tgz", + "integrity": "sha512-b+h/lsLLurp756dMGizNs5uPaJfyEdWrTcV5t8M609jWm1DEHB1StpRXCkyvwtkJx3m+qL5BNQ0dEKan/4yGFA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-parser/binding-linux-riscv64-gnu": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-0.130.0.tgz", + "integrity": "sha512-O19Cil83XAyjEFfo8WhkMwY58ALqZ7ckjGL+25mjMIuF84urWBeANH0FC8B8BsSSygWU3/1aY3ADdDbp+wlBnw==", + "cpu": [ + "riscv64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-parser/binding-linux-riscv64-musl": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-0.130.0.tgz", + "integrity": "sha512-BgXRVC0+83n3YzCscLQjj6nbyeBIVeZYPTI4fFMAE4WNm2+4RXhWp03IVizL7esIz36kgmT48aebk1iM+cs8sw==", + "cpu": [ + "riscv64" + ], + "dev": true, + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-parser/binding-linux-s390x-gnu": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-0.130.0.tgz", + "integrity": "sha512-6tJz0xvnGhsokE7N1WlUSBXibpYmT9xSJFS1Ce41Km/+8gQvdlW8MLhRv8PD0L7ix8vRG0FDDepp3jdOFzdVdw==", + "cpu": [ + "s390x" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-parser/binding-linux-x64-gnu": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.130.0.tgz", + "integrity": "sha512-9aCWj83dp3heTQGmGnZGdIWgxjZrr/7VQ0TGFHH5PKByxJKF2Hcr4qvaSUHhhGEa3MSsDjTL1YDP8RAgdL5/Cg==", + "cpu": [ + "x64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-parser/binding-linux-x64-musl": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-musl/-/binding-linux-x64-musl-0.130.0.tgz", + "integrity": "sha512-afXt87aZBqrUVli8TB/I8H1G50RDWcwirjWtXGXYqJ2ZqWEiErH7V72j3LUSDZaivmtu2OLX0KQ/mbhP81mr7A==", + "cpu": [ + "x64" + ], + "dev": true, + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-parser/binding-openharmony-arm64": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-openharmony-arm64/-/binding-openharmony-arm64-0.130.0.tgz", + "integrity": "sha512-I0NCrZV/YZuCGWgqwNN/GO/iXlLF2z+Wgc7u+Aa9N4P51oYeIa0XT+zVBUne4csO9GqxskXgI4g8JzzWGRpfOw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-parser/binding-wasm32-wasi": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-wasm32-wasi/-/binding-wasm32-wasi-0.130.0.tgz", + "integrity": "sha512-sJgQkGaBX0WJvPUDfwciex6IcTk5O5NLQ1bhEb6f3nBruh1GshKMRSMt2bxZlYrgBzjyBbJzsnO+InPG0bg+fA==", + "cpu": [ + "wasm32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/core": "1.10.0", + "@emnapi/runtime": "1.10.0", + "@napi-rs/wasm-runtime": "^1.1.4" + }, + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-parser/binding-win32-arm64-msvc": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.130.0.tgz", + "integrity": "sha512-bjcma99sQrNh6RY4mPO9yTkfxql6TDFoN3HWdK31RCKXwNhcDgJXW/l8PUtzKNiQ+9vpKJfJtQq+LklBuxSOBA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-parser/binding-win32-ia32-msvc": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-0.130.0.tgz", + "integrity": "sha512-hRYbv6HhpSTzT4xTiIkadLI7upLQxuOdLPR/9nL1fTjwhgutBTPXrwaAPb/jTFVx6/8C7Jb5HcUKhmNwloTbFA==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-parser/binding-win32-x64-msvc": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.130.0.tgz", + "integrity": "sha512-RBpA9TsRucJq6HNVNCFF1iKg+QeTkLdZf7hi4xaOGCPvMZWvDHjQgSOEZMUpuW4JNciHbxNhLEYmz5CVygjVGQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@oxc-project/types": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.130.0.tgz", + "integrity": "sha512-ibD2usx9JRu7f5pu2tMKMI4cpA4NgXJQoYRP4pQ7Pxmn1l6k/53qWtQWZayhYy3X4QZkt90Ot+mJEaeXouio6Q==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/Boshen" + } + }, "node_modules/@oxc-resolver/binding-android-arm-eabi": { "version": "11.19.1", "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-android-arm-eabi/-/binding-android-arm-eabi-11.19.1.tgz", @@ -3234,9 +3606,9 @@ } }, "node_modules/@tybys/wasm-util": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz", - "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==", + "version": "0.10.2", + "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.2.tgz", + "integrity": "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==", "dev": true, "license": "MIT", "optional": true, @@ -3267,28 +3639,6 @@ "@types/ms": "*" } }, - "node_modules/@types/eslint": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", - "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "node_modules/@types/eslint-scope": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", - "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, "node_modules/@types/esquery": { "version": "1.5.4", "resolved": "https://registry.npmjs.org/@types/esquery/-/esquery-1.5.4.tgz", @@ -3306,9 +3656,9 @@ "license": "MIT" }, "node_modules/@types/estree": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", - "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", + "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==", "license": "MIT" }, "node_modules/@types/http-cache-semantics": { @@ -3356,9 +3706,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.19.17", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.17.tgz", - "integrity": "sha512-wGdMcf+vPYM6jikpS/qhg6WiqSV/OhG+jeeHT/KlVqxYfD40iYJf9/AE1uQxVWFvU7MipKRkRv8NSHiCGgPr8Q==", + "version": "22.19.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.19.tgz", + "integrity": "sha512-dyh/xO2Fh5bYrfWaaqGrRQQGkNdmYw6AmaAUvYeUMNTWQtvb796ikLdmTchRmOlOiIJ1TDXfWgVx1QkUlQ6Hew==", "dev": true, "license": "MIT", "dependencies": { @@ -3415,16 +3765,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.1.tgz", - "integrity": "sha512-HDQH9O/47Dxi1ceDhBXdaldtf/WV9yRYMjbjCuNk3qnaTD564qwv61Y7+gTxwxRKzSrgO5uhtw584igXVuuZkA==", + "version": "8.60.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.60.0.tgz", + "integrity": "sha512-fcqpj/MyK4sxDPcbe7STNPbpQL4RLZOPWuaTmwZYuc+hJKzRf58yRxfhqGpc6PIq9ZyfSBpfHgmUHmHs0KwHwg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.59.1", - "@typescript-eslint/types": "8.59.1", - "@typescript-eslint/typescript-estree": "8.59.1", - "@typescript-eslint/visitor-keys": "8.59.1", + "@typescript-eslint/scope-manager": "8.60.0", + "@typescript-eslint/types": "8.60.0", + "@typescript-eslint/typescript-estree": "8.60.0", + "@typescript-eslint/visitor-keys": "8.60.0", "debug": "^4.4.3" }, "engines": { @@ -3440,14 +3790,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.1.tgz", - "integrity": "sha512-+MuHQlHiEr00Of/IQbE/MmEoi44znZHbR/Pz7Opq4HryUOlRi+/44dro9Ycy8Fyo+/024IWtw8m4JUMCGTYxDg==", + "version": "8.60.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.60.0.tgz", + "integrity": "sha512-aZu74NNKJeUWqCjDddzdiKaS82dgYgV/vmf+Ui3ZdZejmgfXR/q+pRumgobnQ2cCJTgGTWp4ypiwsuofFubavg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.59.1", - "@typescript-eslint/types": "^8.59.1", + "@typescript-eslint/tsconfig-utils": "^8.60.0", + "@typescript-eslint/types": "^8.60.0", "debug": "^4.4.3" }, "engines": { @@ -3462,14 +3812,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.59.1.tgz", - "integrity": "sha512-LwuHQI4pDOYVKvmH2dkaJo6YZCSgouVgnS/z7yBPKBMvgtBvyLqiLy9Z6b7+m/TRcX1NFYUqZetI5Y+aT4GEfg==", + "version": "8.60.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.60.0.tgz", + "integrity": "sha512-pFzqhllJMs+jghLQWzV00ds39xLzuyqPSev5pd8f4Ir0rtKR3ZLUB4/4dhjOFighWb9larvtfJvqL+4yKDI3Xw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.59.1", - "@typescript-eslint/visitor-keys": "8.59.1" + "@typescript-eslint/types": "8.60.0", + "@typescript-eslint/visitor-keys": "8.60.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3480,9 +3830,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.1.tgz", - "integrity": "sha512-/0nEyPbX7gRsk0Uwfe4ALwwgxuA66d/l2mhRDNlAvaj4U3juhUtJNq0DsY8M2AYwwb9rEq2hrC3IcIcEt++iJA==", + "version": "8.60.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.60.0.tgz", + "integrity": "sha512-BZPR3RGYlAXnly6ymAxfkVn5rCbZzQNou0rxv3GfWZ8cTQp+hhVd73khbGLAd8k1TlAPLISH337M+tAgAnaJDQ==", "dev": true, "license": "MIT", "engines": { @@ -3497,9 +3847,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.1.tgz", - "integrity": "sha512-ZDCjgccSdYPw5Bxh+my4Z0lJU96ZDN7jbBzvmEn0FZx3RtU1C7VWl6NbDx94bwY3V5YsgwRzJPOgeY2Q/nLG8A==", + "version": "8.60.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.60.0.tgz", + "integrity": "sha512-AsE7x2XaAK+CVbeih0Fvbn+r1qHxtpLDJ3XUuFcIinT318T90yHMJC+Zgv+jUuDjQQd06HKwxnDu6sz1IcTilA==", "dev": true, "license": "MIT", "engines": { @@ -3511,16 +3861,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.1.tgz", - "integrity": "sha512-OUd+vJS05sSkOip+BkZ/2NS8RMxrAAJemsC6vU3kmfLyeaJT0TftHkV9mcx2107MmsBVXXexhVu4F0TZXyMl4g==", + "version": "8.60.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.60.0.tgz", + "integrity": "sha512-3AcZNBGMClm6CXDyo8kYvVGT/sx29sS0oBsIb9oZI2gunA4Vm2M3YHzRLPvsUBBsl+yB5FPtltq7gGH0iTlp9g==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.59.1", - "@typescript-eslint/tsconfig-utils": "8.59.1", - "@typescript-eslint/types": "8.59.1", - "@typescript-eslint/visitor-keys": "8.59.1", + "@typescript-eslint/project-service": "8.60.0", + "@typescript-eslint/tsconfig-utils": "8.60.0", + "@typescript-eslint/types": "8.60.0", + "@typescript-eslint/visitor-keys": "8.60.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -3539,16 +3889,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.59.1.tgz", - "integrity": "sha512-3pIeoXhCeYH9FSCBI8P3iNwJlGuzPlYKkTlen2O9T1DSeeg8UG8jstq6BLk+Mda0qup7mgk4z4XL4OzRaxZ8LA==", + "version": "8.60.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.60.0.tgz", + "integrity": "sha512-HtXuPfrHTyBDkameWpl+vJb1Uevu2tznAyahM1Oc4AENidCLTPiZDWIo4GfcxNdC/RcfGcadzzkqbRG87dUrQA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.59.1", - "@typescript-eslint/types": "8.59.1", - "@typescript-eslint/typescript-estree": "8.59.1" + "@typescript-eslint/scope-manager": "8.60.0", + "@typescript-eslint/types": "8.60.0", + "@typescript-eslint/typescript-estree": "8.60.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3563,13 +3913,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.59.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.1.tgz", - "integrity": "sha512-LdDNl6C5iJExcM0Yh0PwAIBb9PrSiCsWamF/JyEZawm3kFDnRoaq3LGE4bpyRao/fWeGKKyw7icx0YxrLFC5Cg==", + "version": "8.60.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.60.0.tgz", + "integrity": "sha512-9WI52t8ZGLVGrPMBet25yAftqY/n95+zmoUUtJBBQTKDSKUu7OsPTroT2op7U9JatkoRccL0YkWDNMFfC4Sjxg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.59.1", + "@typescript-eslint/types": "8.60.0", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -4110,19 +4460,6 @@ "node": "*" } }, - "node_modules/ast-types": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.16.1.tgz", - "integrity": "sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==", - "dev": true, - "license": "MIT", - "dependencies": { - "tslib": "^2.0.1" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/astral-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", @@ -4313,9 +4650,9 @@ "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.10.25", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.25.tgz", - "integrity": "sha512-QO/VHsXCQdnzADMfmkeOPvHdIAkoB7i0/rGjINPJEetLx75hNttVWGQ/jycHUDP9zZ9rupbm60WRxcwViB0MiA==", + "version": "2.10.32", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.32.tgz", + "integrity": "sha512-wbPvpyjJPC0zdfdKXxqEL3Ea+bOMD/87X4lftiJkkaBiuG6ALQy1SLmEd7BSmVCuwCQsBrCamgBoLyfFDD1EPg==", "dev": true, "license": "Apache-2.0", "bin": { @@ -4384,9 +4721,9 @@ "license": "ISC" }, "node_modules/brace-expansion": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", - "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz", + "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==", "license": "MIT", "dependencies": { "balanced-match": "^4.0.2" @@ -4478,13 +4815,13 @@ } }, "node_modules/browserify-sign": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.5.tgz", - "integrity": "sha512-C2AUdAJg6rlM2W5QMp2Q4KGQMVBwR1lIimTsUnutJ8bMpW5B52pGpR2gEnNBNwijumDo5FojQ0L9JrXA8m4YEw==", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.6.tgz", + "integrity": "sha512-sd+Q65fjlWCYWtZKXiKfrUc8d+4jtp/8f0W2NkwzLtoW4bI6UDnWusLWIurHnmurW0XShIRxpwiOX4EoPtXUAg==", "dev": true, "license": "ISC", "dependencies": { - "bn.js": "^5.2.2", + "bn.js": "^5.2.3", "browserify-rsa": "^4.1.1", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", @@ -4639,9 +4976,9 @@ "license": "MIT" }, "node_modules/builtin-modules": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-5.1.0.tgz", - "integrity": "sha512-c5JxaDrzwRjq3WyJkI1AGR5xy6Gr6udlt7sQPbl09+3ckB+Zo2qqQ2KhCTBr7Q8dHB43bENGYEk4xddrFH/b7A==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-5.2.0.tgz", + "integrity": "sha512-02yxLeyxF4dNl6SlY6/5HfRSrSdZ/sCPoxy2kZNP5dZZX8LSAD9aE2gtJIUgWrsQTiMPl3mxESyrobSwvRGisQ==", "dev": true, "license": "MIT", "engines": { @@ -4805,9 +5142,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001791", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001791.tgz", - "integrity": "sha512-yk0l/YSrOnFZk3UROpDLQD9+kC1l4meK/wed583AXrzoarMGJcbRi2Q4RaUYbKxYAsZ8sWmaSa/DsLmdBeI1vQ==", + "version": "1.0.30001793", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001793.tgz", + "integrity": "sha512-iwSsYWaCOoh26cV8NwNRViHlrfUvYsHDfRVcbtmw0Kg6PJIZZXwMkj1442FYLBGkeUf1juAsU3DTfxW579mrPA==", "dev": true, "funding": [ { @@ -6286,9 +6623,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.349", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.349.tgz", - "integrity": "sha512-QsWVGyRuY07Aqb234QytTfwd5d9AJlfNIQ5wIOl1L+PZDzI9d9+Fn0FRale/QYlFxt/bUnB0/nLd1jFPGxGK1A==", + "version": "1.5.361", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.361.tgz", + "integrity": "sha512-Q6Hts7N9FnJc5LeGRINFvLhCI9xZmNtTDe5ZbcVezQz7cU4a8Aua3GH1b8J2XY8Al9PF+OCwYqhgsOOheMdvkA==", "dev": true, "license": "ISC" }, @@ -6364,9 +6701,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.21.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.0.tgz", - "integrity": "sha512-otxSQPw4lkOZWkHpB3zaEQs6gWYEsmX4xQF68ElXC/TWvGxGMSGOvoNbaLXm6/cS/fSfHtsEdw90y20PCd+sCA==", + "version": "5.22.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.22.0.tgz", + "integrity": "sha512-xYcDWrpELkFzz9SpZ3PlI6Eu6eD93Yf0WLDRxikGhWJ3MAir2SNZTIVCVZqZ/NUyx8AdMc2gT9C0gPiw18kG+A==", "dev": true, "license": "MIT", "dependencies": { @@ -6472,9 +6809,9 @@ "license": "MIT" }, "node_modules/es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.2.tgz", + "integrity": "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==", "dev": true, "license": "MIT", "dependencies": { @@ -6585,9 +6922,9 @@ } }, "node_modules/eslint-plugin-eslint-plugin": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-7.3.2.tgz", - "integrity": "sha512-odUwjaeon0s3W96vAmZf13XbTEGKnnXStnRykwM3XysTce7ZI7C8AJRn47OFJMdDNVtG/jLb/gFk0Wvj9zkSbQ==", + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-7.3.3.tgz", + "integrity": "sha512-u99Dsum45JP0j3ep4EcaERIT5VpArPgrXryRMeVNMfnY/bTQFkDl25T3y+FBwVbYnEGCoZzW9DLaI21cDwgldw==", "dev": true, "license": "MIT", "dependencies": { @@ -6622,9 +6959,9 @@ } }, "node_modules/eslint-plugin-expect-type/node_modules/fs-extra": { - "version": "11.3.4", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.4.tgz", - "integrity": "sha512-CTXd6rk/M3/ULNQj8FBqBWHYBVYybQ3VPBw0xGKFe3tuH7ytT6ACnvzpIQ3UZtB8yvUKC2cXn1a+x+5EVQLovA==", + "version": "11.3.5", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.5.tgz", + "integrity": "sha512-eKpRKAovdpZtR1WopLHxlBWvAgPny3c4gX1G5Jhwmmw4XJj0ifSD5qB5TOo8hmA0wlRKDAOAhEE1yVPgs6Fgcg==", "dev": true, "license": "MIT", "dependencies": { @@ -7163,9 +7500,9 @@ "license": "MIT" }, "node_modules/fast-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz", - "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", + "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==", "dev": true, "funding": [ { @@ -7238,9 +7575,9 @@ } }, "node_modules/fflate": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz", - "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.3.tgz", + "integrity": "sha512-tbZNuJrLwGUp3zshBtdy4W+ORxZuIh8a5ilyIEQDC5rY1f3U20JMry0Ll3WBzU58EZKsEuJFXhb5gwv8CsPvgA==", "dev": true, "license": "MIT" }, @@ -7310,9 +7647,9 @@ "license": "MIT" }, "node_modules/filelist/node_modules/brace-expansion": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz", - "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.1.tgz", + "integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==", "dev": true, "license": "MIT", "dependencies": { @@ -7644,9 +7981,9 @@ } }, "node_modules/get-east-asian-width": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.5.0.tgz", - "integrity": "sha512-CQ+bEO+Tva/qlmw24dCejulK5pMzVnUOFOijVogd3KQs07HnRIgp8TGipvCCRT06xeYEbpbgwaCxglFyiuIcmA==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.6.0.tgz", + "integrity": "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==", "dev": true, "license": "MIT", "engines": { @@ -7840,9 +8177,9 @@ "license": "MIT" }, "node_modules/glob/node_modules/brace-expansion": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz", - "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.1.tgz", + "integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==", "dev": true, "license": "MIT", "dependencies": { @@ -8605,13 +8942,13 @@ "license": "MIT" }, "node_modules/is-core-module": { - "version": "2.16.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", - "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "version": "2.16.2", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.2.tgz", + "integrity": "sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==", "dev": true, "license": "MIT", "dependencies": { - "hasown": "^2.0.2" + "hasown": "^2.0.3" }, "engines": { "node": ">= 0.4" @@ -9080,9 +9417,9 @@ } }, "node_modules/jiti": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz", - "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.7.0.tgz", + "integrity": "sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ==", "dev": true, "license": "MIT", "bin": { @@ -9341,9 +9678,9 @@ "license": "MIT" }, "node_modules/katex": { - "version": "0.16.45", - "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.45.tgz", - "integrity": "sha512-pQpZbdBu7wCTmQUh7ufPmLr0pFoObnGUoL/yhtwJDgmmQpbkg/0HSVti25Fu4rmd1oCR6NGWe9vqTWuWv3GcNA==", + "version": "0.16.47", + "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.47.tgz", + "integrity": "sha512-Eeo8Ys1doU1z+x8AZsPpQu+p/QcZBI5PeOo7QGQdy2x2m0MU/hYagBbGOmXwr5KVbEfVuWv9LpnQWeehogurjg==", "dev": true, "funding": [ "https://opencollective.com/katex", @@ -9387,9 +9724,9 @@ } }, "node_modules/knip": { - "version": "5.88.1", - "resolved": "https://registry.npmjs.org/knip/-/knip-5.88.1.tgz", - "integrity": "sha512-tpy5o7zu1MjawVkLPuahymVJekYY3kYjvzcoInhIchgePxTlo+api90tBv2KfhAIe5uXh+mez1tAfmbv8/TiZg==", + "version": "6.14.2", + "resolved": "https://registry.npmjs.org/knip/-/knip-6.14.2.tgz", + "integrity": "sha512-Vg3JhIINjZew1I7qAFI4UHemW1mc4azP/BxJvsq9eGDfxpGO7oVCuD/bsWkog9TO/ZwwJeAeOMFZ1kd9jnY9+Q==", "dev": true, "funding": [ { @@ -9403,18 +9740,19 @@ ], "license": "ISC", "dependencies": { - "@nodelib/fs.walk": "^1.2.3", - "fast-glob": "^3.3.3", + "fdir": "^6.5.0", "formatly": "^0.3.0", - "jiti": "^2.6.0", + "get-tsconfig": "4.14.0", + "jiti": "^2.7.0", "minimist": "^1.2.8", + "oxc-parser": "^0.130.0", "oxc-resolver": "^11.19.1", - "picocolors": "^1.1.1", - "picomatch": "^4.0.1", - "smol-toml": "^1.5.2", + "picomatch": "^4.0.4", + "smol-toml": "^1.6.1", "strip-json-comments": "5.0.3", - "unbash": "^2.2.0", - "yaml": "^2.8.2", + "tinyglobby": "^0.2.16", + "unbash": "^3.0.0", + "yaml": "^2.9.0", "zod": "^4.1.11" }, "bin": { @@ -9422,11 +9760,7 @@ "knip-bun": "bin/knip-bun.js" }, "engines": { - "node": ">=18.18.0" - }, - "peerDependencies": { - "@types/node": ">=18", - "typescript": ">=5.0.4 <7" + "node": "^20.19.0 || >=22.12.0" } }, "node_modules/knip/node_modules/strip-json-comments": { @@ -9895,9 +10229,9 @@ } }, "node_modules/lru-cache": { - "version": "11.3.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.3.5.tgz", - "integrity": "sha512-NxVFwLAnrd9i7KUBxC4DrUhmgjzOs+1Qm50D3oF1/oL+r1NpZ4gA7xvG0/zJ8evR7zIKn4vLf7qTNduWFtCrRw==", + "version": "11.5.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.0.tgz", + "integrity": "sha512-5YgH9UJd7wVb9hIouI2adWpgqrrICkt070Dnj8EUY1+B4B2P9eRLPAkAAo6NICA7CEhOIeBHl46u9zSNpNu7zA==", "dev": true, "license": "BlueOak-1.0.0", "engines": { @@ -10042,10 +10376,20 @@ } }, "node_modules/markdownlint-cli2/node_modules/linkify-it": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", - "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.1.tgz", + "integrity": "sha512-wVoTjP4Q6R0NW5hiZkVJaFZPWgtXfoGF+6LucL3/FtiNjmcHhYjEr5f1Kqjirc1nBW07J/ZuRFumqr2oqccEWg==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/markdown-it" + } + ], "license": "MIT", "dependencies": { "uc.micro": "^2.0.0" @@ -10251,9 +10595,9 @@ } }, "node_modules/metascraper": { - "version": "5.50.1", - "resolved": "https://registry.npmjs.org/metascraper/-/metascraper-5.50.1.tgz", - "integrity": "sha512-ldZIDB3Nh5H49Xq8cm4hv+N4MoUT6s3hvE7dB2Pvjr38BMdcuubBxPjECF17nSwWGBv9oBn4jwkND7/VI9thyQ==", + "version": "5.50.3", + "resolved": "https://registry.npmjs.org/metascraper/-/metascraper-5.50.3.tgz", + "integrity": "sha512-QdlOGeLJY/q0p1mII4YVSgPcEPD5Sq53ugZ8OrezT+xRScXt0KZoNlp9wEdtQdQzhOJJ+bKa9YUIe/cAtrk70A==", "dev": true, "license": "MIT", "dependencies": { @@ -10307,28 +10651,21 @@ } }, "node_modules/metascraper-logo-favicon": { - "version": "5.50.1", - "resolved": "https://registry.npmjs.org/metascraper-logo-favicon/-/metascraper-logo-favicon-5.50.1.tgz", - "integrity": "sha512-xve0KB5sfII7j8W7+6KLIFe6+qLnzYJrmuoXu/lWe7j/MKxK26lNCOQHhA1/1g2gz0amyN5k7sUEWM+Tw+jIOw==", + "version": "5.50.3", + "resolved": "https://registry.npmjs.org/metascraper-logo-favicon/-/metascraper-logo-favicon-5.50.3.tgz", + "integrity": "sha512-i+ehu+nOcUhG2HQpAuyM0d8Zp8fXRXH1r6imAW2CQIJlkoB8tyh7RIWjT1swo3MrDk2Ff7lWbZ1bJUOPdAp5HQ==", "dev": true, "license": "MIT", "dependencies": { "@keyvhq/memoize": "~2.1.11", "@metascraper/helpers": "5.50.1", - "lodash": "~4.17.23", + "lodash": "~4.18.0", "reachable-url": "~1.8.3" }, "engines": { "node": ">= 22" } }, - "node_modules/metascraper-logo-favicon/node_modules/lodash": { - "version": "4.17.23", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz", - "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==", - "dev": true, - "license": "MIT" - }, "node_modules/metascraper-title": { "version": "5.50.1", "resolved": "https://registry.npmjs.org/metascraper-title/-/metascraper-title-5.50.1.tgz", @@ -10514,9 +10851,9 @@ } }, "node_modules/metascraper/node_modules/undici": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-7.25.0.tgz", - "integrity": "sha512-xXnp4kTyor2Zq+J1FfPI6Eq3ew5h6Vl0F/8d9XU5zZQf1tX9s2Su1/3PiMmUANFULpmksxkClamIZcaUqryHsQ==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-7.26.0.tgz", + "integrity": "sha512-3O9Tf67pGhgOv9jM35AbhkXAKi13f3oy3aE4CSgr+TckGeY+/iu97ZXN+J7DpHPzLbVApFd1IFhcnBjREYXYcg==", "dev": true, "license": "MIT", "engines": { @@ -11249,9 +11586,9 @@ } }, "node_modules/mocha": { - "version": "11.7.5", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.5.tgz", - "integrity": "sha512-mTT6RgopEYABzXWFx+GcJ+ZQ32kp4fMf0xvpZIIfSq9Z8lC/++MtcCnQ9t5FP2veYEP95FIYSvW+U9fV4xrlig==", + "version": "11.7.6", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.6.tgz", + "integrity": "sha512-nS9xOGbw2I3cjCpxwZAEJ9xK9lmJ08vEkQvLtz4du9ZrF9UrjRpeJGiIgl2Z+Qs++pmB4ecDe48Fwsh+j+j7xA==", "dev": true, "license": "MIT", "dependencies": { @@ -11293,9 +11630,9 @@ "license": "MIT" }, "node_modules/mocha/node_modules/brace-expansion": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz", - "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.1.tgz", + "integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==", "dev": true, "license": "MIT", "dependencies": { @@ -11367,9 +11704,9 @@ } }, "node_modules/nan": { - "version": "2.26.2", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.26.2.tgz", - "integrity": "sha512-0tTvBTYkt3tdGw22nrAy50x7gpbGCCFH3AFcyS5WiUu7Eu4vWlri1woE6qHBSfy11vksDqkiwjOnlR7WV8G1Hw==", + "version": "2.27.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.27.0.tgz", + "integrity": "sha512-hC+0LidcL3XE4rp1C4H54KujgXKzbfyTngZTwBByQxsOxCEKZT0MPQ4hOKUH2jU1OYstqdDH4onyHPDzcV0XdQ==", "dev": true, "license": "MIT" }, @@ -11588,11 +11925,14 @@ } }, "node_modules/node-releases": { - "version": "2.0.38", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.38.tgz", - "integrity": "sha512-3qT/88Y3FbH/Kx4szpQQ4HzUbVrHPKTLVpVocKiLfoYvw9XSGOX2FmD2d6DrXbVYyAQTF2HeF6My8jmzx7/CRw==", + "version": "2.0.46", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.46.tgz", + "integrity": "sha512-GYVXHE2KnrzAfsAjl4uP++evGFCrAU1jta4ubEjIG7YWt/64Gqv66a30yKwWczVjA6j3bM4nBwH7Pk1JmDHaxQ==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": ">=18" + } }, "node_modules/nopt": { "version": "3.0.6", @@ -11743,9 +12083,9 @@ } }, "node_modules/object-deep-merge": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/object-deep-merge/-/object-deep-merge-2.0.0.tgz", - "integrity": "sha512-3DC3UMpeffLTHiuXSy/UG4NOIYTLlY9u3V82+djSCLYClWobZiS4ivYzpIUWrRY/nfsJ8cWsKyG3QfyLePmhvg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/object-deep-merge/-/object-deep-merge-2.0.1.tgz", + "integrity": "sha512-aKttDKcU3pyZqKcCkDhsMn70WmZFG2JGDQLP9EcLyTSIFQRCPWLAmBZRLJnrVUrhPG1jETEEbfdgbNtJf1LyMg==", "dev": true, "license": "MIT" }, @@ -11877,6 +12217,44 @@ "dev": true, "license": "MIT" }, + "node_modules/oxc-parser": { + "version": "0.130.0", + "resolved": "https://registry.npmjs.org/oxc-parser/-/oxc-parser-0.130.0.tgz", + "integrity": "sha512-X0PJ+NmOok8qP3vK9uaW431ngkdM9UPEK7KG466urtIL2+EYTEgbZK2yqe2MWKJKBjRlFweP/pJPx0x9muMEVw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@oxc-project/types": "^0.130.0" + }, + "engines": { + "node": "^20.19.0 || >=22.12.0" + }, + "funding": { + "url": "https://github.com/sponsors/Boshen" + }, + "optionalDependencies": { + "@oxc-parser/binding-android-arm-eabi": "0.130.0", + "@oxc-parser/binding-android-arm64": "0.130.0", + "@oxc-parser/binding-darwin-arm64": "0.130.0", + "@oxc-parser/binding-darwin-x64": "0.130.0", + "@oxc-parser/binding-freebsd-x64": "0.130.0", + "@oxc-parser/binding-linux-arm-gnueabihf": "0.130.0", + "@oxc-parser/binding-linux-arm-musleabihf": "0.130.0", + "@oxc-parser/binding-linux-arm64-gnu": "0.130.0", + "@oxc-parser/binding-linux-arm64-musl": "0.130.0", + "@oxc-parser/binding-linux-ppc64-gnu": "0.130.0", + "@oxc-parser/binding-linux-riscv64-gnu": "0.130.0", + "@oxc-parser/binding-linux-riscv64-musl": "0.130.0", + "@oxc-parser/binding-linux-s390x-gnu": "0.130.0", + "@oxc-parser/binding-linux-x64-gnu": "0.130.0", + "@oxc-parser/binding-linux-x64-musl": "0.130.0", + "@oxc-parser/binding-openharmony-arm64": "0.130.0", + "@oxc-parser/binding-wasm32-wasi": "0.130.0", + "@oxc-parser/binding-win32-arm64-msvc": "0.130.0", + "@oxc-parser/binding-win32-ia32-msvc": "0.130.0", + "@oxc-parser/binding-win32-x64-msvc": "0.130.0" + } + }, "node_modules/oxc-resolver": { "version": "11.19.1", "resolved": "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-11.19.1.tgz", @@ -12897,23 +13275,6 @@ "url": "https://paulmillr.com/funding/" } }, - "node_modules/recast": { - "version": "0.23.11", - "resolved": "https://registry.npmjs.org/recast/-/recast-0.23.11.tgz", - "integrity": "sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ast-types": "^0.16.1", - "esprima": "~4.0.0", - "source-map": "~0.6.1", - "tiny-invariant": "^1.3.3", - "tslib": "^2.0.1" - }, - "engines": { - "node": ">= 4" - } - }, "node_modules/rechoir": { "version": "0.7.1", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", @@ -13408,9 +13769,9 @@ } }, "node_modules/semver": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", - "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.1.tgz", + "integrity": "sha512-rkVq3IXh+4FDGch+KwzX3aV9W3kO54GyEgpvBzSyctDA6Xtd7RJQV1xmXbeQp5v7+VzLOfVqiutSE6GICgPFvg==", "dev": true, "license": "ISC", "bin": { @@ -14232,9 +14593,9 @@ } }, "node_modules/tar": { - "version": "7.5.13", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.13.tgz", - "integrity": "sha512-tOG/7GyXpFevhXVh8jOPJrmtRpOTsYqUIkVdVooZYJS/z8WhfQUX8RJILmeuJNinGAMSu1veBr4asSHFt5/hng==", + "version": "7.5.15", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.15.tgz", + "integrity": "sha512-dzGK0boVlC4W5QFuQN1EFSl3bIDYsk7Tj40U6eIBnK2k/8ml7TZ5agbI5j5+qnoVcAA+rNtBml8SEiLxZpNqRQ==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -14249,9 +14610,9 @@ } }, "node_modules/terser": { - "version": "5.46.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.2.tgz", - "integrity": "sha512-uxfo9fPcSgLDYob/w1FuL0c99MWiJDnv+5qXSQc5+Ki5NjVNsYi66INnMFBjf6uFz6OnX12piJQPF4IpjJTNTw==", + "version": "5.48.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.48.0.tgz", + "integrity": "sha512-J/9An6vs9Us6wKRriSFXBWdRZapREHqFzdNUKk0pmu804EMR6dr6winwo7e5JDxN4xahxQsuysyYFwlwj4XN/Q==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -14268,9 +14629,9 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.5.0.tgz", - "integrity": "sha512-UYhptBwhWvfIjKd/UuFo6D8uq9xpGLDK+z8EDsj/zWhrTaH34cKEbrkMKfV5YWqGBvAYA3tlzZbs2R+qYrbQJA==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.6.0.tgz", + "integrity": "sha512-Eum+5ajkaOhf5KbM26osvv21kLD7BaGqQ1UA4Ami4arYwylmGUQTgHFpHDdmJod1q4QXa66p0to/FBKID+J1vA==", "dev": true, "license": "MIT", "dependencies": { @@ -14290,12 +14651,39 @@ "webpack": "^5.1.0" }, "peerDependenciesMeta": { + "@minify-html/node": { + "optional": true + }, "@swc/core": { "optional": true }, + "@swc/css": { + "optional": true + }, + "@swc/html": { + "optional": true + }, + "clean-css": { + "optional": true + }, + "cssnano": { + "optional": true + }, + "csso": { + "optional": true + }, "esbuild": { "optional": true }, + "html-minifier-terser": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "postcss": { + "optional": true + }, "uglify-js": { "optional": true } @@ -14468,13 +14856,6 @@ "node": ">=0.6.0" } }, - "node_modules/tiny-invariant": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz", - "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==", - "dev": true, - "license": "MIT" - }, "node_modules/tinyglobby": { "version": "0.2.16", "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz", @@ -14503,22 +14884,22 @@ } }, "node_modules/tldts": { - "version": "7.0.30", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.30.tgz", - "integrity": "sha512-ELrFxuqsDdHUwoh0XxDbxuLD3Wnz49Z57IFvTtvWy1hJdcMZjXLIuonjilCiWHlT2GbE4Wlv1wKVTzDFnXH1aw==", + "version": "7.0.32", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.32.tgz", + "integrity": "sha512-5eDV0tK2NhLAAqBeXDAQ36+EwuStd1HbsSOnGsp+JbExITnExcALLL5M1kTH8gjDYN5QvwmUWimE3GoMZ2A7xQ==", "dev": true, "license": "MIT", "dependencies": { - "tldts-core": "^7.0.30" + "tldts-core": "^7.0.32" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "7.0.30", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.30.tgz", - "integrity": "sha512-uiHN8PIB1VmWyS98eZYja4xzlYqeFZVjb4OuYlJQnZAuJhMw4PbKQOKgHKhBdJR3FE/t5mUQ1Kd80++B+qhD1Q==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.4.0.tgz", + "integrity": "sha512-/mb9kRld+x1sIMXxWNOAp5m6C+D4GrAORWlJkOJ5dElvxdN1eutz/o7qHLp9gFvDF4Y3/L2xeScoxz6AbEo8rQ==", "dev": true, "license": "MIT" }, @@ -14781,9 +15162,9 @@ "license": "MIT" }, "node_modules/unbash": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/unbash/-/unbash-2.2.0.tgz", - "integrity": "sha512-X2wH19RAPZE3+ldGicOkoj/SIA83OIxcJ6Cuaw23hf8Xc6fQpvZXY0SftE2JgS0QhYLUG4uwodSI3R53keyh7w==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unbash/-/unbash-3.0.0.tgz", + "integrity": "sha512-FeFPZ/WFT0mbRCuydiZzpPFlrYN8ZUpphQKoq4EeElVIYjYyGzPMxQR/simUwCOJIyVhpFk4RbtyO7RuMpMnHA==", "dev": true, "license": "ISC", "engines": { @@ -14797,9 +15178,9 @@ "dev": true }, "node_modules/undici": { - "version": "6.25.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.25.0.tgz", - "integrity": "sha512-ZgpWDC5gmNiuY9CnLVXEH8rl50xhRCuLNA97fAUnKi8RRuV4E6KG31pDTsLVUKnohJE0I3XDrTeEydAXRw47xg==", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.26.0.tgz", + "integrity": "sha512-4yqz8a3n5HmGTlsbADNtr/dJlhkh/55Rq798G6ibiULcXbDtaLpTl1pvdqcbFfeoj3iSi52lePFM7h9H21cw/A==", "dev": true, "license": "MIT", "engines": { @@ -15158,13 +15539,12 @@ } }, "node_modules/webpack": { - "version": "5.106.2", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.106.2.tgz", - "integrity": "sha512-wGN3qcrBQIFmQ/c0AiOAQBvrZ5lmY8vbbMv4Mxfgzqd/B6+9pXtLo73WuS1dSGXM5QYY3hZnIbvx+K1xxe6FyA==", + "version": "5.107.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.107.2.tgz", + "integrity": "sha512-v7RhXaJbpMlV0D7hC7lb2EbnxkoeUqf9qhKr6lozx3Q48pmFrqqNRmZFUEGmi7pSwm6fCQ2H1IjvCkHqdpVdjQ==", "dev": true, "license": "MIT", "dependencies": { - "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.8", "@types/json-schema": "^7.0.15", "@webassemblyjs/ast": "^1.14.1", @@ -15174,20 +15554,20 @@ "acorn-import-phases": "^1.0.3", "browserslist": "^4.28.1", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.20.0", - "es-module-lexer": "^2.0.0", + "enhanced-resolve": "^5.22.0", + "es-module-lexer": "^2.1.0", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.2.11", - "loader-runner": "^4.3.1", + "loader-runner": "^4.3.2", "mime-db": "^1.54.0", "neo-async": "^2.6.2", "schema-utils": "^4.3.3", "tapable": "^2.3.0", - "terser-webpack-plugin": "^5.3.17", + "terser-webpack-plugin": "^5.5.0", "watchpack": "^2.5.1", - "webpack-sources": "^3.3.4" + "webpack-sources": "^3.5.0" }, "bin": { "webpack": "bin/webpack.js" @@ -15286,9 +15666,9 @@ } }, "node_modules/webpack-sources": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.4.1.tgz", - "integrity": "sha512-eACpxRN02yaawnt+uUNIF7Qje6A9zArxBbcAJjK1PK3S9Ycg5jIuJ8pW4q8EMnwNZCEGltcjkRx1QzOxOkKD8A==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.5.0.tgz", + "integrity": "sha512-HPuy+uuoTCaaoEoI1LQ3JN9+vrPBvEesnnX1jADHy728cHSMlq4wUc4afYqahq2B1mhQVZxCXOkNTnXltr+2vQ==", "dev": true, "license": "MIT", "engines": { @@ -15593,9 +15973,9 @@ "license": "ISC" }, "node_modules/ws": { - "version": "8.20.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.0.tgz", - "integrity": "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==", + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz", + "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==", "dev": true, "license": "MIT", "engines": { @@ -15662,9 +16042,9 @@ } }, "node_modules/yaml": { - "version": "2.8.4", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.4.tgz", - "integrity": "sha512-ml/JPOj9fOQK8RNnWojA67GbZ0ApXAUlN2UQclwv2eVgTgn7O9gg9o7paZWKMp4g0H3nTLtS9LVzhkpOFIKzog==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.9.0.tgz", + "integrity": "sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==", "dev": true, "license": "ISC", "bin": { @@ -15931,9 +16311,9 @@ "license": "ISC" }, "node_modules/zod": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/zod/-/zod-4.4.2.tgz", - "integrity": "sha512-IynmDyxsEsb9RKzO3J9+4SxXnl2FTFSzNBaKKaMV6tsSk0rw9gYw9gs+JFCq/qk2LCZ78KDwyj+Z289TijSkUw==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/zod/-/zod-4.4.3.tgz", + "integrity": "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==", "dev": true, "license": "MIT", "funding": { diff --git a/pkgs/by-name/es/eslint/package.nix b/pkgs/by-name/es/eslint/package.nix index e198c22f842a..8db380a87541 100644 --- a/pkgs/by-name/es/eslint/package.nix +++ b/pkgs/by-name/es/eslint/package.nix @@ -6,13 +6,13 @@ }: buildNpmPackage (finalAttrs: { pname = "eslint"; - version = "10.3.0"; + version = "10.4.0"; src = fetchFromGitHub { owner = "eslint"; repo = "eslint"; tag = "v${finalAttrs.version}"; - hash = "sha256-b0Gv7soMPTsbMOZLqMe5vMCPwInk9AFusepf2jJH/Ng="; + hash = "sha256-8CG4oeqZPhVoG/Q8jTA5GBSzOwrQoBSNIYHnGcqbjsc="; }; # NOTE: Generating lock-file @@ -24,7 +24,7 @@ buildNpmPackage (finalAttrs: { cp ${./package-lock.json} package-lock.json ''; - npmDepsHash = "sha256-gi/aiWEzbf91LNTB2kMx9Iq4PoVORLs3mBjSSt2mFiQ="; + npmDepsHash = "sha256-UGx3wR+PUxUvabGLxf5Phg+RzETZnbcO0IXLr+jHzUI="; npmInstallFlags = [ "--omit=dev" ]; dontNpmBuild = true; From 740bd128d7ce28b060487f22d69e06b86001a317 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Mon, 25 May 2026 16:44:51 -0700 Subject: [PATCH 28/97] mudlet: 4.19.1 -> 4.20.1 --- pkgs/by-name/mu/mudlet/package.nix | 139 ++++++++--------------------- 1 file changed, 38 insertions(+), 101 deletions(-) diff --git a/pkgs/by-name/mu/mudlet/package.nix b/pkgs/by-name/mu/mudlet/package.nix index 981ca5159bf8..b9bcfd325063 100644 --- a/pkgs/by-name/mu/mudlet/package.nix +++ b/pkgs/by-name/mu/mudlet/package.nix @@ -7,161 +7,99 @@ git, pkg-config, which, + assimp, boost, + discord-rpc, hunspell, libGLU, - libsForQt5, libsecret, libzip, lua5_1, - pcre, + pipewire, pugixml, - discord-rpc, + qt6Packages, yajl, withDiscordRpc ? false, }: let - overrideLua = - let - packageOverrides = self: super: { - # luasql-sqlite3 master branch broke compatibility with lua 5.1. Pin to - # an earlier commit. - # https://github.com/lunarmodules/luasql/issues/147 - luasql-sqlite3 = super.luaLib.overrideLuarocks super.luasql-sqlite3 (drv: { - version = "2.6.0-1-custom"; - src = fetchFromGitHub { - owner = "lunarmodules"; - repo = "luasql"; - rev = "8c58fd6ee32faf750daf6e99af015a31402578d1"; - hash = "sha256-XlTB5O81yWCrx56m0cXQp7EFzeOyfNeqGbuiYqMrTUk="; - }; - }); - }; - in - lua5_1.override { inherit packageOverrides; }; - - luaEnv = overrideLua.withPackages ( + luaEnv = lua5_1.withPackages ( ps: with ps; [ - luazip - luafilesystem - lrexlib-pcre - luasql-sqlite3 + lpeg + lrexlib-pcre2 lua-yajl + luafilesystem + luasql-sqlite3 luautf8 + luazip ] ); + libPathVar = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in stdenv.mkDerivation (finalAttrs: { pname = "mudlet"; - version = "4.19.1"; + version = "4.20.1"; + + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitHub { owner = "Mudlet"; repo = "Mudlet"; rev = "Mudlet-${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-I4RRIfHw9kZwxMlc9pvdtwPpq9EvNJU69WpGgZ+0uiw="; + hash = "sha256-o3f2ChQ7COql+WEe2diATx7wIR0fOlxkXcGWlL1AYkE="; }; - patches = [ - (fetchpatch { - name = "cmake4-fix.patch"; - url = "https://github.com/Mudlet/Mudlet/commit/933f2551fe3084f0fad6d8b971c6176fe154d8d7.patch?full_index=1"; - hash = "sha256-MElSRhTaT1a5r/Pz3e7MTrzq0krjdspgW0woAB2C8jc="; - }) - ]; - nativeBuildInputs = [ cmake git luaEnv pkg-config - libsForQt5.qttools + qt6Packages.qttools + qt6Packages.wrapQtAppsHook which - libsForQt5.wrapQtAppsHook ]; buildInputs = [ + assimp boost hunspell libGLU - libsForQt5.qtkeychain libsecret libzip luaEnv - pcre pugixml - libsForQt5.qtbase - libsForQt5.qtmultimedia + qt6Packages.qtbase + qt6Packages.qt5compat + qt6Packages.qtkeychain + qt6Packages.qtmultimedia yajl ] ++ lib.optional withDiscordRpc discord-rpc; cmakeFlags = [ # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" + (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) + (lib.cmakeBool "USE_FONTS" false) + (lib.cmakeBool "USE_OWN_QTKEYCHAIN" false) + (lib.cmakeBool "USE_UPDATER" false) ]; - env = { - WITH_FONTS = "NO"; - WITH_UPDATER = "NO"; - }; - - installPhase = '' - runHook preInstall - - mkdir -pv $out/lib - cp 3rdparty/edbee-lib/edbee-lib/qslog/lib/libQsLog${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib - mkdir -pv $out/share/mudlet - cp -r ../src/mudlet-lua/lua $out/share/mudlet/ - - mkdir -pv $out/share/pixmaps - cp -r ../mudlet.png $out/share/pixmaps/ - - cp -r ../translations $out/share/ - - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r src/mudlet.app/ $out/Applications/mudlet.app - mv $out/Applications/mudlet.app/Contents/MacOS/mudlet $out/Applications/mudlet.app/Contents/MacOS/mudlet-unwrapped - makeQtWrapper $out/Applications/Mudlet.app/Contents/MacOS/mudlet-unwrapped $out/Applications/Mudlet.app/Contents/MacOS/mudlet \ - --set LUA_CPATH "${luaEnv}/lib/lua/${lua5_1.luaversion}/?.so" \ - --prefix LUA_PATH : "$NIX_LUA_PATH" \ - --prefix DYLD_LIBRARY_PATH : "${ - lib.makeLibraryPath ( - [ - libsForQt5.qtkeychain - ] - ++ lib.optional withDiscordRpc discord-rpc - ) - }:$out/lib" \ - --chdir "$out"; + ''; - '' - + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - mkdir -pv $out/bin - cp src/mudlet $out/bin/mudlet-unwrapped - makeQtWrapper $out/bin/mudlet-unwrapped $out/bin/mudlet \ - --set LUA_CPATH "${luaEnv}/lib/lua/${lua5_1.luaversion}/?.so" \ - --prefix LUA_PATH : "$NIX_LUA_PATH" \ - --prefix LD_LIBRARY_PATH : "${ - lib.makeLibraryPath ( - [ - libsForQt5.qtkeychain - ] - ++ lib.optional withDiscordRpc discord-rpc - ) - }" \ - --chdir "$out"; - - mkdir -pv $out/share/applications - cp ../mudlet.desktop $out/share/applications/ - - '' - + '' - runHook postInstall + preFixup = '' + qtWrapperArgs+=(--set LUA_CPATH "${luaEnv}/lib/lua/${lua5_1.luaversion}/?.so") + qtWrapperArgs+=(--prefix LUA_PATH : "$NIX_LUA_PATH") + qtWrapperArgs+=(--prefix ${libPathVar} : "${ + lib.makeLibraryPath ( + lib.optional stdenv.hostPlatform.isLinux pipewire ++ lib.optional withDiscordRpc discord-rpc + ) + }") + qtWrapperArgs+=(--chdir "$out") ''; meta = { @@ -173,7 +111,6 @@ stdenv.mkDerivation (finalAttrs: { felixalbrigtsen ]; platforms = with lib.platforms; linux ++ darwin; - broken = stdenv.hostPlatform.isDarwin; license = lib.licenses.gpl2Plus; mainProgram = "mudlet"; }; From 10d9c5372a0a29b50ff19d9776af4ee93795c6ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?= =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?= =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= Date: Fri, 15 May 2026 00:05:39 -0400 Subject: [PATCH 29/97] handy: init at 0.8.3 --- pkgs/by-name/ha/handy/package.nix | 275 ++++++++++++++++++++++++++++++ 1 file changed, 275 insertions(+) create mode 100644 pkgs/by-name/ha/handy/package.nix diff --git a/pkgs/by-name/ha/handy/package.nix b/pkgs/by-name/ha/handy/package.nix new file mode 100644 index 000000000000..4ac67b07ecc7 --- /dev/null +++ b/pkgs/by-name/ha/handy/package.nix @@ -0,0 +1,275 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + pkg-config, + cmake, + bun, + nodejs, + cctools, + cargo-tauri, + jq, + writableTmpDirAsHomeHook, + makeBinaryWrapper, + swift, + apple-sdk_26, + symlinkJoin, + + # Linux-only + webkitgtk_4_1, + gtk3, + glib, + libsoup_3, + alsa-lib, + libayatana-appindicator, + libevdev, + libxtst, + gtk-layer-shell, + vulkan-loader, + vulkan-headers, + shaderc, + gst_all_1, + glib-networking, + libx11, + pipewire, + alsa-plugins, + wrapGAppsHook4, + + # Cross-platform + onnxruntime, + openssl, +}: +let + gstPlugins = lib.optionals stdenv.hostPlatform.isLinux ( + with gst_all_1; + [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + ] + ); +in +rustPlatform.buildRustPackage (finalAttrs: { + pname = "handy"; + version = "0.8.3"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "cjpais"; + repo = "Handy"; + tag = "v${finalAttrs.version}"; + hash = "sha256-sCCtp6UAxmCAcYeOM9+RW2czATh4Geqf1H8wXNMniYc="; + }; + + cargoRoot = "src-tauri"; + cargoHash = "sha256-mvOThNqfE24iMkVBM2zYexJkQxpMMgE4PPNXKy39hSg="; + + nativeInstallInputs = [ jq ]; + + postPatch = '' + patch_json() { + local file=$1 filter=$2 + jq "$filter" "$file" > "$file.tmp" && mv "$file.tmp" "$file" + } + + # De-structuring the Tauri build process + # So we can: + # - Handle the frontend building in a fixed way. + # - Not worry about signing + # - And avoid the auto-updater + patch_json "src-tauri/tauri.conf.json" ' + del(.build.beforeBuildCommand) | + .bundle.createUpdaterArtifacts = false | + .bundle.macOS += { signingIdentity: null, hardenedRuntime: false } + ' + + # Strip cbindgen build steps + find "$cargoDepsCopy" -path "*/ferrous-opencc-*/build.rs" \ + -exec sed -i -e '/cbindgen::Builder::new/{:l;/write_to_file/!{N;bl};d}' {} + + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace "$cargoDepsCopy"/source-registry-0/libappindicator-sys-*/src/lib.rs \ + --replace-fail 'libayatana-appindicator3.so.1' '${libayatana-appindicator}/lib/libayatana-appindicator3.so.1' + ''; + + nativeBuildInputs = [ + pkg-config + cmake + bun + nodejs + cargo-tauri.hook + jq + writableTmpDirAsHomeHook + rustPlatform.bindgenHook + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + wrapGAppsHook4 + shaderc + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + makeBinaryWrapper + cctools + swift + apple-sdk_26 + ]; + + buildInputs = [ + onnxruntime + openssl + ] + ++ gstPlugins + ++ lib.optionals stdenv.hostPlatform.isLinux [ + webkitgtk_4_1 + gtk3 + glib + libsoup_3 + alsa-lib + libayatana-appindicator + libevdev + libxtst + gtk-layer-shell + vulkan-loader + vulkan-headers + glib-networking + libx11 + ]; + + ortLibLocation = "${lib.getLib onnxruntime}/lib"; + + # Handy relies on onnx and gstreamer being available at runtime, picked up by wrapGapps. + env = { + ORT_LIB_LOCATION = "${lib.getLib onnxruntime}/lib"; + ORT_PREFER_DYNAMIC_LINK = "1"; + + # Normally GST plugins will live in their own folder. This conjoins them into one as the application expects. + GST_PLUGIN_SYSTEM_PATH_1_0 = lib.optionalString stdenv.hostPlatform.isLinux ( + lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gstPlugins + ); + } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + SWIFTC = lib.getExe' swift "swiftc"; # Explicit so the Handy build system can avoid xcrun + }; + + preBuild = '' + cp -R ${finalAttrs.passthru.frontendDeps}/node_modules . + chmod -R u+w node_modules + patchShebangs node_modules + bun run build + ''; + + # If removed, the binary is produced, but not the app bundle for any platform. + installPhase = '' + runHook preInstall + mkdir -p $out + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + mv target/${stdenv.hostPlatform.rust.rustcTarget}/release/bundle/deb/*/data/usr/* $out/ + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications $out/bin + mv target/${stdenv.hostPlatform.rust.rustcTarget}/release/bundle/macos/Handy.app \ + $out/Applications/ + ln -s "$out/Applications/Handy.app/Contents/MacOS/handy" "$out/bin/handy" + '' + + '' + runHook postInstall + ''; + + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + gappsWrapperArgs+=( + --set WEBKIT_DISABLE_DMABUF_RENDERER 1 + --set ALSA_PLUGIN_DIR "${finalAttrs.passthru.alsaPluginDirectory}" + ) + ''; + + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + install_name_tool -add_rpath "${finalAttrs.env.ORT_LIB_LOCATION}" \ + "$out/Applications/Handy.app/Contents/MacOS/handy" + ''; + + preCheck = '' + cd ${finalAttrs.cargoRoot} + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + export DYLD_LIBRARY_PATH="${finalAttrs.env.ORT_LIB_LOCATION}''${DYLD_LIBRARY_PATH:+:''${DYLD_LIBRARY_PATH}}" + ''; + + # Skip broken tests, mirroring CI configuration (https://github.com/cjpais/Handy/blob/main/.github/workflows/test.yml) + checkFlags = [ + "--skip=helpers::clamshell::tests::test_is_laptop" + "--skip=helpers::clamshell::tests::test_clamshell_check" + ]; + + passthru = { + # The hook and deps fetcher in https://github.com/NixOS/nixpkgs/pull/376299 should simplify this dramatically. + frontendDeps = stdenv.mkDerivation { + pname = "handy-frontend-deps"; + version = "0.8.3"; + inherit (finalAttrs) src; + + nativeBuildInputs = [ + bun + writableTmpDirAsHomeHook + ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + export BUN_INSTALL_CACHE_DIR=$(mktemp -d) + bun install --linker=isolated --force --frozen-lockfile \ + --ignore-scripts --no-progress + bun --bun "$PWD/.nix/scripts/normalize-install.ts" + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -R node_modules $out/ + runHook postInstall + ''; + + dontFixup = true; + + outputHash = + { + "x86_64-linux" = "sha256-tJ6LK99dELOiR0BcsTRTt/vLyNamntujLxhBy5Xl/lc="; + "aarch64-linux" = "sha256-S+dX6ZVgv9dexxIHoa5PxP7e0nxf/d7cKUGty5eEi8A="; + "aarch64-darwin" = "sha256-DQbogNBQ9izK5GPmoOudqiB2lJvct1vZI2U5lp3WFy8="; + } + .${stdenv.hostPlatform.system}; + + outputHashMode = "recursive"; + }; + + alsaPluginDirectory = symlinkJoin { + name = "combined-alsaPlugins"; + paths = [ + "${pipewire}/lib/alsa-lib" + "${alsa-plugins}/lib/alsa-lib" + ]; + }; + }; + + meta = { + description = "Free, open source, offline speech-to-text application"; + longDescription = '' + Handy is a cross-platform desktop application providing simple, + privacy-focused speech transcription. Press a shortcut, speak, and + have your words appear in any text field — entirely on your own + computer, with no audio sent to the cloud. + ''; + homepage = "https://handy.computer"; + changelog = "https://github.com/cjpais/Handy/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "handy"; + maintainers = with lib.maintainers; [ philocalyst ]; + platforms = with lib.platforms; linux ++ darwin; + badPlatforms = [ "x86_64-darwin" ]; # We weren't able to get hashes here + }; +}) From 5f93cd3b894510fb0b225ab98d14248c241f5b4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 May 2026 00:28:19 +0000 Subject: [PATCH 30/97] findent: 4.3.6 -> 4.3.7 --- pkgs/by-name/fi/findent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/findent/package.nix b/pkgs/by-name/fi/findent/package.nix index 8ff3fe7ddf22..08e5327aa3eb 100644 --- a/pkgs/by-name/fi/findent/package.nix +++ b/pkgs/by-name/fi/findent/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "findent"; - version = "4.3.6"; + version = "4.3.7"; src = fetchurl { url = "mirror://sourceforge/findent/findent-${finalAttrs.version}.tar.gz"; - hash = "sha256-ctg02P8P3R27lCpv3tILSZ5ikn2Va25jHOWIuRfIONQ="; + hash = "sha256-4tqLjAwZYbK8nc5MbKp5ytCSRdNjiL6h/ALE7B/YuZg="; }; enableParallelBuilding = true; From c25fcc83ba1f45faf21f994b6c806cfe8b2f591d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 27 May 2026 17:58:40 -0700 Subject: [PATCH 31/97] verapdf: 1.28.2 -> 1.30.1 Diff: https://github.com/veraPDF/veraPDF-apps/compare/v1.28.2...v1.30.1 Changelog: https://github.com/veraPDF/veraPDF-library/blob/v1.30.1/RELEASENOTES.md --- pkgs/by-name/ve/verapdf/package.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ve/verapdf/package.nix b/pkgs/by-name/ve/verapdf/package.nix index e6d74bc67432..3f47924cd2f5 100644 --- a/pkgs/by-name/ve/verapdf/package.nix +++ b/pkgs/by-name/ve/verapdf/package.nix @@ -10,7 +10,7 @@ }: maven.buildMavenPackage rec { pname = "verapdf"; - version = "1.28.2"; + version = "1.30.1"; mvnParameters = "-pl '!installer' -Dverapdf.timestamp=1980-01-01T00:00:02Z -Dproject.build.outputTimestamp=1980-01-01T00:00:02Z " @@ -27,13 +27,13 @@ maven.buildMavenPackage rec { src = fetchFromGitHub { owner = "veraPDF"; repo = "veraPDF-apps"; - rev = "v${version}"; - hash = "sha256-tv5iffIQkyjHyulnmagcJuSGbc4tXRYTwB3hSEGLQrc="; + tag = "v${version}"; + hash = "sha256-IoQbAYEUJuK5FxGSxiLfcn5X1KOJca70hu4cMaYXfmw="; }; patches = [ ./stable-maven-plugins.patch ]; - mvnHash = "sha256-CrpiomKsAyD7SyVzwbjVXy8BoVnkejQVcim+kwVP5Ng="; + mvnHash = "sha256-hY+zPuSujMr3RntuLOZVEN8GN4n8201+S5OYvwB1+j4="; nativeBuildInputs = [ makeWrapper @@ -46,10 +46,11 @@ maven.buildMavenPackage rec { mkdir -p $out/bin $out/share - install -Dm644 greenfield-apps/target/greenfield-apps-${lib.versions.majorMinor version}.0.jar $out/share/verapdf.jar + install -Dm644 cli/target/cli-${lib.versions.majorMinor version}.0.jar $out/share/verapdf.jar + install -Dm644 gui/target/gui-${lib.versions.majorMinor version}.0.jar $out/share/verapdf-gui.jar - makeWrapper ${jre}/bin/java $out/bin/verapdf-gui --add-flags "-jar $out/share/verapdf.jar" - makeWrapper ${jre}/bin/java $out/bin/verapdf --add-flags "-cp $out/share/verapdf.jar org.verapdf.apps.GreenfieldCliWrapper" + makeWrapper ${lib.getExe jre} $out/bin/verapdf-gui --add-flags "-jar $out/share/verapdf-gui.jar" + makeWrapper ${lib.getExe jre} $out/bin/verapdf --add-flags "-jar $out/share/verapdf.jar" install -Dm644 gui/src/main/resources/org/verapdf/gui/images/icon.png $out/share/icons/hicolor/256x256/apps/verapdf.png @@ -74,6 +75,7 @@ maven.buildMavenPackage rec { ]; meta = { + changelog = "https://github.com/veraPDF/veraPDF-library/blob/${src.tag}/RELEASENOTES.md"; description = "Command line and GUI industry supported PDF/A and PDF/UA Validation"; homepage = "https://github.com/veraPDF/veraPDF-apps"; license = [ From 26942a46f36123e609d4cee4270b54d8f86c266d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 27 May 2026 18:22:15 -0700 Subject: [PATCH 32/97] verapdf: run versionCheckHook --- pkgs/by-name/ve/verapdf/package.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/by-name/ve/verapdf/package.nix b/pkgs/by-name/ve/verapdf/package.nix index 3f47924cd2f5..3a849132d0f5 100644 --- a/pkgs/by-name/ve/verapdf/package.nix +++ b/pkgs/by-name/ve/verapdf/package.nix @@ -7,6 +7,7 @@ makeDesktopItem, copyDesktopItems, jre, + versionCheckHook, }: maven.buildMavenPackage rec { pname = "verapdf"; @@ -74,6 +75,18 @@ maven.buildMavenPackage rec { }) ]; + doInstallCheck = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + versionCheckProgram = "${placeholder "out"}/bin/verapdf"; + + preVersionCheck = '' + version=${lib.versions.majorMinor version}.0 + ''; + meta = { changelog = "https://github.com/veraPDF/veraPDF-library/blob/${src.tag}/RELEASENOTES.md"; description = "Command line and GUI industry supported PDF/A and PDF/UA Validation"; From 7a5f7080e4fe630c9a3284d9e970819d31c0f757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 28 May 2026 13:10:55 -0700 Subject: [PATCH 33/97] python3Packages.insightface: 0.7.3 -> 1.0.1 --- .../python-modules/insightface/default.nix | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/insightface/default.nix b/pkgs/development/python-modules/insightface/default.nix index 621f25a3a799..45c384fa1b91 100644 --- a/pkgs/development/python-modules/insightface/default.nix +++ b/pkgs/development/python-modules/insightface/default.nix @@ -3,7 +3,6 @@ albumentations, buildPythonPackage, cython, - easydict, fetchPypi, insightface, matplotlib, @@ -11,9 +10,10 @@ numpy, onnx, onnxruntime, - opencv4, + opencv-python, pillow, - prettytable, + pyside6, + reportlab, requests, setuptools, scipy, @@ -26,12 +26,12 @@ buildPythonPackage rec { pname = "insightface"; - version = "0.7.3"; + version = "1.0.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-8ZH3GWEuuzcBj0GTaBRQBUTND4bm/NZ2wCPzVMZo3fc="; + hash = "sha256-J68kiRu7pHDLNXOzZqD8yomJ/IUDyfjygejLpv1xYHU="; }; build-system = [ @@ -40,23 +40,30 @@ buildPythonPackage rec { ]; dependencies = [ - albumentations - easydict - matplotlib mxnet # used in insightface/commands/rec_add_mask_param.py numpy onnx onnxruntime - opencv4 - pillow - prettytable + opencv-python requests - scikit-learn scikit-image scipy tqdm ]; + optional-dependencies = { + gui = [ + pillow + pyside6 + reportlab + scikit-learn + ]; + face3d = [ + albumentations + matplotlib + ]; + }; + # aarch64-linux tries to get cpu information from /sys, which isn't available # inside the nix build sandbox. dontUsePythonImportsCheck = stdenv.buildPlatform.system == "aarch64-linux"; From 7c8f41fd54ac04a483a3736ced51c18c3d58cb3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 28 May 2026 13:28:19 -0700 Subject: [PATCH 34/97] immich-machine-learning: unpin insightface Upstream did so in https://github.com/immich-app/immich/pull/28595 without any code changes. --- pkgs/by-name/im/immich-machine-learning/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix index d56a22565a18..9c968802d3fd 100644 --- a/pkgs/by-name/im/immich-machine-learning/package.nix +++ b/pkgs/by-name/im/immich-machine-learning/package.nix @@ -18,6 +18,7 @@ python.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "huggingface-hub" + "insightface" "numpy" "pillow" "pydantic-settings" From 87f07986f1d3f175be1d1792519043cdb3c4b9dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 28 May 2026 13:28:58 -0700 Subject: [PATCH 35/97] Revert "nixos/immich: fix matplotlib warning in machine-learning" This reverts commit cb2ed10279429d9d216f0e4c9ce29c032ad10b20 because immich-machine-learning no longer transitively depends on matplotlib. --- nixos/modules/services/web-apps/immich.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix index eaa0e3b0b403..a45a4d5492cc 100644 --- a/nixos/modules/services/web-apps/immich.nix +++ b/nixos/modules/services/web-apps/immich.nix @@ -380,8 +380,6 @@ in MACHINE_LEARNING_WORKERS = "1"; MACHINE_LEARNING_WORKER_TIMEOUT = "120"; MACHINE_LEARNING_CACHE_FOLDER = "/var/cache/immich"; - # TODO: drop when insightface no longer unconditionally imports matplotlib - MPLCONFIGDIR = "/var/cache/immich"; XDG_CACHE_HOME = "/var/cache/immich"; IMMICH_HOST = "localhost"; IMMICH_PORT = "3003"; From fbc0649c499298f65aa771ecc76e424c1ac66f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 28 May 2026 16:18:01 -0700 Subject: [PATCH 36/97] verapdf-gui: split out from verapdf --- pkgs/by-name/ve/verapdf-gui/package.nix | 5 +++++ pkgs/by-name/ve/verapdf/package.nix | 29 +++++++++++++++++-------- 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 pkgs/by-name/ve/verapdf-gui/package.nix diff --git a/pkgs/by-name/ve/verapdf-gui/package.nix b/pkgs/by-name/ve/verapdf-gui/package.nix new file mode 100644 index 000000000000..67d9771c918c --- /dev/null +++ b/pkgs/by-name/ve/verapdf-gui/package.nix @@ -0,0 +1,5 @@ +{ verapdf }: +verapdf.override { + withCli = false; + withGui = true; +} diff --git a/pkgs/by-name/ve/verapdf/package.nix b/pkgs/by-name/ve/verapdf/package.nix index 3a849132d0f5..2c9a5e42565e 100644 --- a/pkgs/by-name/ve/verapdf/package.nix +++ b/pkgs/by-name/ve/verapdf/package.nix @@ -8,9 +8,11 @@ copyDesktopItems, jre, versionCheckHook, + withCli ? true, + withGui ? false, }: maven.buildMavenPackage rec { - pname = "verapdf"; + pname = "verapdf" + lib.optionalString (withGui && !withCli) "-gui"; version = "1.30.1"; mvnParameters = @@ -46,19 +48,22 @@ maven.buildMavenPackage rec { runHook preInstall mkdir -p $out/bin $out/share - + '' + + lib.optionalString withCli '' install -Dm644 cli/target/cli-${lib.versions.majorMinor version}.0.jar $out/share/verapdf.jar - install -Dm644 gui/target/gui-${lib.versions.majorMinor version}.0.jar $out/share/verapdf-gui.jar - - makeWrapper ${lib.getExe jre} $out/bin/verapdf-gui --add-flags "-jar $out/share/verapdf-gui.jar" makeWrapper ${lib.getExe jre} $out/bin/verapdf --add-flags "-jar $out/share/verapdf.jar" + '' + + lib.optionalString withGui '' + install -Dm644 gui/target/gui-${lib.versions.majorMinor version}.0.jar $out/share/verapdf-gui.jar + makeWrapper ${lib.getExe jre} $out/bin/verapdf-gui --add-flags "-jar $out/share/verapdf-gui.jar" install -Dm644 gui/src/main/resources/org/verapdf/gui/images/icon.png $out/share/icons/hicolor/256x256/apps/verapdf.png - + '' + + '' runHook postInstall ''; - desktopItems = [ + desktopItems = lib.optionals withGui [ (makeDesktopItem { name = "veraPDF"; comment = meta.description; @@ -75,7 +80,8 @@ maven.buildMavenPackage rec { }) ]; - doInstallCheck = true; + # GUI has no --version flag + doInstallCheck = withCli; nativeInstallCheckInputs = [ versionCheckHook @@ -96,10 +102,15 @@ maven.buildMavenPackage rec { # or lib.licenses.mpl20 ]; - mainProgram = "verapdf-gui"; maintainers = [ lib.maintainers.mohe2015 lib.maintainers.kilianar ]; + } + // lib.optionalAttrs (withCli && !withGui) { + mainProgram = "verapdf"; + } + // lib.optionalAttrs (withGui && !withCli) { + mainProgram = "verapdf-gui"; }; } From e9d620e19f6bd981733e5e47d452bf5ffe9aa5d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 28 May 2026 16:36:10 -0700 Subject: [PATCH 37/97] verapdf: use __structuredAttrs and strictDeps --- pkgs/by-name/ve/verapdf/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ve/verapdf/package.nix b/pkgs/by-name/ve/verapdf/package.nix index 2c9a5e42565e..2cb5874cc115 100644 --- a/pkgs/by-name/ve/verapdf/package.nix +++ b/pkgs/by-name/ve/verapdf/package.nix @@ -14,6 +14,7 @@ maven.buildMavenPackage rec { pname = "verapdf" + lib.optionalString (withGui && !withCli) "-gui"; version = "1.30.1"; + __structuredAttrs = true; mvnParameters = "-pl '!installer' -Dverapdf.timestamp=1980-01-01T00:00:02Z -Dproject.build.outputTimestamp=1980-01-01T00:00:02Z " @@ -38,6 +39,8 @@ maven.buildMavenPackage rec { mvnHash = "sha256-hY+zPuSujMr3RntuLOZVEN8GN4n8201+S5OYvwB1+j4="; + strictDeps = true; + nativeBuildInputs = [ makeWrapper stripJavaArchivesHook From e1632511d080aa84b8fc2c8fbd1f2cc271e297a9 Mon Sep 17 00:00:00 2001 From: ccicnce113424 Date: Sat, 16 May 2026 09:43:42 +0800 Subject: [PATCH 38/97] kmscon: 9.3.5 -> 10.0.0 --- pkgs/by-name/km/kmscon/package.nix | 21 ++++++++++++++++----- pkgs/by-name/km/kmscon/sandbox.patch | 13 ------------- 2 files changed, 16 insertions(+), 18 deletions(-) delete mode 100644 pkgs/by-name/km/kmscon/sandbox.patch diff --git a/pkgs/by-name/km/kmscon/package.nix b/pkgs/by-name/km/kmscon/package.nix index bcecb5c8b5eb..1d174f44f078 100644 --- a/pkgs/by-name/km/kmscon/package.nix +++ b/pkgs/by-name/km/kmscon/package.nix @@ -16,8 +16,11 @@ pkg-config, docbook_xsl, docbook_xml_dtd_42, + python3, + ncurses, libxslt, libgbm, + seatd, ninja, check, bash, @@ -29,13 +32,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "kmscon"; - version = "9.3.5"; + version = "10.0.0"; src = fetchFromGitHub { owner = "kmscon"; repo = "kmscon"; tag = "v${finalAttrs.version}"; - hash = "sha256-QBN1rSDmwVg7cgljhe6kVIg/xLoolmOPqS8JXZuQiXs="; + hash = "sha256-M3830e1GzzLT2fhheWwNRkURzYkHv4k8uEMoCqKkjJY="; }; strictDeps = true; @@ -57,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { pango systemdLibs libgbm + seatd check # Needed for autoPatchShebangs when strictDeps = true bash @@ -69,6 +73,8 @@ stdenv.mkDerivation (finalAttrs: { pkg-config libxslt # xsltproc docbook_xml_dtd_42 + python3 + ncurses ]; outputs = [ @@ -76,9 +82,14 @@ stdenv.mkDerivation (finalAttrs: { "man" ]; - patches = [ - ./sandbox.patch # Generate system units where they should be (nix store) instead of /etc/systemd/system - ]; + env = { + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + DESTDIR = "/"; + }; + + postPatch = '' + patchShebangs scripts/terminfo + ''; postFixup = '' substituteInPlace $out/bin/kmscon \ diff --git a/pkgs/by-name/km/kmscon/sandbox.patch b/pkgs/by-name/km/kmscon/sandbox.patch deleted file mode 100644 index 9f896b761143..000000000000 --- a/pkgs/by-name/km/kmscon/sandbox.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index de29a32..e731bbd 100644 ---- a/meson.build -+++ b/meson.build -@@ -39,7 +39,7 @@ mandir = get_option('mandir') - moduledir = get_option('libdir') / meson.project_name() - - systemd_deps = dependency('systemd', required: false) --systemdsystemunitdir = systemd_deps.get_variable('systemdsystemunitdir', default_value: 'lib/systemd/system') -+systemdsystemunitdir = get_option('libdir') / 'systemd' / 'system' - - # - # Required dependencies From f370831f3752e2a4fbb1b193185b4a57f02bc7fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 May 2026 10:36:41 +0000 Subject: [PATCH 39/97] zmap: 4.3.4 -> 4.4.0 --- pkgs/by-name/zm/zmap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zm/zmap/package.nix b/pkgs/by-name/zm/zmap/package.nix index 4cf0c58a5a1f..bba2dc310d7a 100644 --- a/pkgs/by-name/zm/zmap/package.nix +++ b/pkgs/by-name/zm/zmap/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zmap"; - version = "4.3.4"; + version = "4.4.0"; src = fetchFromGitHub { owner = "zmap"; repo = "zmap"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-fHCVo8OwQUzpdDq7dMBxvK15Ojth5UmNoPTVuTGUP58="; + sha256 = "sha256-Mym0pyd43pcbnZzPW3P+N5syjTJBuMsH2ZsjOJmqZgA="; }; cmakeFlags = [ "-DRESPECT_INSTALL_PREFIX_CONFIG=ON" ]; From d788c7fb05569a24ed5fa7bc98644d8722662206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 May 2026 14:41:15 -0700 Subject: [PATCH 40/97] bitwarden-cli: 2026.4.2 -> 2026.5.0 Diff: https://github.com/bitwarden/clients/compare/cli-v2026.4.2...cli-v2026.5.0 Changelog: https://github.com/bitwarden/clients/releases/tag/cli-v2026.5.0 --- pkgs/by-name/bi/bitwarden-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 57041900c7b8..ceb1c97e11c0 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -14,13 +14,13 @@ buildNpmPackage (finalAttrs: { pname = "bitwarden-cli"; - version = "2026.4.2"; + version = "2026.5.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; tag = "cli-v${finalAttrs.version}"; - hash = "sha256-8UDzW93O+AvMGXcVHe1PTvYvmXewl/bXsxIdjoGRtcQ="; + hash = "sha256-R00wt5W4kKmFIODEaGoUqDwfGyHH/2PpiRaC8Gq3d88="; }; postPatch = '' @@ -38,7 +38,7 @@ buildNpmPackage (finalAttrs: { nodejs = nodejs_22; npmDepsFetcherVersion = 2; - npmDepsHash = "sha256-3RQ0HRsLQlXMeJIHAPKbZsGi6I/70pSIg8NM/3uJvUo="; + npmDepsHash = "sha256-SU4HjfNshjRwa8mXPnmG2xVIwYkbQ7g8j3NZ43Ap76k="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ perl From f10343fac9d095ff92412989aa1c4285a6a9af98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 May 2026 05:38:20 +0000 Subject: [PATCH 41/97] doggo: 1.1.6 -> 1.1.7 --- pkgs/by-name/do/doggo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/doggo/package.nix b/pkgs/by-name/do/doggo/package.nix index 2ce906f3b38e..2086efd64bb7 100644 --- a/pkgs/by-name/do/doggo/package.nix +++ b/pkgs/by-name/do/doggo/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "doggo"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "mr-karan"; repo = "doggo"; rev = "v${finalAttrs.version}"; - hash = "sha256-NPbBQ11QuNKDtNnh8OoVpSsnC62078HYtE4E6esf6Hs="; + hash = "sha256-Q4a859MoVSZ4hjXwaIekL1En6xpd4bZPQ9NGAkxSPto="; }; vendorHash = "sha256-JMyGYG3cLOZmH9EcLPe+5+ViHv7Z7brLj5uqJrPYm7A="; From c3cae566bffd5a653d9ca9cac8268fa38ffc2f1e Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sat, 30 May 2026 07:38:14 -0500 Subject: [PATCH 42/97] sunshine: remove pcre --- pkgs/by-name/su/sunshine/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/su/sunshine/package.nix b/pkgs/by-name/su/sunshine/package.nix index 49006ab1c7d1..b3ee2368c6cf 100644 --- a/pkgs/by-name/su/sunshine/package.nix +++ b/pkgs/by-name/su/sunshine/package.nix @@ -29,7 +29,6 @@ libcap, libgbm, curl, - pcre, pcre2, python3, libuuid, @@ -166,7 +165,6 @@ stdenv'.mkDerivation (finalAttrs: { libevdev libcap libdrm - pcre pcre2 libuuid libselinux From 1d37a606a967cf6c09d5bb89277baea0c869f13a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= Date: Sat, 30 May 2026 15:03:38 +0200 Subject: [PATCH 43/97] fwupd: 2.1.2 -> 2.1.3 Diff: https://github.com/fwupd/fwupd/compare/2.1.2...2.1.3 Changelog: https://github.com/fwupd/fwupd/releases/tag/2.1.3 --- pkgs/by-name/fw/fwupd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index 8612011cc8cc..98e2082c0b38 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -127,7 +127,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "2.1.2"; + version = "2.1.3"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; tag = finalAttrs.version; - hash = "sha256-lNbm1E2Lqo8gXMNl6NodFNWhSizSxVIG1p5PI8Wj1Xw="; + hash = "sha256-AZ8DwhAoRLROExrGqEzzXppUI2285JoRZ4o748pyAaA="; }; patches = [ From 25da47049d5925e7d67329d642fc3fe087d24e36 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 30 May 2026 10:56:02 -0400 Subject: [PATCH 44/97] {lemonbar,lemonbar-xft}: move to by-name --- .../lemonbar/xft.nix => by-name/le/lemonbar-xft/package.nix} | 0 .../lemonbar/default.nix => by-name/le/lemonbar/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 4 deletions(-) rename pkgs/{applications/window-managers/lemonbar/xft.nix => by-name/le/lemonbar-xft/package.nix} (100%) rename pkgs/{applications/window-managers/lemonbar/default.nix => by-name/le/lemonbar/package.nix} (100%) diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/by-name/le/lemonbar-xft/package.nix similarity index 100% rename from pkgs/applications/window-managers/lemonbar/xft.nix rename to pkgs/by-name/le/lemonbar-xft/package.nix diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/by-name/le/lemonbar/package.nix similarity index 100% rename from pkgs/applications/window-managers/lemonbar/default.nix rename to pkgs/by-name/le/lemonbar/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7ccbe0f949d..b79cae143ab1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9416,10 +9416,6 @@ with pkgs; callPackage ../applications/networking/cluster/helm/plugins { } ); - lemonbar = callPackage ../applications/window-managers/lemonbar { }; - - lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { }; - libreoffice-bin = callPackage ../applications/office/libreoffice/darwin { }; libreoffice = hiPrio libreoffice-still; From d54367545e93d361171579778141823ef804a99f Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Sat, 30 May 2026 00:14:54 +0100 Subject: [PATCH 45/97] obsidian: fix internal PDF viewer on Electron 40 Obsidian's app:// scheme lacks `corsEnabled`, which breaks the internal PDF viewer on Electron 40. Add it to the scheme registration. Fixes #523846 Assisted-by: Claude Code (Claude Opus 4.8) --- pkgs/by-name/ob/obsidian/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index 272dd33bec11..d18f4f243409 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -6,6 +6,7 @@ electron_40, # see https://github.com/NixOS/nixpkgs/pull/521495 makeDesktopItem, imagemagick, + asar, autoPatchelfHook, writeScript, _7zz, @@ -87,10 +88,20 @@ let autoPatchelfHook makeWrapper imagemagick + asar ]; installPhase = '' runHook preInstall mkdir -p $out/bin + + # Mark Obsidian's app:// scheme `corsEnabled` to fix the internal PDF + # viewer; see https://github.com/NixOS/nixpkgs/pull/525772 for details. + # Remove once upstream registers the scheme with `corsEnabled`. + asar extract resources/app.asar app-src + substituteInPlace app-src/main.js \ + --replace-fail "supportFetchAPI: true," "supportFetchAPI: true, corsEnabled: true," + asar pack app-src resources/app.asar + makeWrapper ${electron_40}/bin/electron $out/bin/obsidian \ --add-flags $out/share/obsidian/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-wayland-ime=true --wayland-text-input-version=3}}" \ From 362e335dbe4664ac1017566a26bf0d00ace79959 Mon Sep 17 00:00:00 2001 From: whispers Date: Sat, 30 May 2026 15:13:39 -0400 Subject: [PATCH 46/97] spice-up: drop unused libsoup 2.4 dependency, modernize Upstream no longer actually uses libsoup 2.4, as reported in https://github.com/Philip-Scott/Spice-up/issues/328. Since this is the case, and libsoup 2.4 is likely to be removed soon due to having had known vulnerabilities for years, we drop the dependency to keep this package working. --- pkgs/by-name/sp/spice-up/package.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/sp/spice-up/package.nix b/pkgs/by-name/sp/spice-up/package.nix index 52ae9f68a666..2b92548348c7 100644 --- a/pkgs/by-name/sp/spice-up/package.nix +++ b/pkgs/by-name/sp/spice-up/package.nix @@ -15,19 +15,18 @@ libevdev, libgee, libgudev, - libsoup_2_4, pantheon, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spice-up"; version = "1.9.1"; src = fetchFromGitHub { owner = "Philip-Scott"; repo = "Spice-up"; - rev = version; - sha256 = "sha256-FI6YMbqZfaU19k8pS2eoNCnX8O8F99SHHOxMwHC5fTc="; + tag = finalAttrs.version; + hash = "sha256-FI6YMbqZfaU19k8pS2eoNCnX8O8F99SHHOxMwHC5fTc="; }; nativeBuildInputs = [ @@ -46,11 +45,16 @@ stdenv.mkDerivation rec { libevdev libgee libgudev - libsoup_2_4 pantheon.granite ]; + # Drop dependency on libsoup 2.4, which is insecure. It's no longer actually + # used upstream, so this is harmless. + # https://github.com/Philip-Scott/Spice-up/issues/328 postPatch = '' + substituteInPlace meson.build --replace-fail "soup_dep = dependency('libsoup-2.4')" "" + substituteInPlace src/meson.build --replace-fail "soup_dep," "" + chmod +x meson/post_install.py patchShebangs meson/post_install.py ''; @@ -72,4 +76,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; mainProgram = "com.github.philip_scott.spice-up"; }; -} +}) From 79d09bcbe48064bb30530fdca7cbb1bb6059b053 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 31 May 2026 00:11:33 +0400 Subject: [PATCH 47/97] =?UTF-8?q?pmtiles:=201.30.0=20=E2=86=92=201.30.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pm/pmtiles/darwin-sandbox-fix.patch | 20 ------------------- pkgs/by-name/pm/pmtiles/package.nix | 13 +++--------- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 pkgs/by-name/pm/pmtiles/darwin-sandbox-fix.patch diff --git a/pkgs/by-name/pm/pmtiles/darwin-sandbox-fix.patch b/pkgs/by-name/pm/pmtiles/darwin-sandbox-fix.patch deleted file mode 100644 index b390d492467c..000000000000 --- a/pkgs/by-name/pm/pmtiles/darwin-sandbox-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go -+++ vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go -@@ -696,7 +696,7 @@ func init() { - // Load protocols - data, err := ioutil.ReadFile("/etc/protocols") - if err != nil { -- if !os.IsNotExist(err) { -+ if !os.IsNotExist(err) && !os.IsPermission(err) { - panic(err) - } - -@@ -732,7 +732,7 @@ func init() { - // Load services - data, err = ioutil.ReadFile("/etc/services") - if err != nil { -- if !os.IsNotExist(err) { -+ if !os.IsNotExist(err) && !os.IsPermission(err) { - panic(err) - } - diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix index 4f25c65c0d68..24acb2ab2e04 100644 --- a/pkgs/by-name/pm/pmtiles/package.nix +++ b/pkgs/by-name/pm/pmtiles/package.nix @@ -5,23 +5,16 @@ }: buildGoModule (finalAttrs: { pname = "pmtiles"; - version = "1.30.0"; + version = "1.30.3"; src = fetchFromGitHub { owner = "protomaps"; repo = "go-pmtiles"; tag = "v${finalAttrs.version}"; - hash = "sha256-7Xkkna85ls5kRelar2DMf+U/4tCa9up/H+uuDJTXJr8="; + hash = "sha256-SFuW/TKKxBGOeyYdHLm7J2w3n8xPjLzSJTIi322WTk0="; }; - vendorHash = "sha256-UzpyvWsfbzYTngMdWU+fgZj/yQvSfJzhFWpFRsD24GE="; - - overrideModAttrs = old: { - # https://gitlab.com/cznic/libc/-/merge_requests/10 - postBuild = '' - patch -p0 < ${./darwin-sandbox-fix.patch} - ''; - }; + vendorHash = "sha256-0u/04mpqhpRideIf8eOzgC7ZWNp4P2c2ssQvyWlcD4M="; ldflags = [ "-s" From 1f9f9ae08bf42d3d989d145691505e953cc70153 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 27 Apr 2026 02:52:00 -0700 Subject: [PATCH 48/97] uriparser: move gtest from nativeCheckInputs to checkInputs --- pkgs/by-name/ur/uriparser/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ur/uriparser/package.nix b/pkgs/by-name/ur/uriparser/package.nix index fe0deaa66631..54ed6ee67c37 100644 --- a/pkgs/by-name/ur/uriparser/package.nix +++ b/pkgs/by-name/ur/uriparser/package.nix @@ -26,7 +26,9 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - nativeCheckInputs = [ gtest ]; + checkInputs = [ gtest ]; + + strictDeps = true; meta = { changelog = "https://github.com/uriparser/uriparser/blob/uriparser-${finalAttrs.version}/ChangeLog"; From 96bbeb99c5abd8046ef4c8910d3aa8b25bf0962c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 May 2026 00:51:14 +0000 Subject: [PATCH 49/97] ocamlPackages.smtml: 0.27.0 -> 0.28.0 --- pkgs/development/ocaml-modules/smtml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/smtml/default.nix b/pkgs/development/ocaml-modules/smtml/default.nix index 3ecb5474ddd0..f32b7e351008 100644 --- a/pkgs/development/ocaml-modules/smtml/default.nix +++ b/pkgs/development/ocaml-modules/smtml/default.nix @@ -31,13 +31,13 @@ buildDunePackage (finalAttrs: { pname = "smtml"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "formalsec"; repo = "smtml"; tag = "v${finalAttrs.version}"; - hash = "sha256-YyzrPs6ykpUzHHZ63y3c82LG9lv0Pf4i01w5GWadumU="; + hash = "sha256-TZMBUnw1AtsVUfLLQJ/gs0CBtnphBiREH99QP3VuAL0="; }; minimalOCamlVersion = "4.14"; From b7768d8a71ef7cbd9b3ea231ffb59e107380e807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= Date: Sat, 30 May 2026 15:08:22 +0200 Subject: [PATCH 50/97] fwupd: 2.1.3 -> 2.1.4 2.1.4 and 2.1.4-2 point to the same commit, but the GH release was done with -2. Diff: https://github.com/fwupd/fwupd/compare/2.1.3...2.1.4 Changelog: https://github.com/fwupd/fwupd/releases/tag/2.1.4-2 --- .../0001-Install-fwupdplugin-to-out.patch | 4 +- .../0002-Add-output-for-installed-tests.patch | 16 ++--- ...d-option-for-installation-sysconfdir.patch | 64 +++++++++++-------- .../0004-Get-the-efi-app-from-fwupd-efi.patch | 4 +- pkgs/by-name/fw/fwupd/package.nix | 17 ++--- 5 files changed, 52 insertions(+), 53 deletions(-) diff --git a/pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch b/pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch index 5e3608e27319..f68d082afd54 100644 --- a/pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch +++ b/pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch @@ -8,10 +8,10 @@ Subject: [PATCH] Install fwupdplugin to out 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 1a56d3308..c7bf2c9aa 100644 +index 0d756bc0e748ba1c7be64bb9357f28fe8c5342e6..0cfca8e45b7ed6cc63be470ac0df916639ef52c4 100644 --- a/meson.build +++ b/meson.build -@@ -734,7 +734,7 @@ if build_standalone +@@ -719,7 +719,7 @@ if build_standalone if host_machine.system() == 'windows' libdir_pkg = bindir else diff --git a/pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch b/pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch index 1f3bfcf79f3e..1c1ce14a4b9b 100644 --- a/pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch +++ b/pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch @@ -11,7 +11,7 @@ Subject: [PATCH] Add output for installed tests 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/data/tests/meson.build b/data/tests/meson.build -index e15cab2fa..bad033dbf 100644 +index 377ba2ccaa5e13a87443cbe65406eb5a9a3af79b..2dfb5f251383464c38e2f3202c9dfb1107ac7798 100644 --- a/data/tests/meson.build +++ b/data/tests/meson.build @@ -139,7 +139,7 @@ configure_file( @@ -22,12 +22,12 @@ index e15cab2fa..bad033dbf 100644 + install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'), ) - if umockdev_integration_tests.allowed() + if umockdev.found() diff --git a/meson.build b/meson.build -index c7bf2c9aa..bf77bf6d6 100644 +index 0cfca8e45b7ed6cc63be470ac0df916639ef52c4..1561d1837a73425d9dda510d0ba25d16f92ed7f7 100644 --- a/meson.build +++ b/meson.build -@@ -241,8 +241,8 @@ else +@@ -243,8 +243,8 @@ else includedir = join_paths(prefix, get_option('includedir')) sysconfdir = join_paths(prefix, get_option('sysconfdir')) localstatedir = join_paths(prefix, get_option('localstatedir')) @@ -38,7 +38,7 @@ index c7bf2c9aa..bf77bf6d6 100644 daemon_dir = join_paths(libexecdir, 'fwupd') endif mandir = join_paths(prefix, get_option('mandir')) -@@ -722,6 +722,7 @@ gnome = import('gnome') +@@ -707,6 +707,7 @@ gnome = import('gnome') i18n = import('i18n') conf.set_quoted('FWUPD_PREFIX', prefix) @@ -47,10 +47,10 @@ index c7bf2c9aa..bf77bf6d6 100644 conf.set_quoted('FWUPD_LIBDIR', libdir) conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir) diff --git a/meson_options.txt b/meson_options.txt -index eb57391eb..420997355 100644 +index 6fe15e8beb8a85acdaca15f212bd3a917990ced2..b89ba371cee9dccf8457414f316ca697ef33216a 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -198,6 +198,11 @@ option( +@@ -193,6 +193,11 @@ option( value: 'fwupd-refresh', description: 'User account to use for fwupd-refresh.service (empty for DynamicUser)', ) @@ -63,7 +63,7 @@ index eb57391eb..420997355 100644 'tests', type: 'boolean', diff --git a/src/tests/host-emulate/meson.build b/src/tests/host-emulate/meson.build -index c36da65cd..f0b70d4d6 100644 +index c36da65cd67e6081a758ed2ab7327276fb82d804..f0b70d4d68de6f534f1c1ecd37e51619ad1d85e7 100644 --- a/src/tests/host-emulate/meson.build +++ b/src/tests/host-emulate/meson.build @@ -9,7 +9,7 @@ if build_standalone diff --git a/pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch b/pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch index 1efe00bed4ed..999acdd4e874 100644 --- a/pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch +++ b/pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch @@ -7,15 +7,15 @@ Subject: [PATCH] Add option for installation sysconfdir data/bios-settings.d/meson.build | 2 +- data/meson.build | 2 +- data/pki/meson.build | 4 ++-- - data/remotes.d/meson.build | 8 ++++---- + data/remotes.d/meson.build | 10 +++++----- docs/meson.build | 16 ++++++++-------- meson.build | 6 ++++++ meson_options.txt | 6 ++++++ plugins/uefi-capsule/meson.build | 4 ++-- - 8 files changed, 30 insertions(+), 18 deletions(-) + 8 files changed, 31 insertions(+), 19 deletions(-) diff --git a/data/bios-settings.d/meson.build b/data/bios-settings.d/meson.build -index 2a2a07016..99df55afb 100644 +index 2a2a0701612e54a838d4d72f2bb00a793a31e0a3..99df55afb7636b090e2f57a5033bec6fe0017c15 100644 --- a/data/bios-settings.d/meson.build +++ b/data/bios-settings.d/meson.build @@ -2,6 +2,6 @@ if build_standalone and host_machine.system() == 'linux' @@ -27,7 +27,7 @@ index 2a2a07016..99df55afb 100644 ) endif diff --git a/data/meson.build b/data/meson.build -index 70d08c55e..5a5d8bf46 100644 +index 74a9104c333330ce2aacaa7cac45c87d6c5c8e53..3d9cc87b443078888c6e72075095d644a9258dab 100644 --- a/data/meson.build +++ b/data/meson.build @@ -29,7 +29,7 @@ if build_standalone @@ -38,27 +38,26 @@ index 70d08c55e..5a5d8bf46 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd'), install_mode: 'rw-r-----', ) - plugin_quirks += files('cfi.quirk', 'ds20.quirk', 'power.quirk', 'vendors.quirk') + plugin_quirks += files( diff --git a/data/pki/meson.build b/data/pki/meson.build -index b87068405..21f59753a 100644 +index 7574aebc60617d8d8456c210bb19fcaf25263e74..05e6642454123e715e2f80501cf1919f96905fde 100644 --- a/data/pki/meson.build +++ b/data/pki/meson.build -@@ -8,11 +8,11 @@ if supported_pkcs7 - install_data( - ['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'], - install_tag: 'runtime', -- install_dir: join_paths(sysconfdir, 'pki', 'fwupd'), -+ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd'), - ) - install_data( - ['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'], - install_tag: 'runtime', -- install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata'), -+ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata'), - ) - endif +@@ -1,10 +1,10 @@ + install_data( + ['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'], + install_tag: 'runtime', +- install_dir: join_paths(sysconfdir, 'pki', 'fwupd'), ++ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd'), + ) + install_data( + ['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'], + install_tag: 'runtime', +- install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata'), ++ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata'), + ) diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build -index b8d24c267..0dd4ad32a 100644 +index c0b4862ce6e13861da967cc2b8442849f63f0520..8bd00e9dbefd0ff386ad61f08ec861e7ad005090 100644 --- a/data/remotes.d/meson.build +++ b/data/remotes.d/meson.build @@ -12,7 +12,7 @@ if build_standalone and get_option('lvfs') != 'false' @@ -75,11 +74,20 @@ index b8d24c267..0dd4ad32a 100644 install: true, install_tag: 'runtime', - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), ++ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), + ) + configure_file( + input: 'lvfs-embargo.conf', +@@ -28,7 +28,7 @@ if build_standalone and get_option('lvfs') != 'false' + configuration: con3, + install: true, + install_tag: 'runtime', +- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) i18n.merge_file( input: 'lvfs.metainfo.xml', -@@ -59,7 +59,7 @@ configure_file( +@@ -67,7 +67,7 @@ configure_file( configuration: con2, install: get_option('vendor_metadata'), install_tag: 'runtime', @@ -88,7 +96,7 @@ index b8d24c267..0dd4ad32a 100644 ) configure_file( input: 'vendor-directory.conf', -@@ -67,5 +67,5 @@ configure_file( +@@ -75,5 +75,5 @@ configure_file( configuration: con2, install: true, install_tag: 'runtime', @@ -96,7 +104,7 @@ index b8d24c267..0dd4ad32a 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/docs/meson.build b/docs/meson.build -index b4d48b086..8a1f8fc8c 100644 +index b4d48b086baf03a2f713ab9c7cb17e60b2a9d12b..8a1f8fc8ca9fc21f278575233348ca918635c161 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -196,7 +196,7 @@ if build_docs @@ -161,10 +169,10 @@ index b4d48b086..8a1f8fc8c 100644 ) endif diff --git a/meson.build b/meson.build -index bf77bf6d6..f1f51e841 100644 +index 1561d1837a73425d9dda510d0ba25d16f92ed7f7..917770b38abb86056d6c42fa9c99dedf27ebe999 100644 --- a/meson.build +++ b/meson.build -@@ -248,6 +248,12 @@ endif +@@ -250,6 +250,12 @@ endif mandir = join_paths(prefix, get_option('mandir')) localedir = join_paths(prefix, get_option('localedir')) @@ -178,7 +186,7 @@ index bf77bf6d6..f1f51e841 100644 gio = dependency( 'gio-2.0', diff --git a/meson_options.txt b/meson_options.txt -index 420997355..67b3058d5 100644 +index b89ba371cee9dccf8457414f316ca697ef33216a..0dc66c4ec1ecb1547a21c4ec673ac1032462d91e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -14,6 +14,12 @@ option( @@ -195,7 +203,7 @@ index 420997355..67b3058d5 100644 'build', type: 'combo', diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build -index f104f36d7..30356ea53 100644 +index c2eb3b4300437d0d6b87d934441e69c306ba99a8..5c90240170c11ad3c75840ab6913018b6f7de85f 100644 --- a/plugins/uefi-capsule/meson.build +++ b/plugins/uefi-capsule/meson.build @@ -23,7 +23,7 @@ if host_machine.system() == 'linux' diff --git a/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch b/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch index 7394273ebfed..8f044f425216 100644 --- a/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch +++ b/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch @@ -8,10 +8,10 @@ Subject: [PATCH] Get the efi app from fwupd-efi 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index f1f51e841..aaefe55d9 100644 +index 917770b38abb86056d6c42fa9c99dedf27ebe999..f52f3ec12dd9def0a68ea1645f7d508acbb731b9 100644 --- a/meson.build +++ b/meson.build -@@ -646,7 +646,7 @@ endif +@@ -651,7 +651,7 @@ endif # EFI if build_standalone diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index 98e2082c0b38..8e9d9f3f1ae2 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -53,7 +53,6 @@ tpm2-tss, valgrind, xz, # for liblzma - flashrom, # mesonFlags hwdata, @@ -74,16 +73,12 @@ nixosTests, nix-update-script, - enableFlashrom ? false, enablePassim ? false, }: let isx86 = stdenv.hostPlatform.isx86; - # Experimental - haveFlashrom = isx86 && enableFlashrom; - runPythonCommand = name: buildCommandPython: @@ -127,7 +122,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "2.1.3"; + version = "2.1.4"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -145,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; tag = finalAttrs.version; - hash = "sha256-AZ8DwhAoRLROExrGqEzzXppUI2285JoRZ4o748pyAaA="; + hash = "sha256-bKBEZR7Wzi9nZYH+KAzh1q+sh2t2Gl3puQmeogNdIsE="; }; patches = [ @@ -193,6 +188,7 @@ stdenv.mkDerivation (finalAttrs: { ensureNewerSourcesForZipFilesHook # required for firmware zipping gettext gi-docgen + gnutls.bin gobject-introspection libjcat.bin libxml2 @@ -233,9 +229,6 @@ stdenv.mkDerivation (finalAttrs: { tpm2-tss valgrind xz # for liblzma - ] - ++ lib.optionals haveFlashrom [ - flashrom ]; mesonFlags = [ @@ -260,9 +253,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!enablePassim) [ (lib.mesonEnable "passim" false) - ] - ++ lib.optionals (!haveFlashrom) [ - (lib.mesonEnable "plugin_flashrom" false) ]; # TODO: wrapGAppsHook3 wraps efi capsule even though it is not ELF @@ -340,6 +330,7 @@ stdenv.mkDerivation (finalAttrs: { updateScript = nix-update-script { }; filesInstalledToEtc = [ "fwupd/fwupd.conf" + "fwupd/remotes.d/lvfs-embargo.conf" "fwupd/remotes.d/lvfs-testing.conf" "fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/vendor.conf" From 292332302c294d6567914811d41871e9045dbc94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 May 2026 02:57:50 +0000 Subject: [PATCH 51/97] uptime-kuma: 2.3.2 -> 2.4.0 --- pkgs/by-name/up/uptime-kuma/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/up/uptime-kuma/package.nix b/pkgs/by-name/up/uptime-kuma/package.nix index c498932d617d..f4317ee785f6 100644 --- a/pkgs/by-name/up/uptime-kuma/package.nix +++ b/pkgs/by-name/up/uptime-kuma/package.nix @@ -9,16 +9,16 @@ buildNpmPackage (finalAttrs: { pname = "uptime-kuma"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; tag = finalAttrs.version; - hash = "sha256-TJCpmUT/E7Il9h7UM1rs2s8l2Vey+X3PZToFLTgxFdA="; + hash = "sha256-iqkf9/UAQOnSA+nncK/fmjbqZpIQeUmigI/78m5qKrM="; }; - npmDepsHash = "sha256-FnUjHi0l/WDBX0T65bomElcEG+mRc81n/s22npeHnlM="; + npmDepsHash = "sha256-chvykBfnARLto+Il9gumm6UTRSTPPBjg5pj4yGFiOcg="; patches = [ # Fixes the permissions of the database being not set correctly From e6a9c10761a9279a176711b8498e91f981074407 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 May 2026 06:29:42 +0000 Subject: [PATCH 52/97] thunderkittens: 0-unstable-2026-05-22 -> 0-unstable-2026-05-27 --- pkgs/by-name/th/thunderkittens/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/th/thunderkittens/package.nix b/pkgs/by-name/th/thunderkittens/package.nix index 8e6cd76a6d90..54915bbd0fc6 100644 --- a/pkgs/by-name/th/thunderkittens/package.nix +++ b/pkgs/by-name/th/thunderkittens/package.nix @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation { pname = "thunderkittens"; - version = "0-unstable-2026-05-22"; + version = "0-unstable-2026-05-27"; __structuredAttrs = true; strictDeps = true; @@ -15,8 +15,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "HazyResearch"; repo = "ThunderKittens"; - rev = "f05decc66ddc209f80d7746d110961901012f8b0"; - hash = "sha256-LPsfnAYZw+jIACH1LUP7CRTFFC4P0G2w905eHGr5gRo="; + rev = "34b15f7e7012de25ae162c8d9dc85296dd342676"; + hash = "sha256-VN6AACu6LqOuCCvpNOeGGdYkQblxyWolBnCNeSxgiL4="; }; dontBuild = true; From c3deca82ebb7080b34aef27a0578e9b8b5175075 Mon Sep 17 00:00:00 2001 From: Erik Jensen Date: Sun, 31 May 2026 00:12:18 -0700 Subject: [PATCH 53/97] afsctool: fetch submodules to enable LZFSE afsctool pulls in Apple's open-source LZFSE and LZVN code via a submodule. Without it, only zlib is supported. --- pkgs/by-name/af/afsctool/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/af/afsctool/package.nix b/pkgs/by-name/af/afsctool/package.nix index 526b11ade2fb..2879be3d1ab9 100644 --- a/pkgs/by-name/af/afsctool/package.nix +++ b/pkgs/by-name/af/afsctool/package.nix @@ -17,7 +17,12 @@ stdenv.mkDerivation rec { owner = "RJVB"; repo = "afsctool"; tag = "v${version}"; - hash = "sha256-cZ0P9cygj+5GgkDRpQk7P9z8zh087fpVfrYXMRRVUAI="; + fetchSubmodules = true; + gitConfigFile = builtins.toFile "gitconfig" '' + [url "https://github.com/"] + insteadOf = "git://github.com/" + ''; + hash = "sha256-irWPQnnV5mHZS7pw9PAWp6MO/3MahKaOIZCr6awcwEg="; }; cmakeFlags = [ From c71a0e7c29c30f88dca4ebd09905e0d2b322d1fc Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Sun, 31 May 2026 15:49:01 +0800 Subject: [PATCH 54/97] gnuradioPackages.fosphor: fix build with boost 1.89 Assisted-by: Codex:gpt-5.5 --- pkgs/development/gnuradio-modules/fosphor/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/gnuradio-modules/fosphor/default.nix b/pkgs/development/gnuradio-modules/fosphor/default.nix index eafe57d57583..34fba81b1341 100644 --- a/pkgs/development/gnuradio-modules/fosphor/default.nix +++ b/pkgs/development/gnuradio-modules/fosphor/default.nix @@ -37,6 +37,12 @@ mkDerivation { }; disabled = gnuradioOlder "3.9" || gnuradioAtLeast "3.11"; + # Boost 1.89 removed the boost_system stub library. + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'COMPONENTS system chrono thread' 'COMPONENTS chrono thread' + ''; + nativeBuildInputs = [ cmake pkg-config From 7bd52a96aaf640dd19574fe6fda694e36003626f Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 31 May 2026 10:38:50 +0200 Subject: [PATCH 55/97] adguardian: 1.6.0 -> 1.6.1 Signed-off-by: Matthias Beyer --- pkgs/by-name/ad/adguardian/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ad/adguardian/package.nix b/pkgs/by-name/ad/adguardian/package.nix index 49e017f14657..4cb21d957dcd 100644 --- a/pkgs/by-name/ad/adguardian/package.nix +++ b/pkgs/by-name/ad/adguardian/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "adguardian"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "Lissy93"; repo = "AdGuardian-Term"; tag = finalAttrs.version; - hash = "sha256-WxrSmCwLnXXs5g/hN3xWE66P5n0RD/L9MJpf5N2iNtY="; + hash = "sha256-jqjdYkB48ggLsmKlwiehkGHZ6EJhJYXGuVmZH7R0MlE="; }; - cargoHash = "sha256-yPDysaslL/7N60eZ/hqZl5ZXIsof/pvlgHYfW1mIWtI="; + cargoHash = "sha256-ON3txhOQVuI3Th8FZ7yC4sd7L1fpYCD6XyIHbH5/Q4k="; meta = { description = "Terminal-based, real-time traffic monitoring and statistics for your AdGuard Home instance"; From e1dfe0bfcfa052eff00d13542890ae4a1c970142 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 31 May 2026 10:46:09 +0200 Subject: [PATCH 56/97] enlightenment.efl: enable structuredAttrs and strictDeps, modernize --- pkgs/desktops/enlightenment/efl/default.nix | 49 ++++++++++++--------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index ecf4c384c02c..c5682badc019 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -70,14 +70,19 @@ zlib, directoryListingUpdater, }: - -stdenv.mkDerivation rec { +let + inherit (lib) + mesonBool + mesonOption + ; +in +stdenv.mkDerivation (finalAttrs: { pname = "efl"; version = "1.28.1"; src = fetchurl { - url = "https://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-hM9hRfnMgr//aQAFviQ5LI88UvjgD/BNjuo3FCnAlCQ="; + url = "https://download.enlightenment.org/rel/libs/efl/efl-${finalAttrs.version}.tar.xz"; + hash = "sha256-hM9hRfnMgr//aQAFviQ5LI88UvjgD/BNjuo3FCnAlCQ="; }; nativeBuildInputs = [ @@ -159,6 +164,8 @@ stdenv.mkDerivation rec { libxcb ]; + strictDeps = true; + dontDropIconThemeCache = true; # Fix build with gcc15 (-std=gnu23) @@ -166,17 +173,17 @@ stdenv.mkDerivation rec { mesonFlags = [ "--buildtype=release" - "-D build-tests=false" # disable build tests, which are not working - "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disabled by default, scim is not available in nixpkgs - "-D embedded-lz4=false" - "-D fb=true" - "-D network-backend=connman" - "-D sdl=true" - "-D elua=true" - "-D bindings=lua,cxx" + (mesonBool "build-tests" false) # disable build tests, which are not working + (mesonOption "ecore-imf-loaders-disabler" "ibus,scim") # ibus is disabled by default, scim is not available in nixpkgs + (mesonBool "embedded-lz4" false) + (mesonBool "fb" true) + (mesonOption "network-backend" "connman") + (mesonBool "sdl" true) + (mesonBool "elua" true) + (mesonOption "bindings" "lua,cxx") # for wayland client support - "-D wl=true" - "-D drm=true" + (mesonBool "wl" true) + (mesonBool "drm" true) ]; patches = [ @@ -187,8 +194,8 @@ stdenv.mkDerivation rec { patchShebangs src/lib/elementary/config_embed # fix destination of systemd unit and dbus service - substituteInPlace systemd-services/meson.build --replace "sys_dep.get_pkgconfig_variable('systemduserunitdir')" "'$out/systemd/user'" - substituteInPlace dbus-services/meson.build --replace "dep.get_pkgconfig_variable('session_bus_services_dir')" "'$out/share/dbus-1/services'" + substituteInPlace systemd-services/meson.build --replace-fail "sys_dep.get_pkgconfig_variable('systemduserunitdir')" "'$out/systemd/user'" + substituteInPlace dbus-services/meson.build --replace-fail "dep.get_pkgconfig_variable('session_bus_services_dir')" "'$out/share/dbus-1/services'" ''; # bin/edje_cc creates $HOME/.run, which would break build of reverse dependencies. @@ -205,14 +212,14 @@ stdenv.mkDerivation rec { postInstall = '' # fix use of $out variable - substituteInPlace "$out/share/elua/core/util.lua" --replace '$out' "$out" + substituteInPlace "$out/share/elua/core/util.lua" --replace-fail '$out' "$out" rm "$out/share/elua/core/util.lua.orig" # add all module include dirs to the Cflags field in efl.pc modules=$(for i in "$out/include/"*/; do printf ' -I''${includedir}/'`basename $i`; done) substituteInPlace "$out/lib/pkgconfig/efl.pc" \ - --replace 'Cflags: -I''${includedir}/efl-1' \ - 'Cflags: -I''${includedir}/eina-1/eina'"$modules" + --replace-fail 'Cflags: -I''${includedir}/efl-1' \ + 'Cflags: -I''${includedir}/eina-1/eina'"$modules" # build icon cache gtk-update-icon-cache "$out"/share/icons/Enlightenment-X @@ -227,6 +234,8 @@ stdenv.mkDerivation rec { passthru.updateScript = directoryListingUpdater { }; + __structuredAttrs = true; + meta = { description = "Enlightenment foundation libraries"; homepage = "https://enlightenment.org/"; @@ -242,4 +251,4 @@ stdenv.mkDerivation rec { ]; teams = [ lib.teams.enlightenment ]; }; -} +}) From 243558acc5c9644b8e91739d621023007349d210 Mon Sep 17 00:00:00 2001 From: SirYwell Date: Fri, 3 Apr 2026 19:52:38 +0200 Subject: [PATCH 57/97] temurin-{,jre-}bin-26: init at 26.0.1 Co-authored-by: Matt McHenry --- .../compilers/temurin-bin/generate-sources.py | 31 ++++- .../compilers/temurin-bin/jdk-darwin.nix | 13 ++ .../compilers/temurin-bin/jdk-linux.nix | 13 ++ .../compilers/temurin-bin/sources.json | 120 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 5 files changed, 176 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index 0ebf923b1078..dd8257efb435 100755 --- a/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -2,11 +2,11 @@ #!nix-shell --pure -i python3 -p "python3.withPackages (ps: with ps; [ requests ])" import json -import re +import os import requests import sys -feature_versions = (8, 11, 17, 21, 25) +all_feature_versions = (8, 11, 17, 21, 25, 26) oses = ("mac", "linux", "alpine-linux") types = ("jre", "jdk") impls = ("hotspot",) @@ -57,7 +57,30 @@ def generate_sources(assets, feature_version, out): return out -out = {} +# Parse optional version arguments; default to all known versions. +# This is especially helpful when adding a new version without updating everything.. +if len(sys.argv) > 1: + try: + feature_versions = tuple(int(v) for v in sys.argv[1:]) + except ValueError: + print(f"usage: {sys.argv[0]} [version ...]", file=sys.stderr) + print(f" version: one or more feature version numbers, e.g. 21 25", file=sys.stderr) + sys.exit(1) + unknown = [v for v in feature_versions if v not in all_feature_versions] + if unknown: + print(f"warning: unknown feature version(s): {', '.join(str(v) for v in unknown)}", file=sys.stderr) +else: + feature_versions = all_feature_versions + +sources_path = os.path.join(os.path.dirname(__file__), "sources.json") + +# Load existing sources so unrelated versions are preserved during partial updates. +try: + with open(sources_path) as f: + out = json.load(f) +except FileNotFoundError: + out = {} + for feature_version in feature_versions: # Default user-agent is blocked by Azure WAF. headers = {'user-agent': 'nixpkgs-temurin-generate-sources/1.0.0'} @@ -68,6 +91,6 @@ for feature_version in feature_versions: sys.exit(1) generate_sources(resp.json(), f"openjdk{feature_version}", out) -with open("sources.json", "w") as f: +with open(sources_path, "w") as f: json.dump(out, f, indent=2, sort_keys=True) f.write('\n') diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix index 037f0811f3f0..d39c747f29d0 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix @@ -3,6 +3,12 @@ let sources = (lib.importJSON ./sources.json).hotspot.mac; common = opts: callPackage (import ./jdk-darwin-base.nix opts) { }; + withModernDrvAttrs = + drv: + drv.overrideAttrs (_: { + __structuredAttrs = true; + strictDeps = true; + }); in # EOL = [ "This JDK version has reached End of Life." ]; @@ -21,4 +27,11 @@ in jdk-25 = common { sourcePerArch = sources.jdk.openjdk25; }; jre-25 = common { sourcePerArch = sources.jre.openjdk25; }; + + jdk-26 = withModernDrvAttrs (common { + sourcePerArch = sources.jdk.openjdk26; + }); + jre-26 = withModernDrvAttrs (common { + sourcePerArch = sources.jre.openjdk26; + }); } diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix index 9e40a4722ce3..8e8af9fb4bce 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -8,6 +8,12 @@ let variant = if stdenv.hostPlatform.isMusl then "alpine-linux" else "linux"; sources = (lib.importJSON ./sources.json).hotspot.${variant}; common = opts: callPackage (import ./jdk-linux-base.nix opts) { }; + withModernDrvAttrs = + drv: + drv.overrideAttrs (_: { + __structuredAttrs = true; + strictDeps = true; + }); in # EOL = [ "This JDK version has reached End of Life." ]; @@ -26,4 +32,11 @@ in jdk-25 = common { sourcePerArch = sources.jdk.openjdk25; }; jre-25 = common { sourcePerArch = sources.jre.openjdk25; }; + + jdk-26 = withModernDrvAttrs (common { + sourcePerArch = sources.jdk.openjdk26; + }); + jre-26 = withModernDrvAttrs (common { + sourcePerArch = sources.jre.openjdk26; + }); } diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index 88b3850ba249..2ce2dd958db0 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -54,6 +54,22 @@ "version": "25.0.0" } }, + "openjdk26": { + "aarch64": { + "build": "8", + "sha256": "7e32b89349385f10d7805197c7696b46556717d041e681017b12590bae6692ca", + "url": "https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jdk_aarch64_alpine-linux_hotspot_26.0.1_8.tar.gz", + "version": "26.0.1" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "0c97fe7e503fb6daf36a5e86e8d083b97cc2354cda4d11288e6c3b8ec0818afc", + "url": "https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jdk_x64_alpine-linux_hotspot_26.0.1_8.tar.gz", + "version": "26.0.1" + } + }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", @@ -118,6 +134,22 @@ "version": "25.0.0" } }, + "openjdk26": { + "aarch64": { + "build": "8", + "sha256": "3106f091aad558977d890b0f6639beacd2815ea051a75a23733b3b16fee6ca55", + "url": "https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jre_aarch64_alpine-linux_hotspot_26.0.1_8.tar.gz", + "version": "26.0.1" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "d218b359f735122cadeb9cbb226c4ddff8746c46a8d5b833809aedff85bd48a6", + "url": "https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jre_x64_alpine-linux_hotspot_26.0.1_8.tar.gz", + "version": "26.0.1" + } + }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", @@ -262,6 +294,34 @@ "version": "25.0.0" } }, + "openjdk26": { + "aarch64": { + "build": "8", + "sha256": "613f9b2861dea937b24d5eca745ef8567733b377d0bb612195acaad0e3f61360", + "url": "https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jdk_aarch64_linux_hotspot_26.0.1_8.tar.gz", + "version": "26.0.1" + }, + "packageType": "jdk", + "powerpc64le": { + "build": "8", + "sha256": "60e016faf4177840430035d948f83f2887d556fe512b78c1d43b320322fe6685", + "url": "https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jdk_ppc64le_linux_hotspot_26.0.1_8.tar.gz", + "version": "26.0.1" + }, + "riscv64": { + "build": "8", + "sha256": "f1b762d6d86599627983df200f215bc970444a697159ca3fae93208756b44715", + "url": "https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jdk_riscv64_linux_hotspot_26.0.1_8.tar.gz", + "version": "26.0.1" + }, + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "8e512f13e575a43655fc92319436c94890c137b9035cc6bd6f9cf24239704d3a", + "url": "https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jdk_x64_linux_hotspot_26.0.1_8.tar.gz", + "version": "26.0.1" + } + }, "openjdk8": { "aarch64": { "build": "8", @@ -428,6 +488,34 @@ "version": "25.0.0" } }, + "openjdk26": { + "aarch64": { + "build": "8", + "sha256": "bf5f733066599065de5e720edda550b39d85876f5bf23a94fee2cb6a8379cb36", + "url": "https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jre_aarch64_linux_hotspot_26.0.1_8.tar.gz", + "version": "26.0.1" + }, + "packageType": "jre", + "powerpc64le": { + "build": "8", + "sha256": "d8f66903603c3661c0d8c03de41b76459260ed2e295ba874bb7b3f37a012c026", + "url": "https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jre_ppc64le_linux_hotspot_26.0.1_8.tar.gz", + "version": "26.0.1" + }, + "riscv64": { + "build": "8", + "sha256": "277d00ea87cf0ec0ede6736007b2fb44432fac754613df4649e61f385beb55f0", + "url": "https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jre_riscv64_linux_hotspot_26.0.1_8.tar.gz", + "version": "26.0.1" + }, + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "2e90cf68d31b28553fb2c8202d5a4c3a5e99a60285e125dc28c94ba5fb2ac1ef", + "url": "https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jre_x64_linux_hotspot_26.0.1_8.tar.gz", + "version": "26.0.1" + } + }, "openjdk8": { "aarch64": { "build": "8", @@ -530,6 +618,22 @@ "version": "25.0.0" } }, + "openjdk26": { + "aarch64": { + "build": "8", + "sha256": "10c436258e24693ce8baf13dbffce98b77275797455e8b72510967547f13234a", + "url": "https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jdk_aarch64_mac_hotspot_26.0.1_8.tar.gz", + "version": "26.0.1" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "032df492c8749864ee8b135e3d0ea5a17ef5c847309d5fdf8f1dd55e246b8319", + "url": "https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jdk_x64_mac_hotspot_26.0.1_8.tar.gz", + "version": "26.0.1" + } + }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", @@ -606,6 +710,22 @@ "version": "25.0.0" } }, + "openjdk26": { + "aarch64": { + "build": "8", + "sha256": "ae27bc97ad353fe910df1b50ca989146561260c00762d65a797682068275dec9", + "url": "https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jre_aarch64_mac_hotspot_26.0.1_8.tar.gz", + "version": "26.0.1" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "8", + "sha256": "c717204061632d41439e5197a36f26cbfe7695fe1161bcf12d613394cafdae3a", + "url": "https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jre_x64_mac_hotspot_26.0.1_8.tar.gz", + "version": "26.0.1" + } + }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 033bc0eac052..b1d08af9433f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3740,6 +3740,9 @@ with pkgs; powerline = with python3Packages; toPythonApplication powerline; ### DEVELOPMENT / COMPILERS + temurin-bin-26 = javaPackages.compiler.temurin-bin.jdk-26; + temurin-jre-bin-26 = javaPackages.compiler.temurin-bin.jre-26; + temurin-bin-25 = javaPackages.compiler.temurin-bin.jdk-25; temurin-jre-bin-25 = javaPackages.compiler.temurin-bin.jre-25; From 7ab05e15d802550aaeb919bc5d2715c08ca860a7 Mon Sep 17 00:00:00 2001 From: isabel Date: Sun, 31 May 2026 10:14:32 +0100 Subject: [PATCH 58/97] httpfs2: drop --- pkgs/by-name/ht/httpfs2/package.nix | 54 ----------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 pkgs/by-name/ht/httpfs2/package.nix diff --git a/pkgs/by-name/ht/httpfs2/package.nix b/pkgs/by-name/ht/httpfs2/package.nix deleted file mode 100644 index 68c050793a5c..000000000000 --- a/pkgs/by-name/ht/httpfs2/package.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - fetchurl, - lib, - stdenv, - pkg-config, - fuse, - openssl, - asciidoc, - docbook_xml_dtd_45, - docbook_xsl, - libxml2, - libxslt, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "httpfs2"; - version = "0.1.5"; - - src = fetchurl { - url = "mirror://sourceforge/httpfs/httpfs2/httpfs2-${finalAttrs.version}.tar.gz"; - sha256 = "1h8ggvhw30n2r6w11n1s458ypggdqx6ldwd61ma4yd7binrlpjq1"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - fuse - openssl - asciidoc - docbook_xml_dtd_45 - docbook_xsl - libxml2 - libxslt - ]; - - installPhase = '' - mkdir -p "$out/bin" - cp -v httpfs2 "$out/bin" - - mkdir -p "$out/share/man/man1" - cp -v *.1 "$out/share/man/man1" - ''; - - meta = { - description = "FUSE-based HTTP filesystem for Linux"; - mainProgram = "httpfs2"; - - homepage = "https://httpfs.sourceforge.net/"; - - license = lib.licenses.gpl2Plus; - - platforms = lib.platforms.unix; - maintainers = [ ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c3abc83ee188..881ae4f0c7e5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -963,6 +963,7 @@ mapAliases { hspellDicts = throw "'hspellDicts' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 http-prompt = throw "'http-prompt' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-26 httperf = throw "'httperf' has been removed as it was unmaintained and broken"; # Added 2026-05-04 + httpfs2 = throw "'httpfs2' has been removed as it was unmaintained upstream"; # Added 2026-05-31 httplz = throw "'httplz' has been removed as it was unmaintained upstream"; # Added 2026-04-25 hubicfuse = throw "'hubicfuse' has been removed as the hubic service was discontinued and the project is unmaintained upstream"; # Added 2026-05-08 hydra_unstable = throw "'hydra_unstable' has been renamed to/replaced by 'hydra'"; # Converted to throw 2025-10-27 From cd3331e83ccc49b5671abc91051ff1ffa6cc5f5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 May 2026 09:52:41 +0000 Subject: [PATCH 59/97] mieru: 3.31.0 -> 3.33.0 --- pkgs/by-name/mi/mieru/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix index 98e2fea15628..d2bc17ed4ad6 100644 --- a/pkgs/by-name/mi/mieru/package.nix +++ b/pkgs/by-name/mi/mieru/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "mieru"; - version = "3.31.0"; + version = "3.33.0"; src = fetchFromGitHub { owner = "enfein"; repo = "mieru"; rev = "v${finalAttrs.version}"; - hash = "sha256-jiu0q8S7Ab73S8adE6GgoCvkBhimGmF3wPQZj9L6dV8="; + hash = "sha256-26BT/OsA4T6S9xqlux/segQXtqWGR+IgCRG/PwuxquU="; }; vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM="; From dcf839583017a638192a9cedae411d1432acc65f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 31 May 2026 12:32:53 +0200 Subject: [PATCH 60/97] servo: 0.1.0 -> 0.2.0 https://github.com/servo/servo/releases/tag/v0.2.0 https://servo.org/blog/2026/05/31/april-in-servo/ --- pkgs/by-name/se/servo/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index 5bc40b4f28e4..1dc10fc3c775 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -69,13 +69,13 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "servo"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "servo"; repo = "servo"; tag = "v${finalAttrs.version}"; - hash = "sha256-DnjtKizYwadBYDqafFDuE/DRIjCqnK/L95zV0Fv0Xhc="; + hash = "sha256-zZitnAiexoroKx3TMu3sB0KDvIsBcT7Krwa6lJqY4yw="; # Breaks reproducibility depending on whether the picked commit # has other ref-names or not, which may change over time, i.e. with # "ref-names: HEAD -> main" as long this commit is the branch HEAD @@ -85,7 +85,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; }; - cargoHash = "sha256-TJXWscTnsXxaWTfn7BugVMPamXOsyHXQhJskX04X7Zw="; + cargoHash = "sha256-hZBI3Vte/FvN7qJy2VGF0LVQIFSWa931BFFbaUfN814="; # set `HOME` to a temp dir for write access # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328) @@ -171,6 +171,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { # undefined libmozjs_sys symbols during linking broken = stdenv.hostPlatform.isDarwin; + changelog = "https://github.com/servo/servo/releases/tag/${finalAttrs.src.tag}"; description = "Embeddable, independent, memory-safe, modular, parallel web rendering engine"; homepage = "https://servo.org"; license = lib.licenses.mpl20; From 2a80cb209ed8a9d0b3a18d03ff3b6185e8bf93cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 May 2026 11:09:03 +0000 Subject: [PATCH 61/97] sdl_gamecontrollerdb: 0-unstable-2026-05-12 -> 0-unstable-2026-05-28 --- pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix index 2a5af425585d..9b0be766898d 100644 --- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix +++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sdl_gamecontrollerdb"; - version = "0-unstable-2026-05-12"; + version = "0-unstable-2026-05-28"; src = fetchFromGitHub { owner = "mdqinc"; repo = "SDL_GameControllerDB"; - rev = "7988b5e84c31616200ee2ffd2347386c6b3165a8"; - hash = "sha256-Jwa+YJcEy+6Ye0ILttv5iAmJ9t0mIk8e5XXEuA1nFjE="; + rev = "cbdb3678270cf5bf14a127934fd7ab332ecd3cbc"; + hash = "sha256-bjsss+ifkCqJKzirqbBS5PtD80fG9JPY6yPiHsf9DO8="; }; dontBuild = true; From 5afb67bdacbdcd8cf32b366eea6c0c96e16ab492 Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Sun, 31 May 2026 00:21:11 +0200 Subject: [PATCH 62/97] minizip-ng: add structuredAttrs and strictDeps --- pkgs/by-name/mi/minizip-ng/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/minizip-ng/package.nix b/pkgs/by-name/mi/minizip-ng/package.nix index 811fa61093be..cb9dd6fa5943 100644 --- a/pkgs/by-name/mi/minizip-ng/package.nix +++ b/pkgs/by-name/mi/minizip-ng/package.nix @@ -65,9 +65,12 @@ stdenv.mkDerivation (finalAttrs: { ''; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - nativeCheckInputs = [ gtest ]; + checkInputs = [ gtest ]; enableParallelChecking = false; + strictDeps = true; + __structuredAttrs = true; + meta = { description = "Fork of the popular zip manipulation library found in the zlib distribution"; homepage = "https://github.com/zlib-ng/minizip-ng"; From d3a32f77d5029939b709536c4be8ed82f5511d71 Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Sun, 31 May 2026 00:22:21 +0200 Subject: [PATCH 63/97] minizip-ng{-compat}: split compat --- pkgs/by-name/mi/minizip-ng-compat/package.nix | 6 ++++++ pkgs/by-name/mi/minizip-ng/package.nix | 17 +++-------------- 2 files changed, 9 insertions(+), 14 deletions(-) create mode 100644 pkgs/by-name/mi/minizip-ng-compat/package.nix diff --git a/pkgs/by-name/mi/minizip-ng-compat/package.nix b/pkgs/by-name/mi/minizip-ng-compat/package.nix new file mode 100644 index 000000000000..22d06bcc1322 --- /dev/null +++ b/pkgs/by-name/mi/minizip-ng-compat/package.nix @@ -0,0 +1,6 @@ +{ + minizip-ng, +}: +minizip-ng.override { + enableCompat = true; +} diff --git a/pkgs/by-name/mi/minizip-ng/package.nix b/pkgs/by-name/mi/minizip-ng/package.nix index cb9dd6fa5943..a92beb320e15 100644 --- a/pkgs/by-name/mi/minizip-ng/package.nix +++ b/pkgs/by-name/mi/minizip-ng/package.nix @@ -10,10 +10,11 @@ xz, zstd, openssl, + enableCompat ? false, }: stdenv.mkDerivation (finalAttrs: { - pname = "minizip-ng"; + pname = "minizip-ng" + lib.optionalString enableCompat "-compat"; version = "4.2.1"; src = fetchFromGitHub { @@ -43,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "MZ_LIBCOMP" false) # builds only on Darwin by default where it fails due to mising headers (lib.cmakeBool "MZ_BUILD_TESTS" finalAttrs.doCheck) (lib.cmakeBool "MZ_BUILD_UNIT_TESTS" finalAttrs.doCheck) - (lib.cmakeFeature "MZ_LIB_SUFFIX" "-ng") + (lib.cmakeBool "MZ_COMPAT" enableCompat) ] ++ lib.optionals stdenv.hostPlatform.isi686 [ # tests fail @@ -52,18 +53,6 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-register"; - postInstall = '' - # make lib findable as libminizip-ng even if compat is enabled - for ext in so dylib a ; do - if [ -e $out/lib/libminizip.$ext ] && [ ! -e $out/lib/libminizip-ng.$ext ]; then - ln -s $out/lib/libminizip.$ext $out/lib/libminizip-ng.$ext - fi - done - if [ ! -e $out/include/minizip-ng ]; then - ln -s $out/include $out/include/minizip-ng - fi - ''; - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkInputs = [ gtest ]; enableParallelChecking = false; From edcd4f4efbd69d035ccc1a7b58dc55135128242d Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Sun, 31 May 2026 00:22:58 +0200 Subject: [PATCH 64/97] minizip-ng{-compat}: add kuflierl as maintainer --- pkgs/by-name/mi/minizip-ng/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/mi/minizip-ng/package.nix b/pkgs/by-name/mi/minizip-ng/package.nix index a92beb320e15..63a7a152f7bb 100644 --- a/pkgs/by-name/mi/minizip-ng/package.nix +++ b/pkgs/by-name/mi/minizip-ng/package.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.zlib; maintainers = with lib.maintainers; [ ris + kuflierl ]; platforms = lib.platforms.unix; }; From ba7c92dbd89d2f3a5bd637d9f2f30171212a1bee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 May 2026 11:13:28 +0000 Subject: [PATCH 65/97] kloak: 0.8.3-1 -> 0.8.5-1 --- pkgs/by-name/kl/kloak/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/kl/kloak/package.nix b/pkgs/by-name/kl/kloak/package.nix index 077ec4a476a1..38475a6f9757 100644 --- a/pkgs/by-name/kl/kloak/package.nix +++ b/pkgs/by-name/kl/kloak/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "kloak"; - version = "0.8.3-1"; + version = "0.8.5-1"; src = fetchFromGitHub { owner = "Whonix"; repo = "kloak"; tag = finalAttrs.version; - hash = "sha256-s+ZntlsEuS9Wv8govXtgyBfHwruTvZJzQP++eR6z9V0="; + hash = "sha256-fDmqA00b5ESS9LW2QIeEx3wWb0lhgkqoBYcw1XYDI7k="; }; strictDeps = true; From 710c91cc204df5ee1e292d6fcae3983ad3d54691 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 31 May 2026 13:22:35 +0200 Subject: [PATCH 66/97] babl: enable strictDeps and structuredAttrs --- pkgs/by-name/ba/babl/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ba/babl/package.nix b/pkgs/by-name/ba/babl/package.nix index 75fe2176ff4c..7bf1420226bf 100644 --- a/pkgs/by-name/ba/babl/package.nix +++ b/pkgs/by-name/ba/babl/package.nix @@ -31,6 +31,10 @@ stdenv.mkDerivation (finalAttrs: { ./dev-prefix.patch ]; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja @@ -44,6 +48,8 @@ stdenv.mkDerivation (finalAttrs: { lcms2 ]; + strictDeps = true; + mesonFlags = [ "-Dprefix-dev=${placeholder "dev"}" # On Linux, this would be disabled by default but we have -Dauto_features=enabled. @@ -61,6 +67,8 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/doc" "$devdoc" ''; + __structuredAttrs = true; + meta = { description = "Image pixel format conversion library"; mainProgram = "babl"; From 8d818d67f78aca4a4fd095772148b19ae00e5e1f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 31 May 2026 13:42:18 +0200 Subject: [PATCH 67/97] home-assistant: choose caldav_2 in component updater --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/update-component-packages.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 4f36bf596988..59d5b1d9f26b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -868,7 +868,7 @@ ]; "caldav" = ps: with ps; [ - caldav + caldav_2 icalendar vobject ]; diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py index 484333b1fdfa..d45eabd0b1b7 100755 --- a/pkgs/servers/home-assistant/update-component-packages.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -40,6 +40,7 @@ PKG_SET = "home-assistant.python.pkgs" # following can be used to choose the correct one PKG_PREFERENCES = { "av": "av", + "caldav": "caldav_2", "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 "fints": "fints", "HAP-python": "hap-python", From e16200dfea4c28e7f119710e9008c7d0132e8146 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 May 2026 11:42:44 +0000 Subject: [PATCH 68/97] rsonpath: 0.10.0 -> 0.10.1 --- pkgs/by-name/rs/rsonpath/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rs/rsonpath/package.nix b/pkgs/by-name/rs/rsonpath/package.nix index 29caa39b2f52..f4e49b6d6336 100644 --- a/pkgs/by-name/rs/rsonpath/package.nix +++ b/pkgs/by-name/rs/rsonpath/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rsonpath"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "rsonquery"; repo = "rsonpath"; tag = "v${finalAttrs.version}"; - hash = "sha256-Lh58U5A4EeD+tQ3CZNE7YabwGIJ14Cv5dqbJ64JYNDk="; + hash = "sha256-pgKqVDDaJ8vcDOp0FuuuBkShQDFP3x6BVS7x8ZZawAY="; }; - cargoHash = "sha256-w1AODL95+O0jhzXvNrL9I+i2+jcZX3SvJDKrLWkI7c8="; + cargoHash = "sha256-PC35k3vwKP55VKZt1txKVajhfrJpFiEgJYA4lNe/U7U="; cargoBuildFlags = [ "-p=rsonpath" ]; cargoTestFlags = finalAttrs.cargoBuildFlags; From 05c5c4ff327fe6945203f59e82af3748fb1f47e1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 31 May 2026 13:26:15 +0200 Subject: [PATCH 69/97] home-assistant: construct package set with overrideScope No direct access to the unspliced `python.pkgs` any more, which should improve cross compat. --- .../home-automation/home-assistant.nix | 1 - .../build-custom-component/default.nix | 9 +++-- .../manifest-requirements-check-hook.nix | 4 +- .../custom-components/README.md | 2 +- .../custom-components/frigate/package.nix | 4 +- .../custom-components/moonraker/package.nix | 2 +- .../custom-components/powercalc/package.nix | 2 +- .../yandex-station/package.nix | 2 +- pkgs/servers/home-assistant/default.nix | 37 ++++++++++--------- pkgs/servers/home-assistant/stubs.nix | 2 +- pkgs/servers/home-assistant/tests.nix | 6 +-- .../update-component-packages.py | 2 +- pkgs/top-level/all-packages.nix | 2 +- 13 files changed, 38 insertions(+), 37 deletions(-) diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 2cebb908bd09..687128b81f4e 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -30,7 +30,6 @@ let mapAttrsToList mergeAttrsList mkEnableOption - mkDefault mkIf mkMerge mkOption diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix index 34fb0b24addb..92fd9093eb9d 100644 --- a/pkgs/servers/home-assistant/build-custom-component/default.nix +++ b/pkgs/servers/home-assistant/build-custom-component/default.nix @@ -6,14 +6,15 @@ }: let + inherit (home-assistant) python3Packages; + manifestRequirementsCheckHook = import ./manifest-requirements-check-hook.nix { - inherit lib makeSetupHook; - inherit (home-assistant) python; + inherit lib makeSetupHook python3Packages; }; in lib.extendMkDerivation { - constructDrv = home-assistant.python.pkgs.buildPythonPackage; + constructDrv = python3Packages.buildPythonPackage; excludeDrvArgNames = [ "meta" "nativeBuildInputs" @@ -52,7 +53,7 @@ lib.extendMkDerivation { ''; nativeBuildInputs = - with home-assistant.python.pkgs; + with home-assistant.python3Packages; [ manifestRequirementsCheckHook packaging diff --git a/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix b/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix index 91cf7fb53f4b..bb091bd0e1b4 100644 --- a/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix +++ b/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix @@ -1,13 +1,13 @@ { lib, - python, + python3Packages, makeSetupHook, }: makeSetupHook { name = "manifest-check-hook"; substitutions = { - pythonCheckInterpreter = python.interpreter; + pythonCheckInterpreter = python3Packages.python.interpreter; checkManifest = ./check_manifest.py; }; meta.license = lib.licenses.mit; diff --git a/pkgs/servers/home-assistant/custom-components/README.md b/pkgs/servers/home-assistant/custom-components/README.md index 7000d17c477c..b8b1fed85764 100644 --- a/pkgs/servers/home-assistant/custom-components/README.md +++ b/pkgs/servers/home-assistant/custom-components/README.md @@ -12,7 +12,7 @@ function arguments. Pass them into `dependencies` for them to be available to Home Assistant. Out-of-tree components need to use Python packages from -`home-assistant.python.pkgs` as to not introduce conflicting package +`home-assistant.python3Pacakges` as to not introduce conflicting package versions into the Python environment. diff --git a/pkgs/servers/home-assistant/custom-components/frigate/package.nix b/pkgs/servers/home-assistant/custom-components/frigate/package.nix index d2c28378a335..72a8a23c2e98 100644 --- a/pkgs/servers/home-assistant/custom-components/frigate/package.nix +++ b/pkgs/servers/home-assistant/custom-components/frigate/package.nix @@ -48,8 +48,8 @@ buildHomeAssistantComponent rec { pytest-timeout pytestCheckHook ] - ++ (homeassistant.getPackages "mqtt" homeassistant.python.pkgs) - ++ (homeassistant.getPackages "stream" homeassistant.python.pkgs); + ++ (homeassistant.getPackages "mqtt" homeassistant.python3Packages) + ++ (homeassistant.getPackages "stream" homeassistant.python3Packages); disabledTests = [ # https://github.com/blakeblackshear/frigate-hass-integration/issues/922 diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix index 2c013f73fb99..c9f8fb84a1fd 100644 --- a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix +++ b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix @@ -32,7 +32,7 @@ buildHomeAssistantComponent rec { pytest-cov-stub pytestCheckHook ] - ++ home-assistant.getPackages "camera" home-assistant.python.pkgs; + ++ home-assistant.getPackages "camera" home-assistant.python3Packages; disabledTests = [ # tests try to open sockets diff --git a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix index b3b4fb99e2d4..4a13ef623d24 100644 --- a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix +++ b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix @@ -43,7 +43,7 @@ buildHomeAssistantComponent rec { aioresponses pytest-freezegun ] - ++ home-assistant.getPackages "camera" home-assistant.python.pkgs; + ++ home-assistant.getPackages "camera" home-assistant.python3Packages; preCheck = '' patchShebangs --build tests/setup.sh diff --git a/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix b/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix index e27df2137651..e0184650f843 100644 --- a/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix +++ b/pkgs/servers/home-assistant/custom-components/yandex-station/package.nix @@ -36,7 +36,7 @@ buildHomeAssistantComponent rec { home-assistant pytestCheckHook ] - ++ (home-assistant.getPackages "stream" home-assistant.python.pkgs); + ++ (home-assistant.getPackages "stream" home-assistant.python3Packages); meta = { changelog = "https://github.com/AlexxIT/YandexStation/releases/tag/${src.tag}"; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ec971815ffd5..7ebbc8cc459e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, fetchPypi, fetchpatch, - python314, + python314Packages, replaceVars, ffmpeg-headless, inetutils, @@ -246,10 +246,9 @@ let }) ]; - python = python314.override { - self = python; - packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]); - }; + python3Packages = python314Packages.overrideScope ( + final: prev: lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]) final prev + ); componentPackages = import ./component-packages.nix; @@ -259,16 +258,18 @@ let getPackages = component: componentPackages.components.${component}; - componentBuildInputs = lib.concatMap (component: getPackages component python.pkgs) extraComponents; + componentBuildInputs = lib.concatMap ( + component: getPackages component python3Packages + ) extraComponents; # Ensure that we are using a consistent package set - extraBuildInputs = extraPackages python.pkgs; + extraBuildInputs = extraPackages python3Packages; # Don't forget to run update-component-packages.py after updating hassVersion = "2026.5.4"; in -python.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "homeassistant"; version = assert (componentPackages.version == hassVersion); @@ -276,7 +277,7 @@ python.pkgs.buildPythonApplication rec { pyproject = true; # check REQUIRED_PYTHON_VER in homeassistant/const.py - disabled = python.pythonOlder "3.14"; + disabled = python3Packages.pythonOlder "3.14"; # don't try and fail to strip 6600+ python files, it takes minutes! dontStrip = true; @@ -295,7 +296,7 @@ python.pkgs.buildPythonApplication rec { hash = "sha256-o5S6rnOTqzPLZpMBxgmp9IpmLlEHLvHTH68ql2EkVbI="; }; - build-system = with python.pkgs; [ + build-system = with python3Packages; [ setuptools ]; @@ -347,7 +348,7 @@ python.pkgs.buildPythonApplication rec { "uv" ]; - dependencies = with python.pkgs; [ + dependencies = with python3Packages; [ # Mirror what gets installed for Home Assistant Container, which means # installing what is in requirements.txt. The PEP517 specification gets # embedded in wheel metadata but only represents a subset. @@ -421,7 +422,7 @@ python.pkgs.buildPythonApplication rec { # upstream only tests on Linux, so do we. doCheck = stdenv.hostPlatform.isLinux; - requirementsTest = with python.pkgs; [ + requirementsTest = with python3Packages; [ # test infrastructure (selectively from requirement_test.txt) freezegun pytest-asyncio @@ -440,7 +441,7 @@ python.pkgs.buildPythonApplication rec { nativeCheckInputs = requirementsTest ++ [ versionCheckHook ] - ++ (with python.pkgs; [ + ++ (with python3Packages; [ # Used in tests/non_packaged_scripts/test_alexa_locales.py beautifulsoup4 # Used in tests/scripts/test_check_config.py @@ -448,7 +449,7 @@ python.pkgs.buildPythonApplication rec { # Used in tests/helpers/test_httpx_client.py h2 ]) - ++ lib.concatMap (component: getPackages component python.pkgs) [ + ++ lib.concatMap (component: getPackages component python3Packages) [ # some components are needed even if tests in tests/components are disabled "frontend" "hue" @@ -506,12 +507,12 @@ python.pkgs.buildPythonApplication rec { availableComponents extraComponents getPackages - python + python3Packages supportedComponentsWithTests ; - pythonPath = python.pkgs.makePythonPath (componentBuildInputs ++ extraBuildInputs); - frontend = python.pkgs.home-assistant-frontend; - intents = python.pkgs.home-assistant-intents; + pythonPath = python3Packages.makePythonPath (componentBuildInputs ++ extraBuildInputs); + frontend = python3Packages.home-assistant-frontend; + intents = python3Packages.home-assistant-intents; tests = { nixos = nixosTests.home-assistant; components = callPackage ./tests.nix { }; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index b91aba91147f..7273bc2de63a 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "2026.5.4"; pyproject = true; - disabled = python.version != home-assistant.python.version; + disabled = python.version != home-assistant.python3Packages.python.version; src = fetchFromGitHub { owner = "KapJI"; diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index c1c60a74c2d8..1c413a38b2a1 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -5,11 +5,11 @@ }: let - getComponentDeps = component: home-assistant.getPackages component home-assistant.python.pkgs; + getComponentDeps = component: home-assistant.getPackages component home-assistant.python3Packages; inherit (lib) concatMap; # some components' tests have additional dependencies - extraCheckInputs = with home-assistant.python.pkgs; { + extraCheckInputs = with home-assistant.python3Packages; { alexa = concatMap getComponentDeps [ "cloud" "frontend" @@ -185,7 +185,7 @@ lib.listToAttrs ( nativeCheckInputs = old.requirementsTest - ++ home-assistant.getPackages component home-assistant.python.pkgs + ++ home-assistant.getPackages component home-assistant.python3Packages ++ extraCheckInputs.${component} or [ ]; disabledTests = extraDisabledTests.${component} or [ ]; diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py index 484333b1fdfa..83cffd855342 100755 --- a/pkgs/servers/home-assistant/update-component-packages.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -34,7 +34,7 @@ from rich.console import Console from rich.table import Table COMPONENT_PREFIX = "homeassistant.components" -PKG_SET = "home-assistant.python.pkgs" +PKG_SET = "home-assistant.python3Packages" # If some requirements are matched by multiple or no Python packages, the # following can be used to choose the correct one diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8e2d1280902..02a360aa1034 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7727,7 +7727,7 @@ with pkgs; lib.makeExtensible ( self: lib.packagesFromDirectoryRecursive { - inherit (home-assistant.python.pkgs) callPackage; + inherit (home-assistant.python3Packages) callPackage; directory = ../servers/home-assistant/custom-components; } ) From 761d74ba172d7e3cf64f0543ce709319557f8518 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 31 May 2026 13:27:39 +0200 Subject: [PATCH 70/97] Revert "python3Packages.aioesphomeapi: 44.23.0 -> 45.0.2" This reverts commit bb16cb2b03a50418806990c8b2633b00df72c568. Breaking API changes that are not compatible with Home Assistant 2026.5.4. --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 4206059e92cc..68331992f98a 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,14 +26,14 @@ buildPythonPackage (finalAttrs: { pname = "aioesphomeapi"; - version = "45.0.2"; + version = "44.23.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "aioesphomeapi"; tag = "v${finalAttrs.version}"; - hash = "sha256-ajucVk5yF0akOIfBX28sjOndpmHQumJBUp5jnq//B+M="; + hash = "sha256-mKk4NO44mVTV5Fe8oDhQYcNp8V1OLsPt4xk+kztXwrM="; }; postPatch = '' From 5366dabecfaa57d131900918b79435f226fae038 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sun, 3 May 2026 22:34:51 +0300 Subject: [PATCH 71/97] python2-packages: cleanup disabled attrs --- pkgs/top-level/python2-packages.nix | 54 ----------------------------- 1 file changed, 54 deletions(-) diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 8784cb32b65a..36b6823a2d73 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -7,65 +7,11 @@ self: super: with self; with super; { - attrs = disabled super.attrs; - bootstrapped-pip = toPythonModule (callPackage ../development/python2-modules/bootstrapped-pip { }); - cffi = disabled super.cffi; - - configparser = disabled super.configparser; - - contextlib2 = disabled super.contextlib2; - - coverage = disabled super.coverage; - - filelock = disabled super.filelock; - - hypothesis = disabled super.hypothesis; - - importlib-metadata = disabled super.importlib-metadata; - - jinja2 = disabled super.jinja2; - - markupsafe = disabled super.markupsafe; - - mock = disabled super.mock; - - more-itertools = disabled super.more-itertools; - - ninja = disabled super.ninja; - - packaging = disabled super.packaging; - pip = callPackage ../development/python2-modules/pip { }; - pluggy = disabled super.pluggy; - - pycairo = disabled super.pycairo; - - pyparsing = disabled super.pyparsing; - - pytest = disabled super.pytest; - - pytest_4 = disabled super.pytest; - - pytest-xdist = disabled super.pytest-xdist; - - recoll = disabled super.recoll; - - rivet = disabled super.rivet; - - rpm = disabled super.rpm; - setuptools = callPackage ../development/python2-modules/setuptools { }; - six = disabled super.six; - - wcwidth = disabled super.wcwidth; - wheel = callPackage ../development/python2-modules/wheel { }; - - zeek = disabled super.zeek; - - zipp = disabled super.zipp; } From 2c87389c6f0d2833697834ea1a2003161562f12d Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sun, 3 May 2026 22:43:42 +0300 Subject: [PATCH 72/97] python2-packages: move into resholve --- .../interpreters/python/passthrufun.nix | 2 +- .../resholve}/python2-modules/README.md | 0 .../bootstrapped-pip/default.nix | 0 .../resholve}/python2-modules/pip/default.nix | 0 .../python2-modules/setuptools/default.nix | 0 .../python2-modules/setuptools/tag-date.patch | 0 .../0001-tests-Rename-a-a-o-_-.py-_-.py.patch | 0 .../resholve}/python2-modules/wheel/default.nix | 0 .../misc/resholve/python2-packages.nix | 17 +++++++++++++++++ pkgs/top-level/python2-packages.nix | 17 ----------------- 10 files changed, 18 insertions(+), 18 deletions(-) rename pkgs/development/{ => misc/resholve}/python2-modules/README.md (100%) rename pkgs/development/{ => misc/resholve}/python2-modules/bootstrapped-pip/default.nix (100%) rename pkgs/development/{ => misc/resholve}/python2-modules/pip/default.nix (100%) rename pkgs/development/{ => misc/resholve}/python2-modules/setuptools/default.nix (100%) rename pkgs/development/{ => misc/resholve}/python2-modules/setuptools/tag-date.patch (100%) rename pkgs/development/{ => misc/resholve}/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch (100%) rename pkgs/development/{ => misc/resholve}/python2-modules/wheel/default.nix (100%) create mode 100644 pkgs/development/misc/resholve/python2-packages.nix delete mode 100644 pkgs/top-level/python2-packages.nix diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix index e302e9b6bdc0..1bb120cb8165 100644 --- a/pkgs/development/interpreters/python/passthrufun.nix +++ b/pkgs/development/interpreters/python/passthrufun.nix @@ -79,7 +79,7 @@ let keep = self: hooks self { }; optionalExtensions = cond: as: lib.optionals cond as; pythonExtension = import ../../../top-level/python-packages.nix; - python2Extension = import ../../../top-level/python2-packages.nix; + python2Extension = import ../../misc/resholve/python2-packages.nix; extensions = lib.composeManyExtensions ( [ hooks diff --git a/pkgs/development/python2-modules/README.md b/pkgs/development/misc/resholve/python2-modules/README.md similarity index 100% rename from pkgs/development/python2-modules/README.md rename to pkgs/development/misc/resholve/python2-modules/README.md diff --git a/pkgs/development/python2-modules/bootstrapped-pip/default.nix b/pkgs/development/misc/resholve/python2-modules/bootstrapped-pip/default.nix similarity index 100% rename from pkgs/development/python2-modules/bootstrapped-pip/default.nix rename to pkgs/development/misc/resholve/python2-modules/bootstrapped-pip/default.nix diff --git a/pkgs/development/python2-modules/pip/default.nix b/pkgs/development/misc/resholve/python2-modules/pip/default.nix similarity index 100% rename from pkgs/development/python2-modules/pip/default.nix rename to pkgs/development/misc/resholve/python2-modules/pip/default.nix diff --git a/pkgs/development/python2-modules/setuptools/default.nix b/pkgs/development/misc/resholve/python2-modules/setuptools/default.nix similarity index 100% rename from pkgs/development/python2-modules/setuptools/default.nix rename to pkgs/development/misc/resholve/python2-modules/setuptools/default.nix diff --git a/pkgs/development/python2-modules/setuptools/tag-date.patch b/pkgs/development/misc/resholve/python2-modules/setuptools/tag-date.patch similarity index 100% rename from pkgs/development/python2-modules/setuptools/tag-date.patch rename to pkgs/development/misc/resholve/python2-modules/setuptools/tag-date.patch diff --git a/pkgs/development/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch b/pkgs/development/misc/resholve/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch similarity index 100% rename from pkgs/development/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch rename to pkgs/development/misc/resholve/python2-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch diff --git a/pkgs/development/python2-modules/wheel/default.nix b/pkgs/development/misc/resholve/python2-modules/wheel/default.nix similarity index 100% rename from pkgs/development/python2-modules/wheel/default.nix rename to pkgs/development/misc/resholve/python2-modules/wheel/default.nix diff --git a/pkgs/development/misc/resholve/python2-packages.nix b/pkgs/development/misc/resholve/python2-packages.nix new file mode 100644 index 000000000000..733e6cadd7c3 --- /dev/null +++ b/pkgs/development/misc/resholve/python2-packages.nix @@ -0,0 +1,17 @@ +# Extension with Python 2 packages that is overlaid on top +# of the Python 3 packages set. This way, Python 2+3 compatible +# packages can still be used. + +self: super: + +with self; +with super; +{ + bootstrapped-pip = toPythonModule (callPackage ./python2-modules/bootstrapped-pip { }); + + pip = callPackage ./python2-modules/pip { }; + + setuptools = callPackage ./python2-modules/setuptools { }; + + wheel = callPackage ./python2-modules/wheel { }; +} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix deleted file mode 100644 index 36b6823a2d73..000000000000 --- a/pkgs/top-level/python2-packages.nix +++ /dev/null @@ -1,17 +0,0 @@ -# Extension with Python 2 packages that is overlaid on top -# of the Python 3 packages set. This way, Python 2+3 compatible -# packages can still be used. - -self: super: - -with self; -with super; -{ - bootstrapped-pip = toPythonModule (callPackage ../development/python2-modules/bootstrapped-pip { }); - - pip = callPackage ../development/python2-modules/pip { }; - - setuptools = callPackage ../development/python2-modules/setuptools { }; - - wheel = callPackage ../development/python2-modules/wheel { }; -} From a86349645374aba9d6772057af03fa9fe94e4d32 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sun, 3 May 2026 22:54:26 +0300 Subject: [PATCH 73/97] resholve: move python27 into its own file --- pkgs/development/misc/resholve/default.nix | 28 +------------ pkgs/development/misc/resholve/deps.nix | 6 +-- pkgs/development/misc/resholve/oildev.nix | 4 +- pkgs/development/misc/resholve/python27.nix | 45 +++++++++++++++++++++ pkgs/development/misc/resholve/resholve.nix | 5 ++- pkgs/development/misc/resholve/test.nix | 1 - 6 files changed, 55 insertions(+), 34 deletions(-) create mode 100644 pkgs/development/misc/resholve/python27.nix diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix index a8061d19fe0d..3e790cb3983b 100644 --- a/pkgs/development/misc/resholve/default.nix +++ b/pkgs/development/misc/resholve/default.nix @@ -12,33 +12,7 @@ let knownVulnerabilities = [ ]; }; }); - # We are removing `meta.knownVulnerabilities` from `python27`, - # and setting it in `resholve` itself. - python27' = (removeKnownVulnerabilities pkgsBuildHost.python27).override { - self = python27'; - pkgsBuildHost = pkgsBuildHost // { - python27 = python27'; - }; - # strip down that python version as much as possible - openssl = null; - bzip2 = null; - readline = null; - ncurses = null; - gdbm = null; - sqlite = null; - rebuildBytecode = false; - stripBytecode = true; - strip2to3 = true; - stripConfig = true; - stripIdlelib = true; - stripTests = true; - enableOptimizations = false; - packageOverrides = final: prev: { - pip = removeKnownVulnerabilities prev.pip; - setuptools = removeKnownVulnerabilities prev.setuptools; - }; - }; - callPackage = lib.callPackageWith (pkgsBuildHost // { python27 = python27'; }); + callPackage = lib.callPackageWith pkgsBuildHost; source = callPackage ./source.nix { }; deps = callPackage ./deps.nix { }; # not exposed in all-packages diff --git a/pkgs/development/misc/resholve/deps.nix b/pkgs/development/misc/resholve/deps.nix index e96e049528c1..24749d8f6063 100644 --- a/pkgs/development/misc/resholve/deps.nix +++ b/pkgs/development/misc/resholve/deps.nix @@ -2,11 +2,12 @@ lib, callPackage, fetchFromGitHub, - python27, fetchPypi, ... }: - +let + python27 = callPackage ./python27.nix { }; +in /* Notes on specific dependencies: - if/when python2.7 is removed from nixpkgs, this may need to figure @@ -15,7 +16,6 @@ rec { oil = callPackage ./oildev.nix { - inherit python27; inherit six; inherit typing; }; diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix index 7eb6314a2edc..9fe3b8ffeff2 100644 --- a/pkgs/development/misc/resholve/oildev.nix +++ b/pkgs/development/misc/resholve/oildev.nix @@ -1,7 +1,6 @@ { lib, stdenv, - python27, callPackage, fetchFromGitHub, makeWrapper, @@ -12,6 +11,9 @@ six, typing, }: +let + python27 = callPackage ./python27.nix { }; +in { /* diff --git a/pkgs/development/misc/resholve/python27.nix b/pkgs/development/misc/resholve/python27.nix new file mode 100644 index 000000000000..fd3aa80bcbe7 --- /dev/null +++ b/pkgs/development/misc/resholve/python27.nix @@ -0,0 +1,45 @@ +{ + lib, + pkgsBuildHost, +}: + +let + removeKnownVulnerabilities = + pkg: + pkg.overrideAttrs (old: { + meta = (old.meta or { }) // { + knownVulnerabilities = [ ]; + }; + }); + # We are removing `meta.knownVulnerabilities` from `python27`, + # and setting it in `resholve` itself. + python27 = (removeKnownVulnerabilities pkgsBuildHost.python27).override { + self = python27; + pkgsBuildHost = pkgsBuildHost // { + inherit python27; + }; + # python2-only overrides for bootstrapped-pip/pip/setuptools/wheel + # (no longer applied globally — kept local to resholve) + packageOverrides = lib.composeExtensions (import ./python2-packages.nix) ( + _self: super: { + pip = removeKnownVulnerabilities super.pip; + setuptools = removeKnownVulnerabilities super.setuptools; + } + ); + # strip down that python version as much as possible + openssl = null; + bzip2 = null; + readline = null; + ncurses = null; + gdbm = null; + sqlite = null; + rebuildBytecode = false; + stripBytecode = true; + strip2to3 = true; + stripConfig = true; + stripIdlelib = true; + stripTests = true; + enableOptimizations = false; + }; +in +python27 diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index 16c9924510e3..823216ba800a 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -1,7 +1,6 @@ { lib, callPackage, - python27, fetchFromGitHub, installShellFiles, rSrc, @@ -13,7 +12,9 @@ resholve, resholve-utils, }: - +let + python27 = callPackage ./python27.nix { }; +in let sedparse = python27.pkgs.buildPythonPackage { pname = "sedparse"; diff --git a/pkgs/development/misc/resholve/test.nix b/pkgs/development/misc/resholve/test.nix index 75b13b7c1900..a2cc8aaffe69 100644 --- a/pkgs/development/misc/resholve/test.nix +++ b/pkgs/development/misc/resholve/test.nix @@ -13,7 +13,6 @@ bats, libressl, openssl, - python27, file, gettext, rSrc, From c510450a30dca8cabf6f6ed480d066f9a4c797a7 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sun, 3 May 2026 23:06:49 +0300 Subject: [PATCH 74/97] python2: remove from top-level --- pkgs/development/misc/resholve/python27.nix | 2 +- pkgs/top-level/aliases.nix | 12 +++++++++--- pkgs/top-level/all-packages.nix | 14 -------------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/pkgs/development/misc/resholve/python27.nix b/pkgs/development/misc/resholve/python27.nix index fd3aa80bcbe7..06b138655b4c 100644 --- a/pkgs/development/misc/resholve/python27.nix +++ b/pkgs/development/misc/resholve/python27.nix @@ -13,7 +13,7 @@ let }); # We are removing `meta.knownVulnerabilities` from `python27`, # and setting it in `resholve` itself. - python27 = (removeKnownVulnerabilities pkgsBuildHost.python27).override { + python27 = (removeKnownVulnerabilities pkgsBuildHost.pythonInterpreters.python27).override { self = python27; pkgsBuildHost = pkgsBuildHost // { inherit python27; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e1690f5858a1..33291f2d7943 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1816,15 +1816,21 @@ mapAliases { pyo3-pack = throw "'pyo3-pack' has been renamed to/replaced by 'maturin'"; # Converted to throw 2025-10-27 pyotherside = warnAlias "'pyotherside' has been renamed to 'libsForQt5.pyotherside'. A Qt6 build is available at 'qt6Packages.pyotherside'."; # Added 2026-03-27 pypolicyd-spf = throw "'pypolicyd-spf' has been renamed to/replaced by 'spf-engine'"; # Converted to throw 2025-10-27 + python2 = throw "python2 has been removed; Python 2 is end-of-life. Use `python3` instead."; # Added 2026-05-03 + python2Full = throw "python2Full has been removed; Python 2 is end-of-life. Use `python3` instead."; # Added 2026-05-03 + python2Packages = throw "python2Packages has been removed; Python 2 is end-of-life. Use `python3Packages` instead."; # Added 2026-05-03 python3Full = throw "python3Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 + python27 = throw "python27 has been removed from the top-level package set; Python 2 is end-of-life. Use `python3` instead."; # Added 2026-05-03 + python27Full = throw "python27Full has been removed; Python 2 is end-of-life. Use `python3` instead."; # Added 2026-05-03 + python27Packages = throw "python27Packages has been removed; Python 2 is end-of-life. Use `python3Packages` instead."; # Added 2026-05-03 python311Full = throw "python311Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 python312Full = throw "python312Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 python313Full = throw "python313Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 python314Full = throw "python314Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 - python = throw "`python` previously pointed to Python 2; use `python3` or `python2` if necessary"; # Converted to throw 2025-10-27 + python = throw "`python` previously pointed to Python 2; use `python3` instead"; # Converted to throw 2025-10-27 python-qt = throw "python-qt has been removed, because hard to maintain and not required by anything"; # Added 2025-01-14 - pythonFull = throw "'pythonFull' previously pointed to Python 2; use `python3` or `python2Full` if necessary"; # Converted to throw 2025-10-27 - pythonPackages = throw "`pythonPackages` previously pointed to Python 2; use `python3Packages` or `python2.pkgs` if necessary"; # Converted to throw 2025-10-27 + pythonFull = throw "'pythonFull' previously pointed to Python 2; use `python3` instead"; # Converted to throw 2025-10-27 + pythonPackages = throw "`pythonPackages` previously pointed to Python 2; use `python3Packages` instead"; # Converted to throw 2025-10-27 pywal = pywal16; # Added 2026-02-01 q2pro = throw "'q2pro' has been removed as upstream repository was deleted and no direct active forks were available."; # Added 2025-12-27 qcachegrind = throw "'qcachegrind' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8e2d1280902..86308d9d5a25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4855,11 +4855,9 @@ with pkgs; # Python interpreters. All standard library modules are included except for tkinter, which is # available as `pythonPackages.tkinter` and can be used as any other Python package. # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md - python2 = python27; python3 = python313; # pythonPackages further below, but assigned here because they need to be in sync - python2Packages = dontRecurseIntoAttrs python27Packages; python3Packages = dontRecurseIntoAttrs python313Packages; pypy = pypy2; @@ -4868,16 +4866,6 @@ with pkgs; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. - python2Full = python2.override { - self = python2Full; - pythonAttr = "python2Full"; - x11Support = true; - }; - python27Full = python27.override { - self = python27Full; - pythonAttr = "python27Full"; - x11Support = true; - }; # https://py-free-threading.github.io python313FreeThreading = python313.override { @@ -4898,7 +4886,6 @@ with pkgs; pythonInterpreters = callPackage ./../development/interpreters/python { }; inherit (pythonInterpreters) - python27 python311 python312 python313 @@ -4914,7 +4901,6 @@ with pkgs; pythonPackagesExtensions = [ ]; # Python package sets. - python27Packages = python27.pkgs; python311Packages = python311.pkgs; python312Packages = python312.pkgs; python313Packages = recurseIntoAttrs python313.pkgs; From e6871d9800efed3395535a879e323b546d96feab Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sun, 3 May 2026 23:24:23 +0300 Subject: [PATCH 75/97] python2: move cpython, mkPythonDerivation into resholve --- .../python/cpython/docs/default.nix | 12 --------- .../interpreters/python/default.nix | 12 --------- .../python/python-packages-base.nix | 6 ++++- .../2.5.2-ctypes-util-find_library.patch | 0 .../cpython-2.7}/2.5.2-tkinter-x11.patch | 0 .../cpython-2.7}/2.6.2-ssl-threads.patch | 0 .../cpython-2.7}/2.6.5-FD_SETSIZE.patch | 0 .../2.6.5-export-PySignal_SetWakeupFd.patch | 0 .../cpython-2.7}/2.6.5-ncurses-abi6.patch | 0 .../resholve/cpython-2.7}/2.7.3-dbm.patch | 0 .../resholve/cpython-2.7}/2.7.3-dylib.patch | 0 .../2.7.3-getpath-exe-extension.patch | 0 .../resholve/cpython-2.7}/2.7.3-no-libm.patch | 0 .../resholve/cpython-2.7}/atomic_pyc.patch | 0 .../resholve/cpython-2.7}/cross-compile.patch | 0 .../resholve/cpython-2.7}/default.nix | 4 +-- .../cpython-2.7}/deterministic-build.patch | 0 .../cpython-2.7}/find_library-gcc10.patch | 0 .../cpython-2.7}/nix-store-mtime.patch | 0 .../resholve/cpython-2.7}/no-ldconfig.patch | 0 .../cpython-2.7}/no-win64-workaround.patch | 0 .../resholve/cpython-2.7}/profile-task.patch | 0 .../python-2.7-distutils-C++.patch | 0 .../resholve/cpython-2.7}/search-path.patch | 0 .../use-correct-tcl-tk-on-darwin.patch | 0 .../python2/mk-python-derivation.nix | 0 .../resholve/python27-docs}/2.7-html.nix | 0 .../resholve/python27-docs}/2.7-pdf-a4.nix | 0 .../python27-docs}/2.7-pdf-letter.nix | 0 .../resholve/python27-docs}/2.7-text.nix | 0 pkgs/development/misc/resholve/python27.nix | 26 ++++++++++++++++++- 31 files changed, 32 insertions(+), 28 deletions(-) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/2.5.2-ctypes-util-find_library.patch (100%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/2.5.2-tkinter-x11.patch (100%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/2.6.2-ssl-threads.patch (100%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/2.6.5-FD_SETSIZE.patch (100%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/2.6.5-export-PySignal_SetWakeupFd.patch (100%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/2.6.5-ncurses-abi6.patch (100%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/2.7.3-dbm.patch (100%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/2.7.3-dylib.patch (100%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/2.7.3-getpath-exe-extension.patch (100%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/2.7.3-no-libm.patch (100%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/atomic_pyc.patch (100%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/cross-compile.patch (100%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/default.nix (99%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/deterministic-build.patch (100%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/find_library-gcc10.patch (100%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/nix-store-mtime.patch (100%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/no-ldconfig.patch (100%) rename pkgs/development/{interpreters/python/cpython/3.7 => misc/resholve/cpython-2.7}/no-win64-workaround.patch (100%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/profile-task.patch (100%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/python-2.7-distutils-C++.patch (100%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/search-path.patch (100%) rename pkgs/development/{interpreters/python/cpython/2.7 => misc/resholve/cpython-2.7}/use-correct-tcl-tk-on-darwin.patch (100%) rename pkgs/development/{interpreters/python => misc/resholve}/python2/mk-python-derivation.nix (100%) rename pkgs/development/{interpreters/python/cpython/docs => misc/resholve/python27-docs}/2.7-html.nix (100%) rename pkgs/development/{interpreters/python/cpython/docs => misc/resholve/python27-docs}/2.7-pdf-a4.nix (100%) rename pkgs/development/{interpreters/python/cpython/docs => misc/resholve/python27-docs}/2.7-pdf-letter.nix (100%) rename pkgs/development/{interpreters/python/cpython/docs => misc/resholve/python27-docs}/2.7-text.nix (100%) diff --git a/pkgs/development/interpreters/python/cpython/docs/default.nix b/pkgs/development/interpreters/python/cpython/docs/default.nix index a2d6a35ba8b5..d5cc62a92120 100644 --- a/pkgs/development/interpreters/python/cpython/docs/default.nix +++ b/pkgs/development/interpreters/python/cpython/docs/default.nix @@ -8,36 +8,24 @@ let pythonDocs = { html = { recurseForDerivations = true; - python27 = import ./2.7-html.nix { - inherit stdenv fetchurl lib; - }; python310 = import ./3.10-html.nix { inherit stdenv fetchurl lib; }; }; pdf_a4 = { recurseForDerivations = true; - python27 = import ./2.7-pdf-a4.nix { - inherit stdenv fetchurl lib; - }; python310 = import ./3.10-pdf-a4.nix { inherit stdenv fetchurl lib; }; }; pdf_letter = { recurseForDerivations = true; - python27 = import ./2.7-pdf-letter.nix { - inherit stdenv fetchurl lib; - }; python310 = import ./3.10-pdf-letter.nix { inherit stdenv fetchurl lib; }; }; text = { recurseForDerivations = true; - python27 = import ./2.7-text.nix { - inherit stdenv fetchurl lib; - }; python310 = import ./3.10-text.nix { inherit stdenv fetchurl lib; }; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 11a150d78506..d87e115892b8 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -30,18 +30,6 @@ in { - python27 = callPackage ./cpython/2.7 { - self = __splicedPackages.python27; - sourceVersion = { - major = "2"; - minor = "7"; - patch = "18"; - suffix = ".12"; # ActiveState's Python 2 extended support - }; - hash = "sha256-RuEgfpags9wJm9Xe0daotqUx4knABEUc7DvtgnQXEfE="; - inherit passthruFun; - }; - python311 = callPackage ./cpython { self = __splicedPackages.python311; sourceVersion = { diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index aeb5582e4c8b..000b23a6955a 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -102,7 +102,11 @@ let ); mkPythonDerivation = - if python.isPy3k then ./mk-python-derivation.nix else ./python2/mk-python-derivation.nix; + if python.isPy3k then + ./mk-python-derivation.nix + else + # Python 2 build infrastructure lives with its only consumers (resholve, pypy27). + ../../misc/resholve/python2/mk-python-derivation.nix; buildPythonPackage = makeOverridablePythonPackage ( overrideStdenvCompat ( diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.5.2-ctypes-util-find_library.patch b/pkgs/development/misc/resholve/cpython-2.7/2.5.2-ctypes-util-find_library.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.5.2-ctypes-util-find_library.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.5.2-ctypes-util-find_library.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.5.2-tkinter-x11.patch b/pkgs/development/misc/resholve/cpython-2.7/2.5.2-tkinter-x11.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.5.2-tkinter-x11.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.5.2-tkinter-x11.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.6.2-ssl-threads.patch b/pkgs/development/misc/resholve/cpython-2.7/2.6.2-ssl-threads.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.6.2-ssl-threads.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.6.2-ssl-threads.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.6.5-FD_SETSIZE.patch b/pkgs/development/misc/resholve/cpython-2.7/2.6.5-FD_SETSIZE.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.6.5-FD_SETSIZE.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.6.5-FD_SETSIZE.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.6.5-export-PySignal_SetWakeupFd.patch b/pkgs/development/misc/resholve/cpython-2.7/2.6.5-export-PySignal_SetWakeupFd.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.6.5-export-PySignal_SetWakeupFd.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.6.5-export-PySignal_SetWakeupFd.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.6.5-ncurses-abi6.patch b/pkgs/development/misc/resholve/cpython-2.7/2.6.5-ncurses-abi6.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.6.5-ncurses-abi6.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.6.5-ncurses-abi6.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.7.3-dbm.patch b/pkgs/development/misc/resholve/cpython-2.7/2.7.3-dbm.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.7.3-dbm.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.7.3-dbm.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.7.3-dylib.patch b/pkgs/development/misc/resholve/cpython-2.7/2.7.3-dylib.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.7.3-dylib.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.7.3-dylib.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.7.3-getpath-exe-extension.patch b/pkgs/development/misc/resholve/cpython-2.7/2.7.3-getpath-exe-extension.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.7.3-getpath-exe-extension.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.7.3-getpath-exe-extension.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/2.7.3-no-libm.patch b/pkgs/development/misc/resholve/cpython-2.7/2.7.3-no-libm.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/2.7.3-no-libm.patch rename to pkgs/development/misc/resholve/cpython-2.7/2.7.3-no-libm.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch b/pkgs/development/misc/resholve/cpython-2.7/atomic_pyc.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/atomic_pyc.patch rename to pkgs/development/misc/resholve/cpython-2.7/atomic_pyc.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch b/pkgs/development/misc/resholve/cpython-2.7/cross-compile.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch rename to pkgs/development/misc/resholve/cpython-2.7/cross-compile.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/misc/resholve/cpython-2.7/default.nix similarity index 99% rename from pkgs/development/interpreters/python/cpython/2.7/default.nix rename to pkgs/development/misc/resholve/cpython-2.7/default.nix index 9f3d064ceeb1..e68c988ca0b4 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/misc/resholve/cpython-2.7/default.nix @@ -146,7 +146,7 @@ let # It does break aarch64-darwin, which we do support. See: # * https://bugs.python.org/issue35523 # * https://github.com/python/cpython/commit/e6b247c8e524 - ../3.7/no-win64-workaround.patch + ./no-win64-workaround.patch # fix openssl detection by reverting irrelevant change for us, to enable hashlib which is required by pip (fetchpatch { @@ -378,7 +378,7 @@ stdenv.mkDerivation ( postFixup = '' # Include a sitecustomize.py file. Note it causes an error when it's in postInstall with 2.7. - cp ${../../sitecustomize.py} $out/${sitePackages}/sitecustomize.py + cp ${../../../interpreters/python/sitecustomize.py} $out/${sitePackages}/sitecustomize.py '' + lib.optionalString strip2to3 '' rm -R $out/bin/2to3 $out/lib/python*/lib2to3 diff --git a/pkgs/development/interpreters/python/cpython/2.7/deterministic-build.patch b/pkgs/development/misc/resholve/cpython-2.7/deterministic-build.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/deterministic-build.patch rename to pkgs/development/misc/resholve/cpython-2.7/deterministic-build.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/find_library-gcc10.patch b/pkgs/development/misc/resholve/cpython-2.7/find_library-gcc10.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/find_library-gcc10.patch rename to pkgs/development/misc/resholve/cpython-2.7/find_library-gcc10.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/nix-store-mtime.patch b/pkgs/development/misc/resholve/cpython-2.7/nix-store-mtime.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/nix-store-mtime.patch rename to pkgs/development/misc/resholve/cpython-2.7/nix-store-mtime.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch b/pkgs/development/misc/resholve/cpython-2.7/no-ldconfig.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch rename to pkgs/development/misc/resholve/cpython-2.7/no-ldconfig.patch diff --git a/pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch b/pkgs/development/misc/resholve/cpython-2.7/no-win64-workaround.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/3.7/no-win64-workaround.patch rename to pkgs/development/misc/resholve/cpython-2.7/no-win64-workaround.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/profile-task.patch b/pkgs/development/misc/resholve/cpython-2.7/profile-task.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/profile-task.patch rename to pkgs/development/misc/resholve/cpython-2.7/profile-task.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/python-2.7-distutils-C++.patch b/pkgs/development/misc/resholve/cpython-2.7/python-2.7-distutils-C++.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/python-2.7-distutils-C++.patch rename to pkgs/development/misc/resholve/cpython-2.7/python-2.7-distutils-C++.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/search-path.patch b/pkgs/development/misc/resholve/cpython-2.7/search-path.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/search-path.patch rename to pkgs/development/misc/resholve/cpython-2.7/search-path.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/misc/resholve/cpython-2.7/use-correct-tcl-tk-on-darwin.patch similarity index 100% rename from pkgs/development/interpreters/python/cpython/2.7/use-correct-tcl-tk-on-darwin.patch rename to pkgs/development/misc/resholve/cpython-2.7/use-correct-tcl-tk-on-darwin.patch diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/misc/resholve/python2/mk-python-derivation.nix similarity index 100% rename from pkgs/development/interpreters/python/python2/mk-python-derivation.nix rename to pkgs/development/misc/resholve/python2/mk-python-derivation.nix diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/pkgs/development/misc/resholve/python27-docs/2.7-html.nix similarity index 100% rename from pkgs/development/interpreters/python/cpython/docs/2.7-html.nix rename to pkgs/development/misc/resholve/python27-docs/2.7-html.nix diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/pkgs/development/misc/resholve/python27-docs/2.7-pdf-a4.nix similarity index 100% rename from pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix rename to pkgs/development/misc/resholve/python27-docs/2.7-pdf-a4.nix diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/pkgs/development/misc/resholve/python27-docs/2.7-pdf-letter.nix similarity index 100% rename from pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix rename to pkgs/development/misc/resholve/python27-docs/2.7-pdf-letter.nix diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/pkgs/development/misc/resholve/python27-docs/2.7-text.nix similarity index 100% rename from pkgs/development/interpreters/python/cpython/docs/2.7-text.nix rename to pkgs/development/misc/resholve/python27-docs/2.7-text.nix diff --git a/pkgs/development/misc/resholve/python27.nix b/pkgs/development/misc/resholve/python27.nix index 06b138655b4c..677cf13dc0d8 100644 --- a/pkgs/development/misc/resholve/python27.nix +++ b/pkgs/development/misc/resholve/python27.nix @@ -11,9 +11,33 @@ let knownVulnerabilities = [ ]; }; }); + + passthruFun = import ../../interpreters/python/passthrufun.nix { + inherit lib; + inherit (pkgsBuildHost) + stdenv + callPackage + pythonPackagesExtensions + config + makeScopeWithSplicing' + ; + }; + + python27Base = pkgsBuildHost.callPackage ./cpython-2.7 { + self = python27; + sourceVersion = { + major = "2"; + minor = "7"; + patch = "18"; + suffix = ".12"; # ActiveState's Python 2 extended support + }; + hash = "sha256-RuEgfpags9wJm9Xe0daotqUx4knABEUc7DvtgnQXEfE="; + inherit passthruFun; + }; + # We are removing `meta.knownVulnerabilities` from `python27`, # and setting it in `resholve` itself. - python27 = (removeKnownVulnerabilities pkgsBuildHost.pythonInterpreters.python27).override { + python27 = (removeKnownVulnerabilities python27Base).override { self = python27; pkgsBuildHost = pkgsBuildHost // { inherit python27; From cfaddae52a3cfb8ad4362dd1a80edadbb959bda9 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sun, 3 May 2026 23:25:01 +0300 Subject: [PATCH 76/97] python2: delete docs --- .../misc/resholve/python2-modules/README.md | 7 ------ .../misc/resholve/python27-docs/2.7-html.nix | 24 ------------------- .../resholve/python27-docs/2.7-pdf-a4.nix | 24 ------------------- .../resholve/python27-docs/2.7-pdf-letter.nix | 24 ------------------- .../misc/resholve/python27-docs/2.7-text.nix | 24 ------------------- 5 files changed, 103 deletions(-) delete mode 100644 pkgs/development/misc/resholve/python2-modules/README.md delete mode 100644 pkgs/development/misc/resholve/python27-docs/2.7-html.nix delete mode 100644 pkgs/development/misc/resholve/python27-docs/2.7-pdf-a4.nix delete mode 100644 pkgs/development/misc/resholve/python27-docs/2.7-pdf-letter.nix delete mode 100644 pkgs/development/misc/resholve/python27-docs/2.7-text.nix diff --git a/pkgs/development/misc/resholve/python2-modules/README.md b/pkgs/development/misc/resholve/python2-modules/README.md deleted file mode 100644 index 97252d996691..000000000000 --- a/pkgs/development/misc/resholve/python2-modules/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Python 2 is Not Supported - -Packages, applications, and services based on Python 2 are no longer supported and are being removed. If you require a Python 2-based package, you can include that package in your own local repository. - -Some packages may continue to be maintained for internal use by Nixpkgs, but they should not be used by new public packages. - -For more details, see [Issue #201859](https://github.com/NixOS/nixpkgs/pull/201859). diff --git a/pkgs/development/misc/resholve/python27-docs/2.7-html.nix b/pkgs/development/misc/resholve/python27-docs/2.7-html.nix deleted file mode 100644 index e706fc0b9125..000000000000 --- a/pkgs/development/misc/resholve/python27-docs/2.7-html.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ - stdenv, - lib, - fetchurl, -}: - -stdenv.mkDerivation { - pname = "python27-docs-html"; - version = "2.7.18"; - - src = fetchurl { - url = "https://www.python.org/ftp/python/doc/2.7.18/python-2.7.18-docs-html.tar.bz2"; - sha256 = "03igxwpqc2lvzspnj78zz1prnmfwwj00jbvh1wsxvb0wayd5wi10"; - }; - installPhase = '' - mkdir -p $out/share/doc/python27 - cp -R ./ $out/share/doc/python27/html - ''; - meta = { - maintainers = [ ]; - }; -} diff --git a/pkgs/development/misc/resholve/python27-docs/2.7-pdf-a4.nix b/pkgs/development/misc/resholve/python27-docs/2.7-pdf-a4.nix deleted file mode 100644 index 31d8a2fe337f..000000000000 --- a/pkgs/development/misc/resholve/python27-docs/2.7-pdf-a4.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ - stdenv, - lib, - fetchurl, -}: - -stdenv.mkDerivation { - pname = "python27-docs-pdf-a4"; - version = "2.7.18"; - - src = fetchurl { - url = "https://www.python.org/ftp/python/doc/2.7.18/python-2.7.18-docs-pdf-a4.tar.bz2"; - sha256 = "0rxb2fpxwivjpk5wi2pl1fqibr4khf9s0yq6a49k9b4awi9nkb6v"; - }; - installPhase = '' - mkdir -p $out/share/doc/python27 - cp -R ./ $out/share/doc/python27/pdf-a4 - ''; - meta = { - maintainers = [ ]; - }; -} diff --git a/pkgs/development/misc/resholve/python27-docs/2.7-pdf-letter.nix b/pkgs/development/misc/resholve/python27-docs/2.7-pdf-letter.nix deleted file mode 100644 index 7ee205efc947..000000000000 --- a/pkgs/development/misc/resholve/python27-docs/2.7-pdf-letter.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ - stdenv, - lib, - fetchurl, -}: - -stdenv.mkDerivation { - pname = "python27-docs-pdf-letter"; - version = "2.7.18"; - - src = fetchurl { - url = "https://www.python.org/ftp/python/doc/2.7.18/python-2.7.18-docs-pdf-letter.tar.bz2"; - sha256 = "07hbqvrdlq01cb95r1574bxqqhiqbkj4f92wzlq4d6dq1l272nan"; - }; - installPhase = '' - mkdir -p $out/share/doc/python27 - cp -R ./ $out/share/doc/python27/pdf-letter - ''; - meta = { - maintainers = [ ]; - }; -} diff --git a/pkgs/development/misc/resholve/python27-docs/2.7-text.nix b/pkgs/development/misc/resholve/python27-docs/2.7-text.nix deleted file mode 100644 index 8caea548ffa0..000000000000 --- a/pkgs/development/misc/resholve/python27-docs/2.7-text.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ - stdenv, - lib, - fetchurl, -}: - -stdenv.mkDerivation { - pname = "python27-docs-text"; - version = "2.7.18"; - - src = fetchurl { - url = "https://www.python.org/ftp/python/doc/2.7.18/python-2.7.18-docs-text.tar.bz2"; - sha256 = "1wj7mxs52kp5lmn5mvv574sygkfnk00kbz9ya9c03yfq5dd5nvy8"; - }; - installPhase = '' - mkdir -p $out/share/doc/python27 - cp -R ./ $out/share/doc/python27/text - ''; - meta = { - maintainers = [ ]; - }; -} From 574bf7de393836b40738a6443d65eabab39ec424 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Mon, 4 May 2026 00:17:19 +0300 Subject: [PATCH 77/97] treewide: remove isPy27 and isPy2 flags --- pkgs/by-name/re/replacement/package.nix | 2 -- pkgs/development/interpreters/python/passthrufun.nix | 2 -- .../interpreters/python/python-packages-base.nix | 1 - .../python-modules/aiocontextvars/default.nix | 3 --- .../development/python-modules/aspell-python/default.nix | 3 --- pkgs/development/python-modules/awslambdaric/default.nix | 3 --- pkgs/development/python-modules/basiciw/default.nix | 3 +-- pkgs/development/python-modules/beaker/default.nix | 7 ------- pkgs/development/python-modules/ci-info/default.nix | 3 --- .../python-modules/click-completion/default.nix | 2 -- pkgs/development/python-modules/coapthon3/default.nix | 2 -- pkgs/development/python-modules/debts/default.nix | 3 --- pkgs/development/python-modules/digi-xbee/default.nix | 2 -- pkgs/development/python-modules/etesync/default.nix | 2 -- pkgs/development/python-modules/exdown/default.nix | 3 --- pkgs/development/python-modules/executor/default.nix | 3 +-- .../python-modules/gibberish-detector/default.nix | 2 -- pkgs/development/python-modules/gumath/default.nix | 2 -- pkgs/development/python-modules/halo/default.nix | 2 -- pkgs/development/python-modules/hyperlink/default.nix | 4 +--- pkgs/development/python-modules/inflection/default.nix | 2 -- .../python-modules/ipydatawidgets/default.nix | 3 --- .../python-modules/jaraco-classes/default.nix | 3 --- pkgs/development/python-modules/javaobj-py3/default.nix | 2 -- pkgs/development/python-modules/json-rpc/default.nix | 9 +-------- pkgs/development/python-modules/manuel/default.nix | 2 -- pkgs/development/python-modules/matchpy/default.nix | 2 -- pkgs/development/python-modules/mergedeep/default.nix | 2 -- pkgs/development/python-modules/mlrose/default.nix | 2 -- pkgs/development/python-modules/mlxtend/default.nix | 3 --- pkgs/development/python-modules/mnist/default.nix | 4 +--- pkgs/development/python-modules/mongoengine/default.nix | 2 -- pkgs/development/python-modules/mongoquery/default.nix | 3 --- pkgs/development/python-modules/ms-cv/default.nix | 3 --- pkgs/development/python-modules/ndtypes/default.nix | 2 -- .../python-modules/nixpkgs-pytools/default.nix | 2 -- pkgs/development/python-modules/nplusone/default.nix | 2 -- pkgs/development/python-modules/opuslib/default.nix | 3 --- pkgs/development/python-modules/piccata/default.nix | 3 --- pkgs/development/python-modules/plexauth/default.nix | 2 -- pkgs/development/python-modules/pooch/default.nix | 3 --- pkgs/development/python-modules/pq/default.nix | 2 -- .../python-modules/py-air-control-exporter/default.nix | 2 -- pkgs/development/python-modules/py-sonic/default.nix | 2 -- pkgs/development/python-modules/pyaehw4a1/default.nix | 3 --- pkgs/development/python-modules/pycmarkgfm/default.nix | 2 -- pkgs/development/python-modules/pyenchant/default.nix | 2 -- pkgs/development/python-modules/pypubsub/default.nix | 2 -- pkgs/development/python-modules/pyqt/5.x.nix | 3 --- .../python-modules/pytest-helpers-namespace/default.nix | 2 -- .../python-modules/pytest-tornasync/default.nix | 2 -- pkgs/development/python-modules/pyxl3/default.nix | 2 -- pkgs/development/python-modules/reparser/default.nix | 3 --- pkgs/development/python-modules/roku/default.nix | 2 -- pkgs/development/python-modules/rtmixer/default.nix | 2 -- .../python-modules/sansio-multipart/default.nix | 3 --- pkgs/development/python-modules/scikit-tda/default.nix | 2 -- pkgs/development/python-modules/segments/default.nix | 2 -- pkgs/development/python-modules/sgmllib3k/default.nix | 3 --- pkgs/development/python-modules/simpleaudio/default.nix | 2 -- pkgs/development/python-modules/simpy/default.nix | 3 --- pkgs/development/python-modules/skein/default.nix | 5 ----- .../python-modules/snapshot-restore-py/default.nix | 3 --- pkgs/development/python-modules/sounddevice/default.nix | 2 -- .../python-modules/sphinxcontrib-jsmath/default.nix | 2 -- .../python-modules/sphinxcontrib-openapi/default.nix | 2 -- pkgs/development/python-modules/spiderpy/default.nix | 3 --- pkgs/development/python-modules/spinners/default.nix | 2 -- pkgs/development/python-modules/test-tube/default.nix | 3 --- pkgs/development/python-modules/tokenize-rt/default.nix | 3 --- .../python-modules/update-checker/default.nix | 2 -- pkgs/development/python-modules/venusian/default.nix | 3 --- pkgs/top-level/python-packages.nix | 1 - 73 files changed, 5 insertions(+), 185 deletions(-) diff --git a/pkgs/by-name/re/replacement/package.nix b/pkgs/by-name/re/replacement/package.nix index 97c24a44a4f8..0802d55315b4 100644 --- a/pkgs/by-name/re/replacement/package.nix +++ b/pkgs/by-name/re/replacement/package.nix @@ -9,8 +9,6 @@ python3Packages.buildPythonApplication (finalAttrs: { version = "0.4.4"; pyproject = true; - disabled = python3Packages.isPy27; - src = fetchFromGitHub { owner = "siriobalmelli"; repo = "replacement"; diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix index 1bb120cb8165..005ba62ba742 100644 --- a/pkgs/development/interpreters/python/passthrufun.nix +++ b/pkgs/development/interpreters/python/passthrufun.nix @@ -109,12 +109,10 @@ let ); in rec { - isPy27 = pythonVersion == "2.7"; isPy311 = pythonVersion == "3.11"; isPy312 = pythonVersion == "3.12"; isPy313 = pythonVersion == "3.13"; isPy314 = pythonVersion == "3.14"; - isPy2 = lib.strings.substring 0 1 pythonVersion == "2"; isPy3 = lib.strings.substring 0 1 pythonVersion == "3"; isPy3k = isPy3; isPyPy = lib.hasInfix "pypy" interpreter; diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index 000b23a6955a..68b10dfc8c6a 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -190,7 +190,6 @@ in { inherit lib pkgs stdenv; inherit (python.passthru) - isPy27 isPy311 isPy312 isPy313 diff --git a/pkgs/development/python-modules/aiocontextvars/default.nix b/pkgs/development/python-modules/aiocontextvars/default.nix index 7bcf18ee24d6..ee5c35e27fae 100644 --- a/pkgs/development/python-modules/aiocontextvars/default.nix +++ b/pkgs/development/python-modules/aiocontextvars/default.nix @@ -5,7 +5,6 @@ setuptools, pytestCheckHook, pytest-asyncio, - isPy27, }: buildPythonPackage rec { @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "0.2.2"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "fantix"; repo = "aiocontextvars"; diff --git a/pkgs/development/python-modules/aspell-python/default.nix b/pkgs/development/python-modules/aspell-python/default.nix index 87784477ccbd..4bc47fe3bd51 100644 --- a/pkgs/development/python-modules/aspell-python/default.nix +++ b/pkgs/development/python-modules/aspell-python/default.nix @@ -4,7 +4,6 @@ aspellDicts, buildPythonPackage, fetchPypi, - isPy27, pytestCheckHook, setuptools, }: @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "1.15"; pyproject = true; - disabled = isPy27; - src = fetchPypi { pname = "aspell-python-py3"; inherit version; diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index 3a74d1e2c350..504834368922 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytestCheckHook, autoconf, automake, @@ -20,8 +19,6 @@ buildPythonPackage rec { version = "3.1.1"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; diff --git a/pkgs/development/python-modules/basiciw/default.nix b/pkgs/development/python-modules/basiciw/default.nix index 45b1d5407db4..e21dcbfa9f61 100644 --- a/pkgs/development/python-modules/basiciw/default.nix +++ b/pkgs/development/python-modules/basiciw/default.nix @@ -4,7 +4,6 @@ fetchPypi, gcc, wirelesstools, - isPy27, isPyPy, }: @@ -13,7 +12,7 @@ buildPythonPackage rec { version = "0.2.2"; format = "setuptools"; - disabled = isPy27 || isPyPy; + disabled = isPyPy; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix index aad6383f249e..bd556adcaef3 100644 --- a/pkgs/development/python-modules/beaker/default.nix +++ b/pkgs/development/python-modules/beaker/default.nix @@ -12,11 +12,8 @@ sqlalchemy, pycrypto, cryptography, - isPy27, pytestCheckHook, setuptools, - funcsigs ? null, - pycryptopp ? null, }: buildPythonPackage rec { @@ -38,10 +35,6 @@ buildPythonPackage rec { sqlalchemy pycrypto cryptography - ] - ++ lib.optionals isPy27 [ - funcsigs - pycryptopp ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/ci-info/default.nix b/pkgs/development/python-modules/ci-info/default.nix index d3035a11df13..32b08f75003d 100644 --- a/pkgs/development/python-modules/ci-info/default.nix +++ b/pkgs/development/python-modules/ci-info/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchPypi, pytest, pytestCheckHook, @@ -12,8 +11,6 @@ buildPythonPackage rec { format = "setuptools"; pname = "ci-info"; - disabled = isPy27; - src = fetchPypi { inherit pname version; hash = "sha256-H9UMvUAfKa3/7rGLBIniMtFqwadFisa8MW3qtq5TX7A="; diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix index 5e06ace61034..c87468bd5955 100644 --- a/pkgs/development/python-modules/click-completion/default.nix +++ b/pkgs/development/python-modules/click-completion/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy27, # propagates click, @@ -15,7 +14,6 @@ buildPythonPackage rec { pname = "click-completion"; version = "0.5.2"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/coapthon3/default.nix b/pkgs/development/python-modules/coapthon3/default.nix index 283633f6d04f..89795e6001ca 100644 --- a/pkgs/development/python-modules/coapthon3/default.nix +++ b/pkgs/development/python-modules/coapthon3/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, cachetools, fetchFromGitHub, - isPy27, lib, }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "coapthon3"; version = "1.0.2"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "Tanganelli"; diff --git a/pkgs/development/python-modules/debts/default.nix b/pkgs/development/python-modules/debts/default.nix index ba8a49c20034..25d37cc566f1 100644 --- a/pkgs/development/python-modules/debts/default.nix +++ b/pkgs/development/python-modules/debts/default.nix @@ -3,7 +3,6 @@ python, buildPythonPackage, fetchFromGitLab, - isPy27, jinja2, pytest, }: @@ -22,8 +21,6 @@ buildPythonPackage rec { sha256 = "1d66nka81mv9c07mki78lp5hdajqv4cq6aq2k7bh3mhkc5hwnwlg"; }; - disabled = isPy27; - propagatedBuildInputs = [ jinja2 ]; nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/digi-xbee/default.nix b/pkgs/development/python-modules/digi-xbee/default.nix index 0d659cf4833c..e128ab588b06 100644 --- a/pkgs/development/python-modules/digi-xbee/default.nix +++ b/pkgs/development/python-modules/digi-xbee/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, fetchPypi, - isPy27, pyserial, srp, lib, @@ -11,7 +10,6 @@ buildPythonPackage rec { pname = "digi-xbee"; version = "1.5.0"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { pname = "digi_xbee"; diff --git a/pkgs/development/python-modules/etesync/default.nix b/pkgs/development/python-modules/etesync/default.nix index e1310b1ef37d..c5ce2cd1685e 100644 --- a/pkgs/development/python-modules/etesync/default.nix +++ b/pkgs/development/python-modules/etesync/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy27, appdirs, asn1crypto, cffi, @@ -29,7 +28,6 @@ buildPythonPackage rec { pname = "etesync"; version = "0.12.1"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/exdown/default.nix b/pkgs/development/python-modules/exdown/default.nix index 0b1b0bf32747..7ee213a87409 100644 --- a/pkgs/development/python-modules/exdown/default.nix +++ b/pkgs/development/python-modules/exdown/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchPypi, setuptools, pytestCheckHook, @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "0.9.0"; pyproject = true; - disabled = isPy27; - src = fetchPypi { inherit pname version; extension = "zip"; diff --git a/pkgs/development/python-modules/executor/default.nix b/pkgs/development/python-modules/executor/default.nix index 6a93631fe79b..685b9ffa6b81 100644 --- a/pkgs/development/python-modules/executor/default.nix +++ b/pkgs/development/python-modules/executor/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, setuptools, - isPy27, pythonAtLeast, coloredlogs, humanfriendly, @@ -21,7 +20,7 @@ buildPythonPackage rec { format = "setuptools"; # pipes is removed in python 3.13 - disabled = isPy27 || pythonAtLeast "3.13"; + disabled = pythonAtLeast "3.13"; src = fetchFromGitHub { owner = "xolox"; diff --git a/pkgs/development/python-modules/gibberish-detector/default.nix b/pkgs/development/python-modules/gibberish-detector/default.nix index e30677548552..9b432d32c042 100644 --- a/pkgs/development/python-modules/gibberish-detector/default.nix +++ b/pkgs/development/python-modules/gibberish-detector/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytestCheckHook, }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "gibberish-detector"; version = "0.1.1"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "domanchi"; diff --git a/pkgs/development/python-modules/gumath/default.nix b/pkgs/development/python-modules/gumath/default.nix index f478acffb27e..765793f90ea4 100644 --- a/pkgs/development/python-modules/gumath/default.nix +++ b/pkgs/development/python-modules/gumath/default.nix @@ -10,13 +10,11 @@ libndtypes, libxnd, libgumath, - isPy27, }: buildPythonPackage { pname = "gumath"; format = "setuptools"; - disabled = isPy27; inherit (libgumath) src version meta; patches = [ diff --git a/pkgs/development/python-modules/halo/default.nix b/pkgs/development/python-modules/halo/default.nix index 094331f54f75..9750b7686691 100644 --- a/pkgs/development/python-modules/halo/default.nix +++ b/pkgs/development/python-modules/halo/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, colorama, fetchPypi, - isPy27, lib, log-symbols, six, @@ -14,7 +13,6 @@ buildPythonPackage (finalAttrs: { pname = "halo"; version = "0.0.31"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit (finalAttrs) pname version; diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix index 05f774c3dc43..3bfd9a6e2ca6 100644 --- a/pkgs/development/python-modules/hyperlink/default.nix +++ b/pkgs/development/python-modules/hyperlink/default.nix @@ -2,9 +2,7 @@ lib, buildPythonPackage, fetchPypi, - isPy27, idna, - typing ? null, }: buildPythonPackage rec { @@ -17,7 +15,7 @@ buildPythonPackage rec { sha256 = "0sx50lkivsfjxx9zr4yh7l9gll2l9kvl0v0w8w4wk2x5v9bzjyj2"; }; - propagatedBuildInputs = [ idna ] ++ lib.optionals isPy27 [ typing ]; + propagatedBuildInputs = [ idna ]; meta = { description = "Featureful, correct URL for Python"; diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix index ed8cc71addac..a4b0b46ffb4a 100644 --- a/pkgs/development/python-modules/inflection/default.nix +++ b/pkgs/development/python-modules/inflection/default.nix @@ -2,7 +2,6 @@ lib, fetchPypi, buildPythonPackage, - isPy27, pytest, }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "inflection"; version = "0.5.1"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index 80539b22e3e0..68a1e2967d8a 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy27, pytestCheckHook, nbval, jupyter-packaging, @@ -19,8 +18,6 @@ buildPythonPackage rec { version = "4.3.5"; format = "setuptools"; - disabled = isPy27; - src = fetchPypi { inherit pname version; hash = "sha256-OU8kiVdlh8/XVTd6CaBn9GytIggZZQkgIf0avL54Uqg="; diff --git a/pkgs/development/python-modules/jaraco-classes/default.nix b/pkgs/development/python-modules/jaraco-classes/default.nix index 01f4514eafb5..1e1eb826b7d7 100644 --- a/pkgs/development/python-modules/jaraco-classes/default.nix +++ b/pkgs/development/python-modules/jaraco-classes/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, setuptools-scm, more-itertools, pytestCheckHook, @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "3.4.0"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.classes"; diff --git a/pkgs/development/python-modules/javaobj-py3/default.nix b/pkgs/development/python-modules/javaobj-py3/default.nix index 72696d60e7a2..52d42233e8b1 100644 --- a/pkgs/development/python-modules/javaobj-py3/default.nix +++ b/pkgs/development/python-modules/javaobj-py3/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, fetchPypi, - isPy27, lib, numpy, }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "javaobj-py3"; version = "0.4.4"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/json-rpc/default.nix b/pkgs/development/python-modules/json-rpc/default.nix index 10e4ae35245f..477c48b91abb 100644 --- a/pkgs/development/python-modules/json-rpc/default.nix +++ b/pkgs/development/python-modules/json-rpc/default.nix @@ -1,15 +1,10 @@ { lib, - isPy27, buildPythonPackage, fetchPypi, pytestCheckHook, - mock, }: -let - pythonEnv = lib.optional isPy27 mock; -in buildPythonPackage rec { pname = "json-rpc"; version = "1.15.0"; @@ -20,9 +15,7 @@ buildPythonPackage rec { hash = "sha256-5kQdVsHc1UJByTfQotzRk73wvcU5tTFlJHE/VUt/hbk="; }; - nativeCheckInputs = pythonEnv ++ [ pytestCheckHook ]; - - nativeBuildInputs = pythonEnv; + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "JSON-RPC 1/2 transport implementation"; diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix index 6fcb892bd977..fd66f5dab78c 100644 --- a/pkgs/development/python-modules/manuel/default.nix +++ b/pkgs/development/python-modules/manuel/default.nix @@ -4,7 +4,6 @@ fetchPypi, fetchpatch, python, - isPy27, six, zope-testing, }: @@ -13,7 +12,6 @@ buildPythonPackage rec { pname = "manuel"; version = "1.13.0"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index b66bfccc410e..83a82ef0251a 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -8,14 +8,12 @@ pytestCheckHook, hypothesis, setuptools-scm, - isPy27, }: buildPythonPackage rec { pname = "matchpy"; version = "0.5.5"; # Don't upgrade to 4.3.1, this tag is very old format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "HPAC"; diff --git a/pkgs/development/python-modules/mergedeep/default.nix b/pkgs/development/python-modules/mergedeep/default.nix index eeb055381880..6854d80dc3c9 100644 --- a/pkgs/development/python-modules/mergedeep/default.nix +++ b/pkgs/development/python-modules/mergedeep/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchFromGitHub, pytest, }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "mergedeep"; version = "1.3.4"; format = "setuptools"; - disabled = isPy27; # PyPI tarball doesn't include tests directory src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix index 0ec60de6f4d8..21431e8a373e 100644 --- a/pkgs/development/python-modules/mlrose/default.nix +++ b/pkgs/development/python-modules/mlrose/default.nix @@ -1,6 +1,5 @@ { lib, - isPy27, buildPythonPackage, fetchFromGitHub, fetchpatch, @@ -14,7 +13,6 @@ buildPythonPackage rec { pname = "mlrose"; version = "1.3.0"; pyproject = true; - disabled = isPy27; src = fetchFromGitHub { owner = "gkhayes"; diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 8b0cf517676d..886238be38e4 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, setuptools, pytestCheckHook, scipy, @@ -18,8 +17,6 @@ buildPythonPackage rec { version = "0.24.0"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "rasbt"; repo = "mlxtend"; diff --git a/pkgs/development/python-modules/mnist/default.nix b/pkgs/development/python-modules/mnist/default.nix index 23cb82eaf307..ff90bccc086c 100644 --- a/pkgs/development/python-modules/mnist/default.nix +++ b/pkgs/development/python-modules/mnist/default.nix @@ -1,9 +1,7 @@ { buildPythonPackage, fetchFromGitHub, - isPy27, lib, - mock, numpy, pytestCheckHook, }: @@ -20,7 +18,7 @@ buildPythonPackage rec { sha256 = "17r37pbxiv5dw857bmg990x836gq6sgww069w3q5jjg9m3xdm7dh"; }; - propagatedBuildInputs = [ numpy ] ++ lib.optional isPy27 mock; + propagatedBuildInputs = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index 0c7e59f6a6fa..a4392d767292 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pymongo, - isPy27, six, blinker, pytestCheckHook, @@ -15,7 +14,6 @@ buildPythonPackage rec { pname = "mongoengine"; version = "0.29.1"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; diff --git a/pkgs/development/python-modules/mongoquery/default.nix b/pkgs/development/python-modules/mongoquery/default.nix index 01a1985031df..ae4a0cfc88d5 100644 --- a/pkgs/development/python-modules/mongoquery/default.nix +++ b/pkgs/development/python-modules/mongoquery/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, six, - isPy27, }: buildPythonPackage rec { @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "1.4.3"; format = "setuptools"; - disabled = isPy27; - src = fetchPypi { inherit pname version; sha256 = "sha256-6QH4buWvfvbtovLCb0vSz+g4DYHxeLfjYH27zc7pcjk="; diff --git a/pkgs/development/python-modules/ms-cv/default.nix b/pkgs/development/python-modules/ms-cv/default.nix index 840a1a7a2285..a77a245a2f01 100644 --- a/pkgs/development/python-modules/ms-cv/default.nix +++ b/pkgs/development/python-modules/ms-cv/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchFromGitHub, pytestCheckHook, }: @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "0.1.1"; format = "setuptools"; - disabled = isPy27; - src = fetchFromGitHub { owner = "OpenXbox"; repo = "ms_cv"; diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/pkgs/development/python-modules/ndtypes/default.nix index 21b13ffee682..95419e06d9b6 100644 --- a/pkgs/development/python-modules/ndtypes/default.nix +++ b/pkgs/development/python-modules/ndtypes/default.nix @@ -5,13 +5,11 @@ python, numpy, libndtypes, - isPy27, }: buildPythonPackage { pname = "ndtypes"; format = "setuptools"; - disabled = isPy27; inherit (libndtypes) version src meta; outputs = [ diff --git a/pkgs/development/python-modules/nixpkgs-pytools/default.nix b/pkgs/development/python-modules/nixpkgs-pytools/default.nix index 103286a0f0b1..0b6c2aad4d88 100644 --- a/pkgs/development/python-modules/nixpkgs-pytools/default.nix +++ b/pkgs/development/python-modules/nixpkgs-pytools/default.nix @@ -5,14 +5,12 @@ jinja2, setuptools, rope, - isPy27, }: buildPythonPackage rec { pname = "nixpkgs-pytools"; version = "1.3.0"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/nplusone/default.nix b/pkgs/development/python-modules/nplusone/default.nix index 5f4bdc99f89d..5cbb845e9e74 100644 --- a/pkgs/development/python-modules/nplusone/default.nix +++ b/pkgs/development/python-modules/nplusone/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, flake8, flask-sqlalchemy, - isPy27, mock, peewee, pytest-django, @@ -21,7 +20,6 @@ buildPythonPackage rec { pname = "nplusone"; version = "1.0.0"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "jmcarp"; diff --git a/pkgs/development/python-modules/opuslib/default.nix b/pkgs/development/python-modules/opuslib/default.nix index b7a02b04a9d8..f2f0d8c973bc 100644 --- a/pkgs/development/python-modules/opuslib/default.nix +++ b/pkgs/development/python-modules/opuslib/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - isPy27, libopus, pytestCheckHook, lib, @@ -16,8 +15,6 @@ buildPythonPackage { version = "3.0.3"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "orion-labs"; repo = "opuslib"; diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix index 720433461cf1..cefec10cb7f4 100644 --- a/pkgs/development/python-modules/piccata/default.nix +++ b/pkgs/development/python-modules/piccata/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytestCheckHook, }: @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "2.0.3"; format = "setuptools"; - disabled = isPy27; - src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = "piccata"; diff --git a/pkgs/development/python-modules/plexauth/default.nix b/pkgs/development/python-modules/plexauth/default.nix index aba650e2cbef..9831ba3b8140 100644 --- a/pkgs/development/python-modules/plexauth/default.nix +++ b/pkgs/development/python-modules/plexauth/default.nix @@ -3,14 +3,12 @@ buildPythonPackage, fetchFromGitHub, aiohttp, - isPy27, }: buildPythonPackage rec { pname = "plexauth"; version = "0.0.6"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "jjlawren"; diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index 3275848c97da..ebd4220c69a3 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchPypi, setuptools, setuptools-scm, @@ -20,8 +19,6 @@ buildPythonPackage rec { version = "1.8.2"; pyproject = true; - disabled = isPy27; - src = fetchPypi { inherit pname version; hash = "sha256-dlYfDeaKAdpN9q846ZVcTJ0aXJDac/fkAnalco7IPRA="; diff --git a/pkgs/development/python-modules/pq/default.nix b/pkgs/development/python-modules/pq/default.nix index 63f4fc43c848..e6a3ee02086d 100644 --- a/pkgs/development/python-modules/pq/default.nix +++ b/pkgs/development/python-modules/pq/default.nix @@ -2,14 +2,12 @@ lib, buildPythonPackage, fetchPypi, - isPy27, }: buildPythonPackage rec { pname = "pq"; version = "1.9.1"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix index 45e69dd12445..2b3290c32b94 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -4,7 +4,6 @@ click, fetchPypi, flask, - isPy27, nixosTests, prometheus-client, py-air-control, @@ -15,7 +14,6 @@ buildPythonPackage rec { pname = "py-air-control-exporter"; version = "0.3.1"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/py-sonic/default.nix b/pkgs/development/python-modules/py-sonic/default.nix index 322454a2f59d..d1689fcc7c08 100644 --- a/pkgs/development/python-modules/py-sonic/default.nix +++ b/pkgs/development/python-modules/py-sonic/default.nix @@ -2,14 +2,12 @@ lib, buildPythonPackage, fetchPypi, - isPy27, }: buildPythonPackage rec { pname = "py-sonic"; version = "1.0.3"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyaehw4a1/default.nix b/pkgs/development/python-modules/pyaehw4a1/default.nix index ab7dc9d4b854..b10e845296c4 100644 --- a/pkgs/development/python-modules/pyaehw4a1/default.nix +++ b/pkgs/development/python-modules/pyaehw4a1/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchFromGitHub, }: @@ -10,8 +9,6 @@ buildPythonPackage rec { version = "0.3.9"; format = "setuptools"; - disabled = isPy27; - src = fetchFromGitHub { owner = "bannhead"; repo = "pyaehw4a1"; diff --git a/pkgs/development/python-modules/pycmarkgfm/default.nix b/pkgs/development/python-modules/pycmarkgfm/default.nix index 80a3fefcb45c..e3ef26bd7c20 100644 --- a/pkgs/development/python-modules/pycmarkgfm/default.nix +++ b/pkgs/development/python-modules/pycmarkgfm/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy27, cffi, pytest, }: @@ -11,7 +10,6 @@ buildPythonPackage rec { pname = "pycmarkgfm"; version = "1.2.1"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index 3ca3b126b8f3..4c0ac8884e18 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - isPy27, fetchPypi, enchant_2, }: @@ -11,7 +10,6 @@ buildPythonPackage rec { pname = "pyenchant"; version = "3.3.0"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pypubsub/default.nix b/pkgs/development/python-modules/pypubsub/default.nix index 3b4f97f73a61..b37b97e135fa 100644 --- a/pkgs/development/python-modules/pypubsub/default.nix +++ b/pkgs/development/python-modules/pypubsub/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytest, }: @@ -10,7 +9,6 @@ buildPythonPackage { pname = "pypubsub"; version = "4.0.3"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "schollii"; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 85cedbede6af..89f5cc650dca 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, setuptools, - isPy27, fetchPypi, pkg-config, dbus, @@ -30,8 +29,6 @@ buildPythonPackage rec { version = "5.15.10"; pyproject = true; - disabled = isPy27; - src = fetchPypi { pname = "PyQt5"; inherit version; diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix index 5de6872ce99e..f9b58f18bad5 100644 --- a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix +++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - isPy27, lib, setuptools, setuptools-declarative-requirements, @@ -13,7 +12,6 @@ buildPythonPackage rec { pname = "pytest-helpers-namespace"; version = "2021.12.29"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-tornasync/default.nix b/pkgs/development/python-modules/pytest-tornasync/default.nix index f66343a8823b..12d82c4ee36c 100644 --- a/pkgs/development/python-modules/pytest-tornasync/default.nix +++ b/pkgs/development/python-modules/pytest-tornasync/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytest, tornado, }: @@ -11,7 +10,6 @@ buildPythonPackage { pname = "pytest-tornasync"; version = "0.6.0.post2"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "eukaryote"; diff --git a/pkgs/development/python-modules/pyxl3/default.nix b/pkgs/development/python-modules/pyxl3/default.nix index 47f40cab27e0..f656f3dfa416 100644 --- a/pkgs/development/python-modules/pyxl3/default.nix +++ b/pkgs/development/python-modules/pyxl3/default.nix @@ -3,14 +3,12 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - isPy27, }: buildPythonPackage { pname = "pyxl3"; version = "1.4"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "gvanrossum"; diff --git a/pkgs/development/python-modules/reparser/default.nix b/pkgs/development/python-modules/reparser/default.nix index 5d35bc128083..b1749ded00e6 100644 --- a/pkgs/development/python-modules/reparser/default.nix +++ b/pkgs/development/python-modules/reparser/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchFromGitHub, }: @@ -10,8 +9,6 @@ buildPythonPackage rec { version = "1.4.3"; format = "setuptools"; - disabled = isPy27; - src = fetchFromGitHub { owner = "xmikos"; repo = "reparser"; diff --git a/pkgs/development/python-modules/roku/default.nix b/pkgs/development/python-modules/roku/default.nix index 5baae3a107e8..cd560fd2cca9 100644 --- a/pkgs/development/python-modules/roku/default.nix +++ b/pkgs/development/python-modules/roku/default.nix @@ -5,14 +5,12 @@ requests, pytest, flask, - isPy27, }: buildPythonPackage rec { version = "4.1"; format = "setuptools"; pname = "roku"; - disabled = isPy27; src = fetchFromGitHub { owner = "jcarbaugh"; diff --git a/pkgs/development/python-modules/rtmixer/default.nix b/pkgs/development/python-modules/rtmixer/default.nix index d2a83c7260ec..05a38a1ca7f3 100644 --- a/pkgs/development/python-modules/rtmixer/default.nix +++ b/pkgs/development/python-modules/rtmixer/default.nix @@ -1,7 +1,6 @@ { fetchFromGitHub, buildPythonPackage, - isPy27, setuptools, cython, portaudio, @@ -15,7 +14,6 @@ buildPythonPackage rec { pname = "rtmixer"; version = "0.1.7"; pyproject = true; - disabled = isPy27; src = fetchFromGitHub { owner = "spatialaudio"; diff --git a/pkgs/development/python-modules/sansio-multipart/default.nix b/pkgs/development/python-modules/sansio-multipart/default.nix index ef47ab77c7ed..aa12f71a01e7 100644 --- a/pkgs/development/python-modules/sansio-multipart/default.nix +++ b/pkgs/development/python-modules/sansio-multipart/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchPypi, }: @@ -9,8 +8,6 @@ buildPythonPackage rec { pname = "sansio-multipart"; version = "0.3"; - disabled = isPy27; - format = "setuptools"; src = fetchPypi { diff --git a/pkgs/development/python-modules/scikit-tda/default.nix b/pkgs/development/python-modules/scikit-tda/default.nix index aa36b958343c..f6a2cc54fcbf 100644 --- a/pkgs/development/python-modules/scikit-tda/default.nix +++ b/pkgs/development/python-modules/scikit-tda/default.nix @@ -15,14 +15,12 @@ kmapper, tadasets, pytest, - isPy27, }: buildPythonPackage rec { pname = "scikit-tda"; version = "1.1.1"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "scikit-tda"; diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix index 63968d773aee..60e3c961d0db 100644 --- a/pkgs/development/python-modules/segments/default.nix +++ b/pkgs/development/python-modules/segments/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, setuptools, regex, csvw, @@ -15,7 +14,6 @@ buildPythonPackage rec { pname = "segments"; version = "2.4.0"; pyproject = true; - disabled = isPy27; src = fetchFromGitHub { owner = "cldf"; diff --git a/pkgs/development/python-modules/sgmllib3k/default.nix b/pkgs/development/python-modules/sgmllib3k/default.nix index 3d488ca98eb0..d15858c59f03 100644 --- a/pkgs/development/python-modules/sgmllib3k/default.nix +++ b/pkgs/development/python-modules/sgmllib3k/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy27, pytestCheckHook, }: @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "1.0.0"; format = "setuptools"; - disabled = isPy27; - src = fetchPypi { inherit pname version; hash = "sha256-eGj7HIv6dkwaxWPTzzacOB0TJdNhJJM6cm8p/NqoEuk="; diff --git a/pkgs/development/python-modules/simpleaudio/default.nix b/pkgs/development/python-modules/simpleaudio/default.nix index 1518b29537ae..d0aa31dadddd 100644 --- a/pkgs/development/python-modules/simpleaudio/default.nix +++ b/pkgs/development/python-modules/simpleaudio/default.nix @@ -2,7 +2,6 @@ alsa-lib, buildPythonPackage, fetchFromGitHub, - isPy27, lib, }: @@ -10,7 +9,6 @@ buildPythonPackage rec { pname = "simpleaudio"; version = "1.0.4"; format = "setuptools"; - disabled = isPy27; src = fetchFromGitHub { owner = "hamiltron"; diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix index c85eb0c4ad81..d042bbde7d4f 100644 --- a/pkgs/development/python-modules/simpy/default.nix +++ b/pkgs/development/python-modules/simpy/default.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - isPy27, fetchPypi, setuptools, setuptools-scm, @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "4.1.1"; pyproject = true; - disabled = isPy27; - src = fetchPypi { inherit pname version; hash = "sha256-BtB1CniEsR4OjiDOC8fG1O1fF0PUVmlTQNE/3/lQAaY="; diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index fa0168b0337c..c7d4995fc1cc 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, callPackage, fetchPypi, - isPy27, pythonOlder, lib, cryptography, @@ -11,7 +10,6 @@ grpcio-tools, hadoop, pytestCheckHook, - python, setuptools, versioneer, }: @@ -77,8 +75,5 @@ buildPythonPackage rec { alexbiehl illustris ]; - problems = lib.optionalAttrs isPy27 { - broken.message = "${pname} not supported on ${python.executable}"; - }; }; } diff --git a/pkgs/development/python-modules/snapshot-restore-py/default.nix b/pkgs/development/python-modules/snapshot-restore-py/default.nix index bb478bc8d11c..be8456cc2d58 100644 --- a/pkgs/development/python-modules/snapshot-restore-py/default.nix +++ b/pkgs/development/python-modules/snapshot-restore-py/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytestCheckHook, setuptools, }: @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "1.0.0"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "aws"; repo = "snapshot-restore-py"; diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 4a7e62dee817..3f3fdb55ad07 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchPypi, - isPy27, setuptools, cffi, numpy, @@ -15,7 +14,6 @@ buildPythonPackage rec { pname = "sounddevice"; version = "0.5.3"; pyproject = true; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index aba070269087..591091073f8b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -2,14 +2,12 @@ lib, buildPythonPackage, fetchPypi, - isPy27, }: buildPythonPackage (finalAttrs: { pname = "sphinxcontrib-jsmath"; version = "1.0.1"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit (finalAttrs) pname version; diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index da92f50fbfb8..8a5a6b9fdbc9 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, deepmerge, fetchPypi, - isPy27, setuptools-scm, jsonschema, picobox, @@ -16,7 +15,6 @@ buildPythonPackage rec { pname = "sphinxcontrib-openapi"; version = "0.8.4"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/spiderpy/default.nix b/pkgs/development/python-modules/spiderpy/default.nix index 5f247cca2cdc..d62ea82b6759 100644 --- a/pkgs/development/python-modules/spiderpy/default.nix +++ b/pkgs/development/python-modules/spiderpy/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - isPy27, fetchFromGitHub, poetry-core, requests, @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "1.7.2"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "peternijssen"; repo = "spiderpy"; diff --git a/pkgs/development/python-modules/spinners/default.nix b/pkgs/development/python-modules/spinners/default.nix index 049894a49bb0..5b9df19c1368 100644 --- a/pkgs/development/python-modules/spinners/default.nix +++ b/pkgs/development/python-modules/spinners/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, fetchPypi, - isPy27, lib, }: @@ -9,7 +8,6 @@ buildPythonPackage rec { pname = "spinners"; version = "0.0.24"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/test-tube/default.nix b/pkgs/development/python-modules/test-tube/default.nix index a7c90aa2c73e..977b78e0080d 100644 --- a/pkgs/development/python-modules/test-tube/default.nix +++ b/pkgs/development/python-modules/test-tube/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, pytestCheckHook, future, imageio, @@ -17,8 +16,6 @@ buildPythonPackage rec { version = "0.628"; format = "setuptools"; - disabled = isPy27; - src = fetchFromGitHub { owner = "williamFalcon"; repo = "test-tube"; diff --git a/pkgs/development/python-modules/tokenize-rt/default.nix b/pkgs/development/python-modules/tokenize-rt/default.nix index 0133e47553c0..4dcf73be19fe 100644 --- a/pkgs/development/python-modules/tokenize-rt/default.nix +++ b/pkgs/development/python-modules/tokenize-rt/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, lib, fetchFromGitHub, - isPy27, setuptools, pytestCheckHook, }: @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "6.2.0"; pyproject = true; - disabled = isPy27; - src = fetchFromGitHub { owner = "asottile"; repo = "tokenize-rt"; diff --git a/pkgs/development/python-modules/update-checker/default.nix b/pkgs/development/python-modules/update-checker/default.nix index 54dc1c552357..f6100125a88a 100644 --- a/pkgs/development/python-modules/update-checker/default.nix +++ b/pkgs/development/python-modules/update-checker/default.nix @@ -3,14 +3,12 @@ buildPythonPackage, fetchPypi, requests, - isPy27, }: buildPythonPackage rec { pname = "update-checker"; version = "0.18.0"; format = "setuptools"; - disabled = isPy27; src = fetchPypi { pname = "update_checker"; diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 6b9a45b06fc0..5d60eff54efc 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy27, pytestCheckHook, pytest-cov-stub, setuptools, @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "3.1.1"; pyproject = true; - disabled = isPy27; - src = fetchPypi { inherit pname version; hash = "sha256-U0+zs1VmkoPrOVRYGTHl0dBx/OYdAp1Y8yGaXjpvDEE="; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f8b09738955a..2fe8b765a2a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8985,7 +8985,6 @@ self: super: with self; { p.overrideAttrs (super: { meta = super.meta // { outputsToInstall = [ "py" ]; - broken = super.meta.broken or isPy27; }; }) ) From 34bc09dca920b30054558948863441616cd4b069 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Mon, 4 May 2026 00:26:30 +0300 Subject: [PATCH 78/97] resholve: move python2-modules from oil to their folder --- pkgs/development/misc/resholve/default.nix | 3 - pkgs/development/misc/resholve/deps.nix | 78 ----------- pkgs/development/misc/resholve/oildev.nix | 123 ------------------ .../configargparse/default.nix | 28 ++++ .../python2-modules/oildev/default.nix | 115 ++++++++++++++++ .../python2-modules/sedparse/default.nix | 24 ++++ .../resholve/python2-modules/six/default.nix | 24 ++++ .../python2-modules/typing/default.nix | 24 ++++ .../misc/resholve/python2-packages.nix | 18 ++- pkgs/development/misc/resholve/resholve.nix | 19 +-- 10 files changed, 231 insertions(+), 225 deletions(-) delete mode 100644 pkgs/development/misc/resholve/deps.nix delete mode 100644 pkgs/development/misc/resholve/oildev.nix create mode 100644 pkgs/development/misc/resholve/python2-modules/configargparse/default.nix create mode 100644 pkgs/development/misc/resholve/python2-modules/oildev/default.nix create mode 100644 pkgs/development/misc/resholve/python2-modules/sedparse/default.nix create mode 100644 pkgs/development/misc/resholve/python2-modules/six/default.nix create mode 100644 pkgs/development/misc/resholve/python2-modules/typing/default.nix diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix index 3e790cb3983b..1582b64fc339 100644 --- a/pkgs/development/misc/resholve/default.nix +++ b/pkgs/development/misc/resholve/default.nix @@ -14,7 +14,6 @@ let }); callPackage = lib.callPackageWith pkgsBuildHost; source = callPackage ./source.nix { }; - deps = callPackage ./deps.nix { }; # not exposed in all-packages resholveBuildTimeOnly = removeKnownVulnerabilities resholve; in @@ -23,8 +22,6 @@ rec { resholve = ( callPackage ./resholve.nix { inherit (source) rSrc version; - inherit (deps.oil) oildev; - inherit (deps) configargparse; inherit resholve-utils; # used only in tests resholve = resholveBuildTimeOnly; diff --git a/pkgs/development/misc/resholve/deps.nix b/pkgs/development/misc/resholve/deps.nix deleted file mode 100644 index 24749d8f6063..000000000000 --- a/pkgs/development/misc/resholve/deps.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ - lib, - callPackage, - fetchFromGitHub, - fetchPypi, - ... -}: -let - python27 = callPackage ./python27.nix { }; -in -/* - Notes on specific dependencies: - - if/when python2.7 is removed from nixpkgs, this may need to figure - out how to build oil's vendored python2 -*/ - -rec { - oil = callPackage ./oildev.nix { - inherit six; - inherit typing; - }; - configargparse = python27.pkgs.buildPythonPackage rec { - pname = "configargparse"; - version = "1.5.3"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "bw2"; - repo = "ConfigArgParse"; - rev = "v${version}"; - sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz"; - }; - - doCheck = false; - - pythonImportsCheck = [ "configargparse" ]; - - meta = { - description = "Drop-in replacement for argparse"; - homepage = "https://github.com/bw2/ConfigArgParse"; - license = lib.licenses.mit; - }; - }; - six = python27.pkgs.buildPythonPackage rec { - pname = "six"; - version = "1.16.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"; - }; - - doCheck = false; - - meta = { - description = "Python 2 and 3 compatibility library"; - homepage = "https://pypi.org/project/six/"; - license = lib.licenses.mit; - }; - }; - typing = python27.pkgs.buildPythonPackage rec { - pname = "typing"; - version = "3.10.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"; - }; - - doCheck = false; - - meta = { - description = "Backport of typing module to Python versions older than 3.5"; - homepage = "https://docs.python.org/3/library/typing.html"; - license = lib.licenses.psfl; - }; - }; -} diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix deleted file mode 100644 index 9fe3b8ffeff2..000000000000 --- a/pkgs/development/misc/resholve/oildev.nix +++ /dev/null @@ -1,123 +0,0 @@ -{ - lib, - stdenv, - callPackage, - fetchFromGitHub, - makeWrapper, - re2c, - # oil deps - glibcLocales, - file, - six, - typing, -}: -let - python27 = callPackage ./python27.nix { }; -in - -{ - /* - Upstream isn't interested in packaging this as a library - (or accepting all of the patches we need to do so). - This creates one without disturbing upstream too much. - */ - oildev = python27.pkgs.buildPythonPackage rec { - pname = "oildev-unstable"; - version = "2024-02-26"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "oilshell"; - repo = "oil"; - # rev == present HEAD of release/0.20.0 - rev = "f730c79e2dcde4bc08e85a718951cfa42102bd01"; - hash = "sha256-HBj3Izh1gD63EzbgZ/9If5vihR5L2HhnyCyMah6rMg4="; - - /* - It's not critical to drop most of these; the primary target is - the vendored fork of Python-2.7.13, which is ~ 55M and over 3200 - files, dozens of which get interpreter script patches in fixup. - - Note: -f is necessary to keep it from being a pain to update - hash on rev updates. Command will fail w/o and not print hash. - */ - postFetch = '' - rm -rf $out/{Python-2.7.13,metrics,py-yajl,rfc,gold,web,testdata,services,demo} - ''; - }; - - # patch to support a python package, pass tests on macOS, drop deps, etc. - patchSrc = fetchFromGitHub { - owner = "abathur"; - repo = "nix-py-dev-oil"; - rev = "v0.20.0.0"; - hash = "sha256-qoA54rnzAdnFZ3k4kRzQWEdgtEjraCT5+NFw8AWnRDk="; - }; - - patches = [ - "${patchSrc}/0001-add_setup_py.patch" - "${patchSrc}/0002-add_MANIFEST_in.patch" - "${patchSrc}/0006-disable_failing_libc_tests.patch" - "${patchSrc}/0007-namespace_via_init.patch" - "${patchSrc}/0009-avoid_nix_arch64_darwin_toolchain_bug.patch" - "${patchSrc}/0010-disable-line-input.patch" - "${patchSrc}/0011-disable-fanos.patch" - "${patchSrc}/0012-disable-doc-cmark.patch" - "${patchSrc}/0013-fix-pyverify.patch" - "${patchSrc}/0015-fix-compiled-extension-import-paths.patch" - ]; - - configureFlags = [ - "--without-readline" - ]; - - nativeBuildInputs = [ - re2c - file - makeWrapper - ]; - - propagatedBuildInputs = [ - six - typing - ]; - - doCheck = true; - - preBuild = '' - build/py.sh all - ''; - - postPatch = '' - patchShebangs asdl build core doctools frontend pyext oil_lang ysh - rm cpp/stdlib.h # keep modules from finding the wrong stdlib? - # work around hard parse failure documented in oilshell/oil#1468 - substituteInPlace osh/cmd_parse.py --replace 'elif self.c_id == Id.Op_LParen' 'elif False' - ''; - - # See earlier note on glibcLocales TODO: verify needed? - LOCALE_ARCHIVE = lib.optionalString ( - stdenv.buildPlatform.libc == "glibc" - ) "${glibcLocales}/lib/locale/locale-archive"; - - # not exhaustive; sample what resholve uses as a sanity check - pythonImportsCheck = [ - "oil" - "oil.asdl" - "oil.core" - "oil.frontend" - "oil._devbuild" - "oil._devbuild.gen.id_kind_asdl" - "oil._devbuild.gen.syntax_asdl" - "oil.osh" - "oil.tools.ysh_ify" - ]; - - meta = { - license = with lib.licenses; [ - psfl # Includes a portion of the python interpreter and standard library - asl20 # Licence for Oil itself - ]; - }; - }; -} diff --git a/pkgs/development/misc/resholve/python2-modules/configargparse/default.nix b/pkgs/development/misc/resholve/python2-modules/configargparse/default.nix new file mode 100644 index 000000000000..b05dee7079c2 --- /dev/null +++ b/pkgs/development/misc/resholve/python2-modules/configargparse/default.nix @@ -0,0 +1,28 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, +}: + +buildPythonPackage rec { + pname = "configargparse"; + version = "1.5.3"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "bw2"; + repo = "ConfigArgParse"; + rev = "v${version}"; + sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz"; + }; + + doCheck = false; + + pythonImportsCheck = [ "configargparse" ]; + + meta = { + description = "Drop-in replacement for argparse"; + homepage = "https://github.com/bw2/ConfigArgParse"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/misc/resholve/python2-modules/oildev/default.nix b/pkgs/development/misc/resholve/python2-modules/oildev/default.nix new file mode 100644 index 000000000000..e8cf4e5df6f2 --- /dev/null +++ b/pkgs/development/misc/resholve/python2-modules/oildev/default.nix @@ -0,0 +1,115 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + makeWrapper, + re2c, + glibcLocales, + file, + six, + typing, +}: + +# Upstream isn't interested in packaging this as a library +# (or accepting all of the patches we need to do so). +# This creates one without disturbing upstream too much. +buildPythonPackage rec { + pname = "oildev-unstable"; + version = "2024-02-26"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "oilshell"; + repo = "oil"; + # rev == present HEAD of release/0.20.0 + rev = "f730c79e2dcde4bc08e85a718951cfa42102bd01"; + hash = "sha256-HBj3Izh1gD63EzbgZ/9If5vihR5L2HhnyCyMah6rMg4="; + + /* + It's not critical to drop most of these; the primary target is + the vendored fork of Python-2.7.13, which is ~ 55M and over 3200 + files, dozens of which get interpreter script patches in fixup. + + Note: -f is necessary to keep it from being a pain to update + hash on rev updates. Command will fail w/o and not print hash. + */ + postFetch = '' + rm -rf $out/{Python-2.7.13,metrics,py-yajl,rfc,gold,web,testdata,services,demo} + ''; + }; + + # patch to support a python package, pass tests on macOS, drop deps, etc. + patchSrc = fetchFromGitHub { + owner = "abathur"; + repo = "nix-py-dev-oil"; + rev = "v0.20.0.0"; + hash = "sha256-qoA54rnzAdnFZ3k4kRzQWEdgtEjraCT5+NFw8AWnRDk="; + }; + + patches = [ + "${patchSrc}/0001-add_setup_py.patch" + "${patchSrc}/0002-add_MANIFEST_in.patch" + "${patchSrc}/0006-disable_failing_libc_tests.patch" + "${patchSrc}/0007-namespace_via_init.patch" + "${patchSrc}/0009-avoid_nix_arch64_darwin_toolchain_bug.patch" + "${patchSrc}/0010-disable-line-input.patch" + "${patchSrc}/0011-disable-fanos.patch" + "${patchSrc}/0012-disable-doc-cmark.patch" + "${patchSrc}/0013-fix-pyverify.patch" + "${patchSrc}/0015-fix-compiled-extension-import-paths.patch" + ]; + + configureFlags = [ + "--without-readline" + ]; + + nativeBuildInputs = [ + re2c + file + makeWrapper + ]; + + propagatedBuildInputs = [ + six + typing + ]; + + doCheck = true; + + preBuild = '' + build/py.sh all + ''; + + postPatch = '' + patchShebangs asdl build core doctools frontend pyext oil_lang ysh + rm cpp/stdlib.h # keep modules from finding the wrong stdlib? + # work around hard parse failure documented in oilshell/oil#1468 + substituteInPlace osh/cmd_parse.py --replace 'elif self.c_id == Id.Op_LParen' 'elif False' + ''; + + # See earlier note on glibcLocales TODO: verify needed? + LOCALE_ARCHIVE = lib.optionalString ( + stdenv.buildPlatform.libc == "glibc" + ) "${glibcLocales}/lib/locale/locale-archive"; + + # not exhaustive; sample what resholve uses as a sanity check + pythonImportsCheck = [ + "oil" + "oil.asdl" + "oil.core" + "oil.frontend" + "oil._devbuild" + "oil._devbuild.gen.id_kind_asdl" + "oil._devbuild.gen.syntax_asdl" + "oil.osh" + "oil.tools.ysh_ify" + ]; + + meta = { + license = with lib.licenses; [ + psfl # Includes a portion of the python interpreter and standard library + asl20 # Licence for Oil itself + ]; + }; +} diff --git a/pkgs/development/misc/resholve/python2-modules/sedparse/default.nix b/pkgs/development/misc/resholve/python2-modules/sedparse/default.nix new file mode 100644 index 000000000000..3426d25d23a0 --- /dev/null +++ b/pkgs/development/misc/resholve/python2-modules/sedparse/default.nix @@ -0,0 +1,24 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, +}: + +buildPythonPackage { + pname = "sedparse"; + version = "0.1.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "aureliojargas"; + repo = "sedparse"; + rev = "0.1.2"; + hash = "sha256-Q17A/oJ3GZbdSK55hPaMdw85g43WhTW9tuAuJtDfHHU="; + }; + + meta = { + description = "Python port of GNU sed's parser"; + homepage = "https://github.com/aureliojargas/sedparse"; + license = lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/development/misc/resholve/python2-modules/six/default.nix b/pkgs/development/misc/resholve/python2-modules/six/default.nix new file mode 100644 index 000000000000..951c42c107d1 --- /dev/null +++ b/pkgs/development/misc/resholve/python2-modules/six/default.nix @@ -0,0 +1,24 @@ +{ + lib, + buildPythonPackage, + fetchPypi, +}: + +buildPythonPackage rec { + pname = "six"; + version = "1.16.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"; + }; + + doCheck = false; + + meta = { + description = "Python 2 and 3 compatibility library"; + homepage = "https://pypi.org/project/six/"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/misc/resholve/python2-modules/typing/default.nix b/pkgs/development/misc/resholve/python2-modules/typing/default.nix new file mode 100644 index 000000000000..d26e5e2da706 --- /dev/null +++ b/pkgs/development/misc/resholve/python2-modules/typing/default.nix @@ -0,0 +1,24 @@ +{ + lib, + buildPythonPackage, + fetchPypi, +}: + +buildPythonPackage rec { + pname = "typing"; + version = "3.10.0.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"; + }; + + doCheck = false; + + meta = { + description = "Backport of typing module to Python versions older than 3.5"; + homepage = "https://docs.python.org/3/library/typing.html"; + license = lib.licenses.psfl; + }; +} diff --git a/pkgs/development/misc/resholve/python2-packages.nix b/pkgs/development/misc/resholve/python2-packages.nix index 733e6cadd7c3..45e066d3311c 100644 --- a/pkgs/development/misc/resholve/python2-packages.nix +++ b/pkgs/development/misc/resholve/python2-packages.nix @@ -1,6 +1,7 @@ -# Extension with Python 2 packages that is overlaid on top -# of the Python 3 packages set. This way, Python 2+3 compatible -# packages can still be used. +# Python 2 overlay applied to resholve's local python27 package set. +# Provides the bootstrap toolchain (bootstrapped-pip/pip/setuptools/wheel) +# plus resholve's own python2 build dependencies, kept here so all of +# resholve's python2 surface lives in one place. self: super: @@ -14,4 +15,15 @@ with super; setuptools = callPackage ./python2-modules/setuptools { }; wheel = callPackage ./python2-modules/wheel { }; + + # resholve build deps + configargparse = callPackage ./python2-modules/configargparse { }; + + six = callPackage ./python2-modules/six { }; + + typing = callPackage ./python2-modules/typing { }; + + oildev = callPackage ./python2-modules/oildev { }; + + sedparse = callPackage ./python2-modules/sedparse { }; } diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index 823216ba800a..67200729d4ef 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -1,12 +1,9 @@ { lib, callPackage, - fetchFromGitHub, installShellFiles, rSrc, version, - oildev, - configargparse, gawk, binlore, resholve, @@ -15,20 +12,6 @@ let python27 = callPackage ./python27.nix { }; in -let - sedparse = python27.pkgs.buildPythonPackage { - pname = "sedparse"; - version = "0.1.2"; - format = "setuptools"; - src = fetchFromGitHub { - owner = "aureliojargas"; - repo = "sedparse"; - rev = "0.1.2"; - hash = "sha256-Q17A/oJ3GZbdSK55hPaMdw85g43WhTW9tuAuJtDfHHU="; - }; - }; - -in python27.pkgs.buildPythonApplication { pname = "resholve"; inherit version; @@ -36,7 +19,7 @@ python27.pkgs.buildPythonApplication { nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python27.pkgs; [ oildev configargparse sedparse From 3bc9c0ccdf18ba8c4c31a78ad1edfa7e78427c92 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 May 2026 12:16:15 +0000 Subject: [PATCH 79/97] dwproton-bin: dwproton-11.0-2 -> dwproton-11.0-3 --- pkgs/by-name/dw/dwproton-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dw/dwproton-bin/package.nix b/pkgs/by-name/dw/dwproton-bin/package.nix index 88c3abc435c1..cf51cb32d1e4 100644 --- a/pkgs/by-name/dw/dwproton-bin/package.nix +++ b/pkgs/by-name/dw/dwproton-bin/package.nix @@ -11,11 +11,11 @@ proton-ge-bin.overrideAttrs ( inherit steamDisplayName; pname = "dwproton-bin"; - version = "dwproton-11.0-2"; + version = "dwproton-11.0-3"; src = fetchzip { url = "https://dawn.wine/dawn-winery/dwproton/releases/download/${finalAttrs.version}/${finalAttrs.version}-x86_64.tar.xz"; - hash = "sha256-3AxBr8fQh4bbAsdSSZuyQR2GOz78vdhC6jJbLmiYEXY="; + hash = "sha256-e/YzKvwe30KveLHRUsntKDwzdEbr7a3Wfkqe/pu93WE="; }; preFixup = '' From aab86321db4056d983eb2bec72450e125f60f269 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Mon, 4 May 2026 16:56:39 +0300 Subject: [PATCH 80/97] doc/python: drop python2 references from manual section MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove python27Packages, python2Packages, and pythonPackages alias mentions; drop the "python refers to CPython 2.7" sentence and the Python 2 namespace-collision note; strip Python-2-only inline comments from the venvShellHook example. Keep all pypy2/pypy27 references — pypy27 stays defined inside pythonInterpreters as the bootstrap for pypy3. --- doc/languages-frameworks/python.section.md | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index eeecb640d966..957037b95f4f 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -48,7 +48,6 @@ Based on the packages defined in `pkgs/top-level/python-packages.nix` an attribute set is created for each available Python interpreter. The available sets are -* `pkgs.python27Packages` * `pkgs.python3Packages` * `pkgs.python311Packages` * `pkgs.python312Packages` @@ -60,9 +59,7 @@ sets are and the aliases -* `pkgs.python2Packages` pointing to `pkgs.python27Packages` * `pkgs.python3Packages` pointing to `pkgs.python313Packages` -* `pkgs.pythonPackages` pointing to `pkgs.python2Packages` * `pkgs.pypy2Packages` pointing to `pkgs.pypy27Packages` * `pkgs.pypy3Packages` pointing to `pkgs.pypy310Packages` * `pkgs.pypyPackages` pointing to `pkgs.pypy2Packages` @@ -573,9 +570,6 @@ In contrast to [`python.buildEnv`](#python.buildenv-function), [`python.withPack more advanced options such as `ignoreCollisions = true` or `postBuild`. If you need them, you have to use [`python.buildEnv`](#python.buildenv-function). -Python 2 namespace packages may provide `__init__.py` that collide. In that case -[`python.buildEnv`](#python.buildenv-function) should be used with `ignoreCollisions = true`. - #### Setup hooks {#setup-hooks} The following are setup hooks specifically for Python packages. Most of these @@ -627,10 +621,9 @@ buildPythonPackage.override { stdenv = customStdenv; } { Several versions of the Python interpreter are available on Nix, as well as a high amount of packages. The attribute `python3` refers to the default -interpreter, which is currently CPython 3.13. The attribute `python` refers to -CPython 2.7 for backwards compatibility. It is also possible to refer to -specific versions, e.g., `python313` refers to CPython 3.13, and `pypy` refers to -the default PyPy interpreter. +interpreter, which is currently CPython 3.13. It is also possible to refer to +specific versions, e.g., `python313` refers to CPython 3.13, and `pypy` refers +to the default PyPy interpreter. Python is used a lot, and in different ways. This affects also how it is packaged. In the case of Python on Nix, an important distinction is made between @@ -1910,9 +1903,8 @@ pkgs.mkShell rec { } ``` -In case the supplied venvShellHook is insufficient, or when Python 2 support is -needed, you can define your own shell hook and adapt to your needs like in the -following example: +In case the supplied venvShellHook is insufficient, you can define your own +shell hook and adapt to your needs like in the following example: ```nix with import { }; @@ -1925,8 +1917,6 @@ pkgs.mkShell rec { name = "impurePythonEnv"; buildInputs = [ pythonPackages.python - # Needed when using python 2.7 - # pythonPackages.virtualenv # ... ]; @@ -1939,8 +1929,6 @@ pkgs.mkShell rec { echo "Skipping venv creation, '${venvDir}' already exists" else echo "Creating new venv environment in path: '${venvDir}'" - # Note that the module venv was only introduced in python 3, so for 2.7 - # this needs to be replaced with a call to virtualenv ${pythonPackages.python.interpreter} -m venv "${venvDir}" fi From e28fcb5f87883f3ffb6c1d395b1f36713d823480 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Mon, 25 May 2026 10:52:15 +0300 Subject: [PATCH 81/97] nixos/doc: note python2 removal in 26.11 release notes --- nixos/doc/manual/release-notes/rl-2611.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index f029f3e9032f..798e204a578d 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -18,6 +18,8 @@ - `boot.vesa` has been removed. It was deprecated in 2020 because Xorg now works better with kernel modesetting. If you still need the legacy VESA 800x600 fallback, set `boot.kernelParams = [ "vga=0x317" "nomodeset" ];` directly. +- Python 2 has been removed from the top-level package set, as it is long past end-of-life. The `python2`, `python27`, `python2Full`, `python27Full`, `python2Packages`, and `python27Packages` attributes, along with the legacy `python`, `pythonFull`, and `pythonPackages` aliases, now throw an error directing you to `python3`. The `isPy2` and `isPy27` package flags have been removed accordingly. The only remaining Python 2 interpreter is vendored inside the `resholve` package for its `oil` dependency and is not exposed for general use. + ## Other Notable Changes {#sec-release-26.11-notable-changes} From ad2e2960b48ba270262116b4c9cacbb4d928331a Mon Sep 17 00:00:00 2001 From: ash Date: Sun, 31 May 2026 13:20:05 +0100 Subject: [PATCH 82/97] notesnook: remove keysmashes from maintainers --- pkgs/by-name/no/notesnook/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/no/notesnook/package.nix b/pkgs/by-name/no/notesnook/package.nix index 3733c8d2fe55..e8cc52f57f8d 100644 --- a/pkgs/by-name/no/notesnook/package.nix +++ b/pkgs/by-name/no/notesnook/package.nix @@ -53,9 +53,7 @@ let ''; homepage = "https://notesnook.com"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ - keysmashes - ]; + maintainers = [ ]; platforms = [ "x86_64-linux" "aarch64-linux" From b0506757dbf7cfc8609332801b0f581a05d1b80f Mon Sep 17 00:00:00 2001 From: ash Date: Sun, 31 May 2026 13:21:24 +0100 Subject: [PATCH 83/97] hushboard: remove keysmashes from maintainers --- pkgs/by-name/hu/hushboard/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/hu/hushboard/package.nix b/pkgs/by-name/hu/hushboard/package.nix index 0dbcae8cdcd1..03707922ca67 100644 --- a/pkgs/by-name/hu/hushboard/package.nix +++ b/pkgs/by-name/hu/hushboard/package.nix @@ -85,6 +85,6 @@ python3Packages.buildPythonApplication { description = "Mute your microphone while typing"; mainProgram = "hushboard"; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ keysmashes ]; + maintainers = [ ]; }; } From 9b9e0a021a032012a9f4fa072fcc44a1a54f8ef1 Mon Sep 17 00:00:00 2001 From: ccicnce113424 Date: Mon, 25 May 2026 21:15:13 +0800 Subject: [PATCH 84/97] nixos/kmscon: RFC42 treatment, support version 10.0.0 This commit includes changes from #483195, #523569, and #523955. --- nixos/modules/services/ttys/kmscon.nix | 231 +++++++++++++++---------- nixos/tests/kmscon.nix | 22 ++- 2 files changed, 155 insertions(+), 98 deletions(-) diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix index 85b47e1b62ce..931fac1123c6 100644 --- a/nixos/modules/services/ttys/kmscon.nix +++ b/nixos/modules/services/ttys/kmscon.nix @@ -2,6 +2,7 @@ config, pkgs, lib, + utils, ... }: let @@ -10,8 +11,6 @@ let mkEnableOption mkOption mkPackageOption - optional - optionals types ; @@ -22,7 +21,12 @@ let configDir = pkgs.writeTextFile { name = "kmscon-config"; destination = "/kmscon.conf"; - text = cfg.extraConfig; + text = + let + mkKeyValue = + k: v: if lib.isBool v then (lib.optionalString (!v) "no-") + k else "${k}=${toString v}"; + in + lib.generators.toKeyValue { inherit mkKeyValue; } (lib.filterAttrs (_: v: v != null) cfg.config); }; baseLoginOptions = "-p"; @@ -55,58 +59,68 @@ in Check `services.getty.autologinUser` instead. '') + (lib.mkRemovedOptionModule [ "services" "kmscon" "fonts" ] '' + `services.kmscon.fonts` is removed. + + Add your font to `fonts.packages` and configure it with + `services.kmscon.config.font-name` instead. + '') + (lib.mkRemovedOptionModule [ "services" "kmscon" "extraConfig" ] '' + `services.kmscon.extraConfig` is removed. + + Add your configurations to the new `services.kmscon.config` instead. + '') + (lib.mkRenamedOptionModule [ "services" "kmscon" "term" ] [ "services" "kmscon" "config" "term" ]) + (lib.mkRenamedOptionModule + [ "services" "kmscon" "hwRender" ] + [ "services" "kmscon" "config" "hwaccel" ] + ) ]; options = { services.kmscon = { enable = mkEnableOption '' - Use kmscon instead of autovt. + use kmscon instead of autovt. Kmscon is a simple terminal emulator based on linux kernel mode setting (KMS). - It is an attempt to replace the in-kernel VT implementation with a userspace console. + It is an attempt to replace the in-kernel VT implementation with a userspace console ''; package = mkPackageOption pkgs "kmscon" { }; - hwRender = mkEnableOption "3D hardware acceleration to render the console"; + useXkbConfig = mkEnableOption '' + configure keymap from xserver keyboard settings. - fonts = mkOption { - description = "Fonts used by kmscon, in order of priority."; - default = null; - example = lib.literalExpression ''[ { name = "Source Code Pro"; package = pkgs.source-code-pro; } ]''; - type = - with types; - let - fontType = submodule { - options = { - name = mkOption { - type = str; - description = "Font name, as used by fontconfig."; - }; - package = mkOption { - type = package; - description = "Package providing the font."; - }; - }; + If enabled, configurations under `services.xserver.xkb` will be injected into kmscon's configuration + ''; + + config = mkOption { + description = '' + Configuration for kmscon. See {manpage}`kmscon.conf(5)` + for available options. + ''; + default = { }; + type = types.submodule { + freeformType = + with types; + attrsOf (oneOf [ + bool + int + str + ]); + options = { + hwaccel = mkEnableOption "use hardware acceleration for rendering"; + libseat = mkOption { + type = types.bool; + default = true; + description = '' + Whether to use libseat for session management. + This is the default for kmscon newer than 10.0.0 and prevents + launching another GUI from kmscon by `kmscon-launch-gui`. + ''; }; - in - nullOr (nonEmptyListOf fontType); - }; - - useXkbConfig = mkEnableOption "configure keymap from xserver keyboard settings."; - - term = mkOption { - description = "Value for the TERM environment variable."; - type = types.nullOr types.str; - default = null; - example = "xterm-256color"; - }; - - extraConfig = mkOption { - description = "Extra contents of the kmscon.conf file."; - type = types.lines; - default = ""; - example = "font-size=14"; + }; + }; }; extraOptions = mkOption { @@ -124,30 +138,54 @@ in assertion = gettyCfg.loginOptions == null; message = "services.getty.loginOptions is not supported when services.kmscon is enabled."; } + { + assertion = (cfg.config ? font-name) -> config.fonts.fontconfig.enable; + message = "Font configuration for kmscon requires fontconfig to be enabled."; + } + { + assertion = cfg.config.hwaccel -> config.hardware.graphics.enable; + message = "Hardware acceleration for kmscon requires `hardware.graphics.enable` to be true."; + } ]; + services.kmscon.config = lib.mkIf cfg.useXkbConfig ( + lib.mapAttrs (_: lib.mkDefault) ( + lib.filterAttrs (_: v: v != "") { + xkb-layout = config.services.xserver.xkb.layout; + xkb-model = config.services.xserver.xkb.model; + xkb-options = config.services.xserver.xkb.options; + xkb-variant = config.services.xserver.xkb.variant; + } + ) + ); + environment.systemPackages = [ cfg.package ]; systemd.packages = [ cfg.package ]; systemd.services."kmsconvt@" = { - serviceConfig.ExecStart = [ - "" # override upstream default with an empty ExecStart - (builtins.concatStringsSep " " ( - [ - "${cfg.package}/bin/kmscon" - "--configdir" - configDir - "--vt=%I" - "--no-switchvt" - "--login" - ] - ++ lib.optional (cfg.extraOptions != "") cfg.extraOptions - ++ [ - "--" - loginScript - ] - )) - ]; + serviceConfig = { + User = lib.mkIf (!cfg.config.libseat) ""; + PAMName = lib.mkIf (!cfg.config.libseat) ""; + Environment = [ "XKB_CONFIG_ROOT=${config.services.xserver.xkb.dir}" ]; + ExecStart = [ + "" # override upstream default with an empty ExecStart + (builtins.concatStringsSep " " ( + [ + "${cfg.package}/bin/kmscon" + "--configdir" + configDir + "--vt=%I" + "--no-switchvt" + "--login" + ] + ++ lib.optional (cfg.extraOptions != "") cfg.extraOptions + ++ [ + "--" + loginScript + ] + )) + ]; + }; restartIfChanged = false; # logind spawns autovt@ttyN.service on VT switch; point it at kmscon @@ -156,40 +194,55 @@ in # tty1 is special: logind does not spawn autovt@tty1, it expects a static # pull-in via getty.target. With getty@ suppressed, we must replace it. - systemd.services."getty.target".wants = lib.mkIf (!config.services.displayManager.enable) [ + systemd.targets.getty.wants = lib.mkIf (!config.services.displayManager.enable) [ "kmsconvt@tty1.service" ]; systemd.suppressedSystemUnits = [ "getty@.service" ]; - services.kmscon.extraConfig = lib.concatLines ( - optionals cfg.useXkbConfig ( - lib.mapAttrsToList (n: v: "xkb-${n}=${v}") ( - lib.filterAttrs ( - n: v: - builtins.elem n [ - "layout" - "model" - "options" - "variant" - ] - && v != "" - ) config.services.xserver.xkb - ) - ) - ++ optionals cfg.hwRender [ - "drm" - "hwaccel" - ] - ++ optional (cfg.fonts != null) "font-name=${lib.concatMapStringsSep ", " (f: f.name) cfg.fonts}" - ++ optional (cfg.term != null) "term=${cfg.term}" - ); - - hardware.graphics.enable = mkIf cfg.hwRender true; - - fonts = mkIf (cfg.fonts != null) { - fontconfig.enable = true; - packages = map (f: f.package) cfg.fonts; + security.pam.services.kmscon = lib.mkIf cfg.config.libseat { + useDefaultRules = false; + rules = { + auth = utils.pam.autoOrderRules [ + { + name = "permit"; + control = "required"; + modulePath = "${config.security.pam.package}/lib/security/pam_permit.so"; + } + ]; + account = utils.pam.autoOrderRules [ + { + name = "unix"; + control = "required"; + modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + } + ]; + session = utils.pam.autoOrderRules [ + { + name = "env"; + control = "required"; + modulePath = "${config.security.pam.package}/lib/security/pam_env.so"; + settings = { + conffile = "/etc/pam/environment"; + readenv = 0; + }; + } + { + name = "unix"; + control = "required"; + modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + } + { + name = "systemd"; + control = "optional"; + modulePath = "${config.systemd.package}/lib/security/pam_systemd.so"; + settings = { + type = "tty"; + class = "greeter"; + }; + } + ]; + }; }; }; diff --git a/nixos/tests/kmscon.nix b/nixos/tests/kmscon.nix index f0fb27d9b0d5..130db8f0bc4a 100644 --- a/nixos/tests/kmscon.nix +++ b/nixos/tests/kmscon.nix @@ -14,17 +14,21 @@ services.getty.autologinUser = "alice"; + hardware.graphics.enable = true; + + fonts = { + fontconfig.enable = true; + packages = [ pkgs.nerd-fonts.jetbrains-mono ]; + }; + services.kmscon = { enable = true; - hwRender = true; - fonts = [ - { - name = "JetBrainsMono Nerd Font"; - package = pkgs.nerd-fonts.jetbrains-mono; - } - ]; - term = "xterm-256color"; package = pkgs.kmscon; + config = { + font-name = "JetBrainsMono Nerd Font"; + hwaccel = true; + term = "kmscon"; + }; }; }; @@ -39,7 +43,7 @@ machine.send_chars("echo $TERM | tee /tmp/term.txt\n") machine.wait_until_succeeds("test -s /tmp/term.txt") term = machine.succeed("cat /tmp/term.txt").strip() - assert term == "xterm-256color", f"Unexpected TERM value: {term!r}" + assert term == "kmscon", f"Unexpected TERM value: {term!r}" machine.screenshot("tty.png") ''; From a23a846fffb7a1f6a410cba2f43d9e417dc1259e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 31 May 2026 12:36:34 +0000 Subject: [PATCH 85/97] adguardian: enable __structuredAttrs --- pkgs/by-name/ad/adguardian/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ad/adguardian/package.nix b/pkgs/by-name/ad/adguardian/package.nix index 4cb21d957dcd..dc17cd128191 100644 --- a/pkgs/by-name/ad/adguardian/package.nix +++ b/pkgs/by-name/ad/adguardian/package.nix @@ -7,6 +7,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "adguardian"; version = "1.6.1"; + __structuredAttrs = true; src = fetchFromGitHub { owner = "Lissy93"; From ed1de9a708adc99e103e647b217e99b081741314 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 31 May 2026 14:38:22 +0200 Subject: [PATCH 86/97] python3Packages.aioesphomeapi: add version compat note Especially major versions contain API breakage and we always require a compatible home-assistant version. Not all API surfaces are being exercised in home-assistant tests, so don't fool yourself by nixpkgs-review not revealing any breakages. --- pkgs/development/python-modules/aioesphomeapi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 68331992f98a..11665de8a98e 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage (finalAttrs: { pname = "aioesphomeapi"; - version = "44.23.0"; + version = "44.23.0"; # must track the major version that home-assistant pins pyproject = true; src = fetchFromGitHub { From 5230f3e0dc760a0d3daa66bf7df8061b756cda43 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 31 May 2026 14:42:06 +0200 Subject: [PATCH 87/97] python3Packages.aioesphomeapi: 44.23.0 -> 44.24.1 https://github.com/esphome/aioesphomeapi/releases/tag/v44.24.1 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 11665de8a98e..dee8b59cae21 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,14 +26,14 @@ buildPythonPackage (finalAttrs: { pname = "aioesphomeapi"; - version = "44.23.0"; # must track the major version that home-assistant pins + version = "44.24.1"; # must track the major version that home-assistant pins pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "aioesphomeapi"; tag = "v${finalAttrs.version}"; - hash = "sha256-mKk4NO44mVTV5Fe8oDhQYcNp8V1OLsPt4xk+kztXwrM="; + hash = "sha256-D2MJISyHz4s0Rk6wGMrYVJHfvA/Xbw2UEp2KqTqS2nA="; }; postPatch = '' From 5f81bb887c4dda891e644d8abed1a7064145f432 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 May 2026 12:48:43 +0000 Subject: [PATCH 88/97] terraform-providers.okta_okta: 6.10.0 -> 6.11.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 66ade5f84158..95a3ac42e372 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1013,13 +1013,13 @@ "vendorHash": "sha256-/4mktOn7qjWIkpyqeEW4vzY0w0pG+0qx7KRYBkE1IkQ=" }, "okta_okta": { - "hash": "sha256-Skp7GSfQSTBLOFoGlU3/TmzMqyZ8j7qYzlyuBYzBiB4=", + "hash": "sha256-3zuD+R1fUAFJ3pvzzHmN92RGGiWLYpnGOJXSsv89Les=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v6.10.0", + "rev": "v6.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-0NaqVCibwiK7WY6hIFGd2kB/okyh6ZsZ+BAe5mGP38A=" + "vendorHash": "sha256-/IbzilmyVTZh7qWogtXd+/Y7UJdjsQaf7Yjhi1fU1Vc=" }, "oktadeveloper_oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", From 82e8d81147f9cc8921750e2fb5811830a557493a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 31 May 2026 13:00:42 +0000 Subject: [PATCH 89/97] fahclient: 8.5.3 -> 8.5.6 --- pkgs/by-name/fa/fahclient/package.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/fa/fahclient/package.nix b/pkgs/by-name/fa/fahclient/package.nix index 3d5ffd2a41d4..507294632b58 100644 --- a/pkgs/by-name/fa/fahclient/package.nix +++ b/pkgs/by-name/fa/fahclient/package.nix @@ -6,7 +6,7 @@ openssl, re2, libevent, - git, + gitMinimal, versionCheckHook, zlib, expat, @@ -16,30 +16,32 @@ }: let pname = "fah-client"; - version = "8.5.3"; + version = "8.5.6"; cbangSrc = fetchFromGitHub { owner = "cauldrondevelopmentllc"; repo = "cbang"; tag = "bastet-v${version}"; - hash = "sha256-RU13qT9UQ1uNsRNBaEGSWTgNmE3f72veabl2OmKK6Z0="; + hash = "sha256-oh3q/gmAKx8BHoaw6Dxkd0GoxYyJ6is8uCKcivQVv2g="; }; fah-client = stdenv.mkDerivation { inherit pname version; + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitHub { owner = "FoldingAtHome"; repo = "fah-client-bastet"; tag = "v${version}"; - hash = "sha256-PBguylWnYU5iTzrjWA1B5Iwb57JpoWGPSpjgNJP3aoI="; + hash = "sha256-B5h2eXSCvYG5juNkBRBh+KUsm26O9JTI1S7yKkHgZ7c="; }; nativeBuildInputs = [ - scons - re2 + gitMinimal libevent - git + re2 + scons ]; buildInputs = [ openssl ]; From 95aad17dc93eb4c30fdb0104312c59facfd13cc3 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 30 May 2026 19:37:23 +0200 Subject: [PATCH 90/97] mplayer: fix build with structuredAttrs Entries in configureFlags should be single flags, not multiple space separated flags per string. --- pkgs/applications/video/mplayer/default.nix | 79 +++++++++++++++++---- 1 file changed, 64 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index b087115ccf6d..1c7381df80f7 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -180,7 +180,20 @@ stdenv.mkDerivation { configureFlags = [ "--enable-freetype" (if fontconfigSupport then "--enable-fontconfig" else "--disable-fontconfig") - (if x11Support then "--enable-x11 --enable-gl" else "--disable-x11 --disable-gl") + ] + ++ ( + if x11Support then + [ + "--enable-x11" + "--enable-gl" + ] + else + [ + "--disable-x11" + "--disable-gl" + ] + ) + ++ [ (if xineramaSupport then "--enable-xinerama" else "--disable-xinerama") (if xvSupport then "--enable-xv" else "--disable-xv") (if alsaSupport then "--enable-alsa" else "--disable-alsa") @@ -191,25 +204,61 @@ stdenv.mkDerivation { (if bluraySupport then "--enable-bluray" else "--disable-bluray") (if amrSupport then "--enable-libopencore_amrnb" else "--disable-libopencore_amrnb") (if cacaSupport then "--enable-caca" else "--disable-caca") - ( - if lameSupport then - "--enable-mp3lame --disable-mp3lame-lavc" - else - "--disable-mp3lame --enable-mp3lame-lavc" - ) + ] + ++ ( + if lameSupport then + [ + "--enable-mp3lame" + "--disable-mp3lame-lavc" + ] + else + [ + "--disable-mp3lame" + "--enable-mp3lame-lavc" + ] + ) + ++ [ (if speexSupport then "--enable-speex" else "--disable-speex") (if theoraSupport then "--enable-theora" else "--disable-theora") - (if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc") + ] + ++ ( + if x264Support then + [ + "--enable-x264" + "--disable-x264-lavc" + ] + else + [ + "--disable-x264" + "--enable-x264-lavc" + ] + ) + ++ [ (if jackaudioSupport then "" else "--disable-jack") (if pulseSupport then "--enable-pulse" else "--disable-pulse") - ( - if v4lSupport then - "--enable-v4l2 --enable-tv-v4l2 --enable-radio --enable-radio-v4l2 --enable-radio-capture" - else - "--disable-v4l2 --disable-tv-v4l2 --disable-radio --disable-radio-v4l2 --disable-radio-capture" - ) + ] + ++ ( + if v4lSupport then + [ + "--enable-v4l2" + "--enable-tv-v4l2" + "--enable-radio" + "--enable-radio-v4l2" + "--enable-radio-capture" + ] + else + [ + "--disable-v4l2" + "--disable-tv-v4l2" + "--disable-radio" + "--disable-radio-v4l2" + "--disable-radio-capture" + ] + ) + ++ [ "--disable-xanim" - "--disable-xvid --disable-xvid-lavc" + "--disable-xvid" + "--disable-xvid-lavc" "--disable-ossaudio" "--disable-ffmpeg_a" "--yasm=${buildPackages.yasm}/bin/yasm" From 97950d6fecbd7018bf71d01c621d26b8f06e7892 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 30 May 2026 20:07:08 +0200 Subject: [PATCH 91/97] mplayer: use lib.enableFeature --- pkgs/applications/video/mplayer/default.nix | 115 ++++++-------------- 1 file changed, 32 insertions(+), 83 deletions(-) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 1c7381df80f7..e4801c2f8935 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -178,93 +178,42 @@ stdenv.mkDerivation { configurePlatforms = [ ]; configureFlags = [ - "--enable-freetype" - (if fontconfigSupport then "--enable-fontconfig" else "--disable-fontconfig") - ] - ++ ( - if x11Support then - [ - "--enable-x11" - "--enable-gl" - ] - else - [ - "--disable-x11" - "--disable-gl" - ] - ) - ++ [ - (if xineramaSupport then "--enable-xinerama" else "--disable-xinerama") - (if xvSupport then "--enable-xv" else "--disable-xv") - (if alsaSupport then "--enable-alsa" else "--disable-alsa") - (if screenSaverSupport then "--enable-xss" else "--disable-xss") - (if vdpauSupport then "--enable-vdpau" else "--disable-vdpau") - (if cddaSupport then "--enable-cdparanoia" else "--disable-cdparanoia") - (if dvdnavSupport then "--enable-dvdnav" else "--disable-dvdnav") - (if bluraySupport then "--enable-bluray" else "--disable-bluray") - (if amrSupport then "--enable-libopencore_amrnb" else "--disable-libopencore_amrnb") - (if cacaSupport then "--enable-caca" else "--disable-caca") - ] - ++ ( - if lameSupport then - [ - "--enable-mp3lame" - "--disable-mp3lame-lavc" - ] - else - [ - "--disable-mp3lame" - "--enable-mp3lame-lavc" - ] - ) - ++ [ - (if speexSupport then "--enable-speex" else "--disable-speex") - (if theoraSupport then "--enable-theora" else "--disable-theora") - ] - ++ ( - if x264Support then - [ - "--enable-x264" - "--disable-x264-lavc" - ] - else - [ - "--disable-x264" - "--enable-x264-lavc" - ] - ) - ++ [ - (if jackaudioSupport then "" else "--disable-jack") - (if pulseSupport then "--enable-pulse" else "--disable-pulse") - ] - ++ ( - if v4lSupport then - [ - "--enable-v4l2" - "--enable-tv-v4l2" - "--enable-radio" - "--enable-radio-v4l2" - "--enable-radio-capture" - ] - else - [ - "--disable-v4l2" - "--disable-tv-v4l2" - "--disable-radio" - "--disable-radio-v4l2" - "--disable-radio-capture" - ] - ) - ++ [ - "--disable-xanim" - "--disable-xvid" - "--disable-xvid-lavc" - "--disable-ossaudio" - "--disable-ffmpeg_a" + (lib.enableFeature true "freetype") + (lib.enableFeature fontconfigSupport "fontconfig") + (lib.enableFeature x11Support "x11") + (lib.enableFeature x11Support "gl") + (lib.enableFeature xineramaSupport "xinerama") + (lib.enableFeature xvSupport "xv") + (lib.enableFeature alsaSupport "alsa") + (lib.enableFeature screenSaverSupport "xss") + (lib.enableFeature vdpauSupport "vdpau") + (lib.enableFeature cddaSupport "cdparanoia") + (lib.enableFeature dvdnavSupport "dvdnav") + (lib.enableFeature bluraySupport "bluray") + (lib.enableFeature amrSupport "libopencore_amrnb") + (lib.enableFeature cacaSupport "caca") + (lib.enableFeature lameSupport "mp3lame") + (lib.enableFeature (!lameSupport) "mp3lame-lavc") + (lib.enableFeature speexSupport "speex") + (lib.enableFeature theoraSupport "theora") + (lib.enableFeature x264Support "x264") + (lib.enableFeature (!x264Support) "x264-lavc") + (lib.enableFeature pulseSupport "pulse") + (lib.enableFeature v4lSupport "v4l2") + (lib.enableFeature v4lSupport "tv-v4l2") + (lib.enableFeature v4lSupport "radio") + (lib.enableFeature v4lSupport "radio-v4l2") + (lib.enableFeature v4lSupport "radio-capture") + (lib.enableFeature false "xanim") + (lib.enableFeature false "xvid") + (lib.enableFeature false "xvid-lavc") + (lib.enableFeature false "ossaudio") + (lib.enableFeature false "ffmpeg_a") "--yasm=${buildPackages.yasm}/bin/yasm" # Note, the `target` vs `host` confusion is intentional. "--target=${stdenv.hostPlatform.config}" ] + ++ lib.optional (!jackaudioSupport) "--disable-jack" ++ lib.optional (useUnfreeCodecs && codecs != null && !crossBuild) "--codecsdir=${codecs}" ++ lib.optional (stdenv.hostPlatform.isx86 && !crossBuild) "--enable-runtime-cpudetection" ++ lib.optional fribidiSupport "--enable-fribidi" From 35685c55e8dd0bb8a4c49a9f182c862d25e42b4c Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 30 May 2026 20:20:49 +0200 Subject: [PATCH 92/97] mplayer: enable strictDeps and structuredAttrs --- pkgs/applications/video/mplayer/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index e4801c2f8935..b54747b99a42 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -137,6 +137,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config yasm + ] + ++ lib.optionals cacaSupport [ + libcaca # caca-config ]; buildInputs = [ freetype @@ -176,6 +179,8 @@ stdenv.mkDerivation { ++ lib.optional bs2bSupport libbs2b ++ lib.optional v4lSupport libv4l; + strictDeps = true; + configurePlatforms = [ ]; configureFlags = [ (lib.enableFeature true "freetype") @@ -278,6 +283,8 @@ stdenv.mkDerivation { fi ''; + __structuredAttrs = true; + meta = { description = "Movie player that supports many video formats"; homepage = "http://mplayerhq.hu"; From 060ccf1e4033fadf229bb7eee644093db8d01227 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 30 May 2026 20:26:42 +0200 Subject: [PATCH 93/97] mplayer: embed version, add versionCheckHook --- pkgs/applications/video/mplayer/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index b54747b99a42..ad384520cefe 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -66,6 +66,7 @@ libjpeg, useUnfreeCodecs ? false, buildPackages, + versionCheckHook, }: assert xineramaSupport -> x11Support; @@ -117,7 +118,7 @@ let in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "mplayer"; version = "1.5-unstable-2024-12-21"; @@ -128,6 +129,7 @@ stdenv.mkDerivation { }; prePatch = '' + echo "${finalAttrs.version}" > VERSION sed -i /^_install_strip/d configure rm -rf ffmpeg @@ -283,6 +285,10 @@ stdenv.mkDerivation { fi ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--help"; + doInstallCheck = true; + __structuredAttrs = true; meta = { @@ -299,4 +305,4 @@ stdenv.mkDerivation { "aarch64-linux" ]; }; -} +}) From eeea15fbf3240231925c9568a972599962662c80 Mon Sep 17 00:00:00 2001 From: Adam Dinwoodie Date: Wed, 1 Apr 2026 21:05:28 +0100 Subject: [PATCH 94/97] gh-gonest: init at 0-unstable-2025-12-17 Co-authored-by: jack rosenberg <56937175+jackrosenberg@users.noreply.github.com> --- pkgs/by-name/gh/gh-gonest/package.nix | 71 +++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 pkgs/by-name/gh/gh-gonest/package.nix diff --git a/pkgs/by-name/gh/gh-gonest/package.nix b/pkgs/by-name/gh/gh-gonest/package.nix new file mode 100644 index 000000000000..c83f616f7ccc --- /dev/null +++ b/pkgs/by-name/gh/gh-gonest/package.nix @@ -0,0 +1,71 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + makeWrapper, + bashInteractive, + gh, + jq, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "gh-gonest"; + version = "0-unstable-2025-12-17"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "emmanuel-ferdman"; + repo = "gh-gonest"; + rev = "4be041b29e6e102b04b00f98619c818780060a60"; + hash = "sha256-NTqq7y/6Gw1CXgmEpj7an2bT7d5ZFjjlV4zyBthC5yw="; + }; + + strictDeps = true; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ bashInteractive ]; + + # runtimeInputs is not used by mkDerivation directly, but defining it means + # the packages on the path at runtime can be more easily inspected and + # overridden. + runtimeInputs = [ + gh + jq + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -D -m755 gh-gonest "$out"/bin/gh-gonest + + runHook postInstall + ''; + + # Use --suffix to ensure that, if the user has a `gh` executable (e.g. + # because they've set `programs.gh.package` in Home Manager), then that gets + # picked up first. + postFixup = '' + wrapProgram "$out"/bin/gh-gonest \ + --suffix PATH : ${lib.makeBinPath finalAttrs.runtimeInputs} + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version" + "branch" + ]; + }; + + meta = { + homepage = "https://github.com/emmanuel-ferdman/gh-gonest"; + description = "GitHub CLI extension for cleaning up ghost notifications"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.me-and ]; + mainProgram = "gh-gonest"; + }; +}) From 81515c9c2e29baa8038f53d8cfd9625132750d58 Mon Sep 17 00:00:00 2001 From: "nixpkgs-ci[bot]" <190413589+nixpkgs-ci[bot]@users.noreply.github.com> Date: Sun, 31 May 2026 14:46:32 +0000 Subject: [PATCH 95/97] maintainers/github-teams.json: Automated sync --- maintainers/github-teams.json | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index 6e794d09bd5f..6ef8ff8e70a9 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -309,8 +309,7 @@ "members": { "AndersonTorres": 5954806, "adisbladis": 63286, - "panchoh": 471059, - "ttuegel": 563054 + "panchoh": 471059 }, "name": "emacs" }, @@ -407,12 +406,13 @@ "gnome": { "description": "Maintain GNOME desktop environment and platform.", "id": 3806133, - "maintainers": {}, + "maintainers": { + "jtojnar": 705123 + }, "members": { "bobby285271": 20080233, "dasj19": 7589338, - "hedning": 71978, - "jtojnar": 705123 + "hedning": 71978 }, "name": "GNOME" }, @@ -702,6 +702,7 @@ "Mic92": 96200, "Radvendii": 1239929, "edolstra": 1148549, + "lisanna-dettwyler": 72424138, "lovesegfault": 7243783, "xokdvium": 145775305 }, @@ -819,14 +820,13 @@ "description": "Maintain the Qt framework, KDE application suite, Plasma desktop environment and related projects", "id": 4341481, "maintainers": { - "ttuegel": 563054 + "K900": 386765, + "NickCao": 15247171, + "SuperSandro2000": 7258858 }, "members": { "FRidh": 2129135, - "K900": 386765, "LunNova": 782440, - "NickCao": 15247171, - "SuperSandro2000": 7258858, "bkchr": 5718007, "ilya-fedin": 17829319, "mjm": 1181, @@ -896,8 +896,7 @@ "id": 7304571, "maintainers": { "Mic92": 96200, - "winterqt": 78392041, - "zowoq": 59103226 + "winterqt": 78392041 }, "members": {}, "name": "rust" From cc2f97a1cf7c0fae1552bb8a059cdb474e48eb24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 May 2026 15:49:23 +0000 Subject: [PATCH 96/97] crush: 0.70.0 -> 0.74.1 --- pkgs/by-name/cr/crush/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix index 10db3c225a5c..7e50b3456162 100644 --- a/pkgs/by-name/cr/crush/package.nix +++ b/pkgs/by-name/cr/crush/package.nix @@ -11,16 +11,16 @@ buildGo126Module (finalAttrs: { pname = "crush"; - version = "0.70.0"; + version = "0.74.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "crush"; tag = "v${finalAttrs.version}"; - hash = "sha256-rLLgGes902mZvya2rcTCNji0FR2AlMzA4vdYieHZIoc="; + hash = "sha256-JnELv8Q2GlOKhYbBRUDY8m8XuyyoD71Tw5qbnpbNxVY="; }; - vendorHash = "sha256-3fYDFzBN5lDDnc2rziHOc7SMvesdAevsxIY2xUU3hms="; + vendorHash = "sha256-D2GJ3ORyJy5Dn0MZJWgB3Wv1FyDoAWqLI3W0yU1q5Lw="; ldflags = [ "-s" From 8664f2af972e4f5bfbb5ee0696fd5caa5d1bae05 Mon Sep 17 00:00:00 2001 From: otaconix Date: Sun, 31 May 2026 18:25:18 +0200 Subject: [PATCH 97/97] youki: update homepage and changelog URLs I'm not exactly sure when this happened, but Youki is no longer being maintained under the _containers_ organization on GitHub, and instead in its own _youki-dev_ organization. --- pkgs/by-name/yo/youki/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yo/youki/package.nix b/pkgs/by-name/yo/youki/package.nix index c429e7544ec9..2ccfe1d80c6d 100644 --- a/pkgs/by-name/yo/youki/package.nix +++ b/pkgs/by-name/yo/youki/package.nix @@ -57,8 +57,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Container runtime written in Rust"; - homepage = "https://containers.github.io/youki/"; - changelog = "https://github.com/containers/youki/releases/tag/v${finalAttrs.version}"; + homepage = "https://youki-dev.github.io/youki/"; + changelog = "https://github.com/youki-dev/youki/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ builditluc ]; platforms = lib.platforms.linux;