From 30454d0a8582737d3905a5186d070606349919c1 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Tue, 24 Jun 2025 10:03:26 -0400 Subject: [PATCH 01/58] python3Packages.rtf-tokenize: init at 1.0.0 Co-authored-by: Yueh-Shun Li (cherry picked from commit 3603c9b403333304be83769edb0c3f51d71c38de) --- .../python-modules/rtf-tokenize/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/rtf-tokenize/default.nix diff --git a/pkgs/development/python-modules/rtf-tokenize/default.nix b/pkgs/development/python-modules/rtf-tokenize/default.nix new file mode 100644 index 000000000000..f6701180dabc --- /dev/null +++ b/pkgs/development/python-modules/rtf-tokenize/default.nix @@ -0,0 +1,51 @@ +{ + lib, + python, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, + versionCheckHook, + which, +}: + +buildPythonPackage (finalAttrs: { + __structuredAttrs = true; + + pname = "rtf-tokenize"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "openstenoproject"; + repo = "rtf_tokenize"; + tag = finalAttrs.version; + hash = "sha256-zwD2sRYTY1Kmm/Ag2hps9VRdUyQoi4zKtDPR+F52t9A="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ + versionCheckHook + which + ]; + + versionCheckProgramArg = "${placeholder "out"}/${python.sitePackages}"; + + preInstallCheck = '' + versionCheckProgram="$(which ls)" + ''; + + pythonImportsCheck = [ "rtf_tokenize" ]; + + meta = { + description = "Simple RTF tokenizer package for Python"; + homepage = "https://github.com/openstenoproject/rtf_tokenize"; + license = lib.licenses.gpl2Plus; # https://github.com/openstenoproject/rtf_tokenize/issues/1 + maintainers = with lib.maintainers; [ pandapip1 ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e8e1bac97cb1..733ad64fa9b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16529,6 +16529,8 @@ self: super: with self; { rtb-data = callPackage ../development/python-modules/rtb-data { }; + rtf-tokenize = callPackage ../development/python-modules/rtf-tokenize { }; + rtfde = callPackage ../development/python-modules/rtfde { }; rtfunicode = callPackage ../development/python-modules/rtfunicode { }; From 53f04eda3b05f4d8670c482a0bc77b2881c62d0f Mon Sep 17 00:00:00 2001 From: Gavin John Date: Tue, 24 Jun 2025 10:31:05 -0400 Subject: [PATCH 02/58] python3Packages.plover-stroke: init at 1.1.0 Co-authored-by: Yueh-Shun Li (cherry picked from commit 4d05dc3e571388c5314ccc07e747a6097dab13c1) --- .../python-modules/plover-stroke/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/plover-stroke/default.nix diff --git a/pkgs/development/python-modules/plover-stroke/default.nix b/pkgs/development/python-modules/plover-stroke/default.nix new file mode 100644 index 000000000000..a97dfa33f5bd --- /dev/null +++ b/pkgs/development/python-modules/plover-stroke/default.nix @@ -0,0 +1,57 @@ +{ + lib, + python, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, + pytest-qt, + pyside6, + versionCheckHook, + which, +}: + +buildPythonPackage (finalAttrs: { + __structuredAttrs = true; + + pname = "plover-stroke"; + version = "1.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "openstenoproject"; + repo = "plover_stroke"; + tag = finalAttrs.version; + hash = "sha256-A75OMzmEn0VmDAvmQCp6/7uptxzwWJTwsih3kWlYioA="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-qt + pyside6 + ]; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ + versionCheckHook + which + ]; + + versionCheckProgramArg = "${placeholder "out"}/${python.sitePackages}"; + + preInstallCheck = '' + versionCheckProgram="$(which ls)" + ''; + + pythonImportsCheck = [ "plover_stroke" ]; + + meta = { + description = "Helper class for working with steno strokes"; + homepage = "https://github.com/openstenoproject/plover_stroke"; + license = lib.licenses.gpl2Plus; # https://github.com/openstenoproject/plover_stroke/issues/4 + maintainers = with lib.maintainers; [ pandapip1 ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 733ad64fa9b6..f528da826bba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12170,6 +12170,8 @@ self: super: with self; { plotpy = callPackage ../development/python-modules/plotpy { }; + plover-stroke = callPackage ../development/python-modules/plover-stroke { }; + pluggy = callPackage ../development/python-modules/pluggy { }; pluginbase = callPackage ../development/python-modules/pluginbase { }; From 9319c20a70c9fdfc934107c8a11cb65b274dc0cc Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 27 Jun 2025 09:40:20 -0400 Subject: [PATCH 03/58] plover.dev: unbork (cherry picked from commit 02ee7668c7d6ca1e4387a10779f88dda64b13d1f) --- pkgs/applications/misc/plover/default.nix | 98 ++++++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 60 insertions(+), 40 deletions(-) diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 6ee360b9e226..200b2eb562d2 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -1,20 +1,70 @@ { lib, config, + stdenv, + buildPythonPackage ? python3Packages.buildPythonPackage, fetchFromGitHub, + versionCheckHook, python3Packages, - wmctrl, - qtbase, - mkDerivationWith, + libsForQt5, }: { - dev = - with python3Packages; - mkDerivationWith buildPythonPackage rec { + dev = ( + buildPythonPackage rec { pname = "plover"; version = "4.0.2"; - format = "setuptools"; + pyproject = true; + + src = fetchFromGitHub { + owner = "openstenoproject"; + repo = "plover"; + tag = "v${version}"; + hash = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8="; + }; + + postPatch = '' + sed -i 's/,<77//g' pyproject.toml # pythonRelaxDepsHook doesn't work for this for some reason + ''; + + build-system = with python3Packages; [ + babel + setuptools + pyqt5 + wheel + ]; + dependencies = with python3Packages; [ + appdirs + evdev + pyqt5 + pyserial + plover-stroke + rtf-tokenize + setuptools + wcwidth + xlib + ]; + nativeBuildInputs = with libsForQt5; [ + wrapQtAppsHook + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + versionCheckHook + pytest-qt + mock + ]; + + # Segfaults?! + disabledTestPaths = [ "test/gui_qt/test_dictionaries_widget.py" ]; + + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + + dontWrapQtApps = true; + + pythonImportsCheck = [ "plover" ]; meta = with lib; { broken = stdenv.hostPlatform.isDarwin; @@ -25,38 +75,8 @@ ]; license = lib.licenses.gpl2; }; - - src = fetchFromGitHub { - owner = "openstenoproject"; - repo = "plover"; - tag = "v${version}"; - sha256 = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8="; - }; - - # I'm not sure why we don't find PyQt5 here but there's a similar - # sed on many of the platforms Plover builds for - postPatch = "sed -i /PyQt5/d setup.cfg"; - - nativeCheckInputs = [ - pytest - mock - ]; - propagatedBuildInputs = [ - babel - pyqt5 - xlib - pyserial - appdirs - wcwidth - setuptools - ]; - - dontWrapQtApps = true; - - preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") - ''; - }; + } + ); } // lib.optionalAttrs config.allowAliases { stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da216b62af90..a7f52db5200c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11913,7 +11913,7 @@ with pkgs; plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; - plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { }); + plover = callPackage ../applications/misc/plover { }; pokefinder = qt6Packages.callPackage ../tools/games/pokefinder { }; From f76befec4d94cf293758236f40e9ed6947fe8ca4 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 27 Jun 2025 09:43:11 -0400 Subject: [PATCH 04/58] plover.dev: fix license (cherry picked from commit 1e116a46a71a21c02869159992aeaf927ac42492) --- pkgs/applications/misc/plover/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 200b2eb562d2..a8abe7ed114f 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -73,7 +73,7 @@ twey kovirobi ]; - license = lib.licenses.gpl2; + license = licenses.gpl2Plus; }; } ); From 1712c9beba2acff3ed530f52b15eafee8ad3fba5 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 27 Jun 2025 09:44:02 -0400 Subject: [PATCH 05/58] plover.dev: get rid of with lib in meta (cherry picked from commit 3113377e4bfb732630cbfcf425a41daf82ffedb1) --- pkgs/applications/misc/plover/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index a8abe7ed114f..7216535f3749 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -73,7 +73,7 @@ twey kovirobi ]; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } ); From 3acc21a47388fa5d568236dc3cbcce578d7eff9e Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 27 Jun 2025 09:44:28 -0400 Subject: [PATCH 06/58] plover.dev: add additional meta information (cherry picked from commit e27c0ae0d5128e835caa212da367ea9f427cce19) --- pkgs/applications/misc/plover/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 7216535f3749..dcdf08f8814b 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -66,14 +66,17 @@ pythonImportsCheck = [ "plover" ]; - meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; + meta = { description = "OpenSteno Plover stenography software"; + homepage = "https://www.openstenoproject.org/plover/"; + mainProgram = "plover"; maintainers = with lib.maintainers; [ twey kovirobi ]; license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + broken = stdenv.hostPlatform.isDarwin; }; } ); From fa4e519c390af4623ccc7f52d7c9951624fc1c17 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 27 Jun 2025 09:44:42 -0400 Subject: [PATCH 07/58] plover.dev: add pandapip1 to maintainers (cherry picked from commit f8b3c814a19c9dbd1284262270a6012d0f64333d) --- pkgs/applications/misc/plover/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index dcdf08f8814b..a26ffa27ea8a 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -73,6 +73,7 @@ maintainers = with lib.maintainers; [ twey kovirobi + pandapip1 ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; From bdefa25dca16ca1fa74cbf5594b30efef313ad35 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 27 Jun 2025 09:49:06 -0400 Subject: [PATCH 08/58] plover.dev: add better parameterization (cherry picked from commit 907c48e3ca7606f0357982b5960fc3abcedd2316) --- pkgs/applications/misc/plover/default.nix | 33 +++++++++++++++++++---- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index a26ffa27ea8a..ec14f6f94d48 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -2,13 +2,36 @@ lib, config, stdenv, - buildPythonPackage ? python3Packages.buildPythonPackage, + plover, fetchFromGitHub, + fetchpatch, versionCheckHook, python3Packages, libsForQt5, }: +let + inherit (python3Packages) + buildPythonPackage + appdirs + babel + evdev + mock + pyqt5 + pyserial + pytestCheckHook + pytest-qt + plover-stroke + rtf-tokenize + setuptools + wcwidth + wheel + xlib + ; + inherit (libsForQt5) + wrapQtAppsHook + ; +in { dev = ( buildPythonPackage rec { @@ -27,13 +50,13 @@ sed -i 's/,<77//g' pyproject.toml # pythonRelaxDepsHook doesn't work for this for some reason ''; - build-system = with python3Packages; [ + build-system = [ babel setuptools pyqt5 wheel ]; - dependencies = with python3Packages; [ + dependencies = [ appdirs evdev pyqt5 @@ -44,11 +67,11 @@ wcwidth xlib ]; - nativeBuildInputs = with libsForQt5; [ + nativeBuildInputs = [ wrapQtAppsHook ]; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = [ pytestCheckHook versionCheckHook pytest-qt From e7b971c59ae70e383b3aedae32462a930fdb4adf Mon Sep 17 00:00:00 2001 From: Gavin John Date: Fri, 27 Jun 2025 10:16:37 -0400 Subject: [PATCH 09/58] plover.dev: rename to plover (cherry picked from commit c6f8d43c60b48924870fe07f495af5669f63789c) --- pkgs/applications/misc/plover/default.nix | 131 +++++++++++----------- 1 file changed, 67 insertions(+), 64 deletions(-) diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index ec14f6f94d48..af6620404e52 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -3,6 +3,7 @@ config, stdenv, plover, + buildPythonPackage ? python3Packages.buildPythonPackage, fetchFromGitHub, fetchpatch, versionCheckHook, @@ -32,79 +33,81 @@ let wrapQtAppsHook ; in -{ - dev = ( - buildPythonPackage rec { - pname = "plover"; - version = "4.0.2"; - pyproject = true; +buildPythonPackage rec { + pname = "plover"; + version = "4.0.2"; + pyproject = true; - src = fetchFromGitHub { - owner = "openstenoproject"; - repo = "plover"; - tag = "v${version}"; - hash = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8="; - }; + src = fetchFromGitHub { + owner = "openstenoproject"; + repo = "plover"; + tag = "v${version}"; + hash = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8="; + }; - postPatch = '' - sed -i 's/,<77//g' pyproject.toml # pythonRelaxDepsHook doesn't work for this for some reason - ''; + postPatch = '' + sed -i 's/,<77//g' pyproject.toml # pythonRelaxDepsHook doesn't work for this for some reason + ''; - build-system = [ - babel - setuptools - pyqt5 - wheel - ]; - dependencies = [ - appdirs - evdev - pyqt5 - pyserial - plover-stroke - rtf-tokenize - setuptools - wcwidth - xlib - ]; - nativeBuildInputs = [ - wrapQtAppsHook - ]; + build-system = [ + babel + setuptools + pyqt5 + wheel + ]; + dependencies = [ + appdirs + evdev + pyqt5 + pyserial + plover-stroke + rtf-tokenize + setuptools + wcwidth + xlib + ]; + nativeBuildInputs = [ + wrapQtAppsHook + ]; - nativeCheckInputs = [ - pytestCheckHook - versionCheckHook - pytest-qt - mock - ]; + nativeCheckInputs = [ + pytestCheckHook + versionCheckHook + pytest-qt + mock + ]; - # Segfaults?! - disabledTestPaths = [ "test/gui_qt/test_dictionaries_widget.py" ]; + # Segfaults?! + disabledTestPaths = [ "test/gui_qt/test_dictionaries_widget.py" ]; - preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") - ''; + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; - dontWrapQtApps = true; + dontWrapQtApps = true; - pythonImportsCheck = [ "plover" ]; + pythonImportsCheck = [ "plover" ]; - meta = { - description = "OpenSteno Plover stenography software"; - homepage = "https://www.openstenoproject.org/plover/"; - mainProgram = "plover"; - maintainers = with lib.maintainers; [ - twey - kovirobi - pandapip1 - ]; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; - }; - } - ); + meta = { + description = "OpenSteno Plover stenography software"; + homepage = "https://www.openstenoproject.org/plover/"; + mainProgram = "plover"; + maintainers = with lib.maintainers; [ + twey + kovirobi + pandapip1 + ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + broken = stdenv.hostPlatform.isDarwin; + }; } // lib.optionalAttrs config.allowAliases { - stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05 + # TODO: After 26.05 branch-off, remove these aliases + dev = + if lib.versionOlder "25.05" lib.version then + throw "plover.dev was renamed. Use plover-dev instead." # added 2025-06-05` + else + plover; + stable = throw "plover.stable was renamed. Use plover instead."; # added 2022-06-05; updated 2025-06-27 } From a7242901599a98bf8ac4fbe75ca3cd80d84f2504 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Sun, 28 Sep 2025 19:13:04 -0700 Subject: [PATCH 10/58] python3Packages.plover_4: move from plover.dev Co-authored-by: Yueh-Shun Li (cherry picked from commit 0954aa206e197559dc7982212ed2ce1319949cd2) --- .../python-modules/plover/4.nix} | 41 ++++++++----------- pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/python-packages.nix | 4 ++ 3 files changed, 20 insertions(+), 27 deletions(-) rename pkgs/{applications/misc/plover/default.nix => development/python-modules/plover/4.nix} (82%) diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/development/python-modules/plover/4.nix similarity index 82% rename from pkgs/applications/misc/plover/default.nix rename to pkgs/development/python-modules/plover/4.nix index af6620404e52..9c3cd4926213 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/development/python-modules/plover/4.nix @@ -3,36 +3,27 @@ config, stdenv, plover, - buildPythonPackage ? python3Packages.buildPythonPackage, + buildPythonPackage, fetchFromGitHub, fetchpatch, versionCheckHook, - python3Packages, - libsForQt5, + appdirs, + babel, + evdev, + mock, + pyqt5, + pyserial, + pytestCheckHook, + pytest-qt, + plover-stroke, + rtf-tokenize, + setuptools, + wcwidth, + wheel, + xlib, + wrapQtAppsHook, }: -let - inherit (python3Packages) - buildPythonPackage - appdirs - babel - evdev - mock - pyqt5 - pyserial - pytestCheckHook - pytest-qt - plover-stroke - rtf-tokenize - setuptools - wcwidth - wheel - xlib - ; - inherit (libsForQt5) - wrapQtAppsHook - ; -in buildPythonPackage rec { pname = "plover"; version = "4.0.2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7f52db5200c..08e1bf54a692 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11913,8 +11913,6 @@ with pkgs; plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; - plover = callPackage ../applications/misc/plover { }; - pokefinder = qt6Packages.callPackage ../tools/games/pokefinder { }; pothos = libsForQt5.callPackage ../applications/radio/pothos { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f528da826bba..5f45b35307b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12172,6 +12172,10 @@ self: super: with self; { plover-stroke = callPackage ../development/python-modules/plover-stroke { }; + plover_4 = callPackage ../development/python-modules/plover/4.nix { + inherit (pkgs.libsForQt5) wrapQtAppsHook; + }; + pluggy = callPackage ../development/python-modules/pluggy { }; pluginbase = callPackage ../development/python-modules/pluginbase { }; From e5e41bd3981989377c5bc4546a34e8d5a8535d1e Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 26 Apr 2026 01:19:10 +0800 Subject: [PATCH 11/58] python3Packages.plover: init referencing python3Packages.plover_4 (cherry picked from commit 188701672b4babf83cbae557a211e2fb209dba2e) --- pkgs/top-level/python-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5f45b35307b5..48cd27430050 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12170,6 +12170,14 @@ self: super: with self; { plotpy = callPackage ../development/python-modules/plotpy { }; + # Plover 5 moves from PyQt5 to PySide6, + # which is a backward-incompatible change to praphical plugins. + # Use Plover 4 for now (2026-04-26), + # as the upstream still warns about this in every Plover 5 release, + # List of unsupported plugins: + # https://github.com/opensteno/plover_plugins_registry/blob/master/unsupported.json + plover = plover_4; + plover-stroke = callPackage ../development/python-modules/plover-stroke { }; plover_4 = callPackage ../development/python-modules/plover/4.nix { From 4df146be55779d0eebd5888880743036002d4b4b Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 26 Apr 2026 01:36:07 +0800 Subject: [PATCH 12/58] plover: init referencing python3Packages.plover with aliases Co-authored-by: Gavin John (cherry picked from commit 14b4884f7adb0b89bac98c34bc9e1606ebdc60f1) --- pkgs/by-name/pl/plover/package.nix | 17 +++++++++++++++++ pkgs/development/python-modules/plover/4.nix | 11 ----------- 2 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 pkgs/by-name/pl/plover/package.nix diff --git a/pkgs/by-name/pl/plover/package.nix b/pkgs/by-name/pl/plover/package.nix new file mode 100644 index 000000000000..8753ebb0316c --- /dev/null +++ b/pkgs/by-name/pl/plover/package.nix @@ -0,0 +1,17 @@ +{ + lib, + config, + python3Packages, + # For aliases + plover, +}: +python3Packages.toPythonApplication python3Packages.plover +# Aliases to now-dropped plover.stable and plover.dev +# Added 2026-04-22 +# TODO(@ShamrockLee): remove after Nixpkgs 25.11 EOL +// lib.optionalAttrs (config.allowAliases && !(lib.oldestSupportedReleaseIsAtLeast 2605)) { + dev = + lib.throwIf (lib.oldestSupportedReleaseIsAtLeast 2511) "plover.dev was renamed. Use plover instead." + plover; # Added 2026-04-26 + stable = throw "plover.stable was renamed. Use plover instead."; # Added 2022-06-05; updated 2026-04-26 +} diff --git a/pkgs/development/python-modules/plover/4.nix b/pkgs/development/python-modules/plover/4.nix index 9c3cd4926213..4d65eb0875eb 100644 --- a/pkgs/development/python-modules/plover/4.nix +++ b/pkgs/development/python-modules/plover/4.nix @@ -1,8 +1,6 @@ { lib, - config, stdenv, - plover, buildPythonPackage, fetchFromGitHub, fetchpatch, @@ -93,12 +91,3 @@ buildPythonPackage rec { broken = stdenv.hostPlatform.isDarwin; }; } -// lib.optionalAttrs config.allowAliases { - # TODO: After 26.05 branch-off, remove these aliases - dev = - if lib.versionOlder "25.05" lib.version then - throw "plover.dev was renamed. Use plover-dev instead." # added 2025-06-05` - else - plover; - stable = throw "plover.stable was renamed. Use plover instead."; # added 2022-06-05; updated 2025-06-27 -} From 8fa4ed8a1ec63afada6f01d98073c003665e36bb Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 26 Apr 2026 01:39:57 +0800 Subject: [PATCH 13/58] python3Packages.plover_4: modernise Remove unused set pattern from override interface. Use fixed-point arguments when calling buildPythonPackage. Use structured attributes. (cherry picked from commit 12e0d3a21cd44ec08f5561e86c7defff4ce4e83e) --- pkgs/development/python-modules/plover/4.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/plover/4.nix b/pkgs/development/python-modules/plover/4.nix index 4d65eb0875eb..ee32e2f50da1 100644 --- a/pkgs/development/python-modules/plover/4.nix +++ b/pkgs/development/python-modules/plover/4.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, versionCheckHook, appdirs, babel, @@ -22,7 +21,9 @@ wrapQtAppsHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { + __structuredAttrs = true; + pname = "plover"; version = "4.0.2"; pyproject = true; @@ -30,7 +31,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "openstenoproject"; repo = "plover"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8="; }; @@ -90,4 +91,4 @@ buildPythonPackage rec { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; -} +}) From bed8efdf7fa125c19020baa253cecd7370aa0979 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 26 Apr 2026 02:06:35 +0800 Subject: [PATCH 14/58] python3Packages.plover_4: add ShamrockLee to maintainers (cherry picked from commit 15655c9b0d97245be3a8dbcc3863ea584830f783) --- pkgs/development/python-modules/plover/4.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/plover/4.nix b/pkgs/development/python-modules/plover/4.nix index ee32e2f50da1..bda985cb0122 100644 --- a/pkgs/development/python-modules/plover/4.nix +++ b/pkgs/development/python-modules/plover/4.nix @@ -86,6 +86,7 @@ buildPythonPackage (finalAttrs: { twey kovirobi pandapip1 + ShamrockLee ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; From f400a0edf75aa1d47fd043262235f0987296558e Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 26 Apr 2026 01:44:27 +0800 Subject: [PATCH 15/58] python3Packages.plover_5: copy from python3Packages.plover_4 (cherry picked from commit 5f6315fba0e92733fb9da6e0f185a628d267a013) --- pkgs/development/python-modules/plover/5.nix | 95 ++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 pkgs/development/python-modules/plover/5.nix diff --git a/pkgs/development/python-modules/plover/5.nix b/pkgs/development/python-modules/plover/5.nix new file mode 100644 index 000000000000..bda985cb0122 --- /dev/null +++ b/pkgs/development/python-modules/plover/5.nix @@ -0,0 +1,95 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + versionCheckHook, + appdirs, + babel, + evdev, + mock, + pyqt5, + pyserial, + pytestCheckHook, + pytest-qt, + plover-stroke, + rtf-tokenize, + setuptools, + wcwidth, + wheel, + xlib, + wrapQtAppsHook, +}: + +buildPythonPackage (finalAttrs: { + __structuredAttrs = true; + + pname = "plover"; + version = "4.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "openstenoproject"; + repo = "plover"; + tag = "v${finalAttrs.version}"; + hash = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8="; + }; + + postPatch = '' + sed -i 's/,<77//g' pyproject.toml # pythonRelaxDepsHook doesn't work for this for some reason + ''; + + build-system = [ + babel + setuptools + pyqt5 + wheel + ]; + dependencies = [ + appdirs + evdev + pyqt5 + pyserial + plover-stroke + rtf-tokenize + setuptools + wcwidth + xlib + ]; + nativeBuildInputs = [ + wrapQtAppsHook + ]; + + nativeCheckInputs = [ + pytestCheckHook + versionCheckHook + pytest-qt + mock + ]; + + # Segfaults?! + disabledTestPaths = [ "test/gui_qt/test_dictionaries_widget.py" ]; + + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + + dontWrapQtApps = true; + + pythonImportsCheck = [ "plover" ]; + + meta = { + description = "OpenSteno Plover stenography software"; + homepage = "https://www.openstenoproject.org/plover/"; + mainProgram = "plover"; + maintainers = with lib.maintainers; [ + twey + kovirobi + pandapip1 + ShamrockLee + ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + broken = stdenv.hostPlatform.isDarwin; + }; +}) From 137eab00ea514fe78b0f250c967c727552fc5a9a Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 26 Apr 2026 02:01:12 +0800 Subject: [PATCH 16/58] python3Packages.plover_5: init Co-authored-by: Gavin John (cherry picked from commit a005a75d69c663a75bd3b209d2fa5de40624b34c) --- pkgs/development/python-modules/plover/5.nix | 47 +++++++++++++++++--- pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/plover/5.nix b/pkgs/development/python-modules/plover/5.nix index bda985cb0122..45899b201b7a 100644 --- a/pkgs/development/python-modules/plover/5.nix +++ b/pkgs/development/python-modules/plover/5.nix @@ -1,6 +1,7 @@ { lib, stdenv, + buildPackages, buildPythonPackage, fetchFromGitHub, versionCheckHook, @@ -8,16 +9,24 @@ babel, evdev, mock, - pyqt5, + packaging, + pkginfo, + psutil, + pygments, pyserial, + pyside6, pytestCheckHook, pytest-qt, plover-stroke, + readme-renderer, + requests-cache, + requests-futures, rtf-tokenize, setuptools, wcwidth, wheel, xlib, + qtbase, wrapQtAppsHook, }: @@ -25,37 +34,61 @@ buildPythonPackage (finalAttrs: { __structuredAttrs = true; pname = "plover"; - version = "4.0.2"; + version = "5.0.0.dev2"; pyproject = true; src = fetchFromGitHub { owner = "openstenoproject"; repo = "plover"; tag = "v${finalAttrs.version}"; - hash = "sha256-VpQT25bl8yPG4J9IwLkhSkBt31Y8BgPJdwa88WlreA8="; + hash = "sha256-PZwxVrdQPhgbj+YmWZIUETngeJGs6IQty0hY43tLQO0="; }; + # pythonRelaxDeps seemingly doesn't work here postPatch = '' - sed -i 's/,<77//g' pyproject.toml # pythonRelaxDepsHook doesn't work for this for some reason + sed -i 's/,<77//g' pyproject.toml + sed -i /PySide6-Essentials/d pyproject.toml ''; build-system = [ babel setuptools - pyqt5 + pyside6 wheel + + # Replacement for missing pyside6-essentials tools, + # workaround for https://github.com/NixOS/nixpkgs/issues/277849. + # Ideally this would be solved in pyside6 itself but I spent four + # hours trying to untangle its build system before giving up. If + # anyone wants to spend the time fixing it feel free to request + # me (@Pandapip1) as a reviewer. + (buildPackages.writeShellScriptBin "pyside6-uic" '' + exec ${qtbase}/libexec/uic -g python "$@" + '') + (buildPackages.writeShellScriptBin "pyside6-rcc" '' + exec ${qtbase}/libexec/rcc -g python "$@" + '') ]; dependencies = [ appdirs evdev - pyqt5 + packaging + pkginfo + psutil + pygments pyserial + pyside6 plover-stroke + qtbase + readme-renderer + requests-cache + requests-futures rtf-tokenize setuptools wcwidth xlib - ]; + ] + ++ readme-renderer.optional-dependencies.md; nativeBuildInputs = [ wrapQtAppsHook ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 48cd27430050..9610ddd70c37 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12184,6 +12184,10 @@ self: super: with self; { inherit (pkgs.libsForQt5) wrapQtAppsHook; }; + plover_5 = callPackage ../development/python-modules/plover/5.nix { + inherit (pkgs.qt6) qtbase wrapQtAppsHook; + }; + pluggy = callPackage ../development/python-modules/pluggy { }; pluginbase = callPackage ../development/python-modules/pluginbase { }; From 96bb97ed89de29c004f4fa614836cb37d0645a16 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 26 Apr 2026 02:09:54 +0800 Subject: [PATCH 17/58] plover_4: init referencing python3Packages.plover_4 (cherry picked from commit 318747e3c22fa4af72a9dba4804db36b71814022) --- pkgs/by-name/pl/plover_4/package.nix | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 pkgs/by-name/pl/plover_4/package.nix diff --git a/pkgs/by-name/pl/plover_4/package.nix b/pkgs/by-name/pl/plover_4/package.nix new file mode 100644 index 000000000000..eed2b2361775 --- /dev/null +++ b/pkgs/by-name/pl/plover_4/package.nix @@ -0,0 +1,3 @@ +{ python3Packages }: + +python3Packages.toPythonApplication python3Packages.plover_4 From 1a87dbf18bc80cbd6949933f4a06cc7096497e14 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 26 Apr 2026 02:11:44 +0800 Subject: [PATCH 18/58] plover_5: init referencing python3Packages.plover_5 (cherry picked from commit e2acb5061abf30cd6f0358f07bb0d6da632af4ae) --- pkgs/by-name/pl/plover_5/package.nix | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 pkgs/by-name/pl/plover_5/package.nix diff --git a/pkgs/by-name/pl/plover_5/package.nix b/pkgs/by-name/pl/plover_5/package.nix new file mode 100644 index 000000000000..20ecfa171780 --- /dev/null +++ b/pkgs/by-name/pl/plover_5/package.nix @@ -0,0 +1,3 @@ +{ python3Packages }: + +python3Packages.toPythonApplication python3Packages.plover_5 From 908cadcb3207537c212085605690ac6be012ba64 Mon Sep 17 00:00:00 2001 From: yaya Date: Wed, 20 May 2026 12:34:38 +0200 Subject: [PATCH 19/58] electron_40-bin: 40.10.0 -> 40.10.1 - Changelog: https://github.com/electron/electron/releases/tag/v40.10.1 - Diff: https://github.com/electron/electron/compare/refs/tags/v40.10.0...v40.10.1 (cherry picked from commit d1afa1f0a6b07f8008bcdf2663bfe5f3e33674ee) --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index b552e8d10884..159212b3031e 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -34,14 +34,14 @@ }, "40": { "hashes": { - "aarch64-darwin": "c3dd4d70aeb214a5b755af59e4e5d7b5b743f3f662a8a452b0afc2741953b7a5", - "aarch64-linux": "cb4454ae64f00f43cef86f57d38eff9a6cef7b1e0690debc1dc81323f98e6e63", - "armv7l-linux": "d3a99f2f734b407ab7de45dbb992825089a2f9e351c470a5fea0273ec027a681", - "headers": "0x534f94ds3qavwh90a4l63wpsagscwnbzi8399z067d2ghyzh18", - "x86_64-darwin": "a73b879e5cfa880e0b82e0a75d7a2ba1c892715d2db95dc6578277e74c7b8a04", - "x86_64-linux": "35efe7401822e8d2e474e13788a6191362c7494dd1f7ae327b70087e0768a667" + "aarch64-darwin": "42d8823af50d8720a3834a816ec32985f37935d412bd39344f4b16d139282568", + "aarch64-linux": "90eb3582e74ebebe6330c89506fbb356162d20e57cfe54cc5918759e63253a41", + "armv7l-linux": "623d4658b2186350cfae47941d870a1cbe508dd523a8f185ffd6ede479381ce4", + "headers": "1rq2wn46l7svsprzhs61h9c26nldacyhhwyawa863kkw68b8r5bd", + "x86_64-darwin": "d5b8f5e429a4904c5eeba0607532c8382a89c5da927cade207e54ef31337e783", + "x86_64-linux": "f5c140c64719659a1bc530237b5a3580fe031a0157d49ab67ff2192ad551e88e" }, - "version": "40.10.0" + "version": "40.10.1" }, "41": { "hashes": { From 96ad8c92c1b137fd12d76ba5d75b004d2f9c2b0b Mon Sep 17 00:00:00 2001 From: yaya Date: Wed, 20 May 2026 12:34:41 +0200 Subject: [PATCH 20/58] electron-chromedriver_40: 40.10.0 -> 40.10.1 - Changelog: https://github.com/electron/electron/releases/tag/v40.10.1 - Diff: https://github.com/electron/electron/compare/refs/tags/v40.10.0...v40.10.1 (cherry picked from commit f4c584ec37fd3d3cc44f221b03c55d1907f01d12) --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index bf6f7c0d6cd3..8eb79c035a8a 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -34,14 +34,14 @@ }, "40": { "hashes": { - "aarch64-darwin": "ed4e021fe841be3b04c6c4cf3968a1628b9d84ca07b5362aa54c377b3fde18f0", - "aarch64-linux": "bfb57aa77b06e2179c5076274f9d61615414c295e16eabd99206a7553c9eacdc", - "armv7l-linux": "8f35c8b25f98d18d5d5852d2b244e64183dfb61b10b9a64b0be579f450f2cb73", - "headers": "0x534f94ds3qavwh90a4l63wpsagscwnbzi8399z067d2ghyzh18", - "x86_64-darwin": "f2caf8c9fe1c5c38259881824adce6b11a5a482576d47d7dc113a950e9315bf8", - "x86_64-linux": "303345908d998a83b953c9f60a8b0f07e8fa82ed839260784a7b5c2fc517a86f" + "aarch64-darwin": "fc48122b2f8d666f890ba4c4db54b57386b679bf036102cb29245bed18a38298", + "aarch64-linux": "f859a1e26fa8d06829e88dc5950ced43c043d6e862945edffa3ee40ef8dd0b7d", + "armv7l-linux": "75c06087fc56bb2dbfc9a7f14a0ab403b0b41949c860481b9599edcd29e5a06c", + "headers": "1rq2wn46l7svsprzhs61h9c26nldacyhhwyawa863kkw68b8r5bd", + "x86_64-darwin": "f54b0fdee2e6d22857fb81b435d1f67faf9151a7ac67561a1048885692314dd9", + "x86_64-linux": "f3e373e2211f9f8fc0218199d1d761949c7fb3400bee1f702598878dc9911c0d" }, - "version": "40.10.0" + "version": "40.10.1" }, "41": { "hashes": { From 14b2e1f2ae3cf939999885f705688ae1adf686be Mon Sep 17 00:00:00 2001 From: yaya Date: Wed, 20 May 2026 12:34:44 +0200 Subject: [PATCH 21/58] electron_41-bin: 41.6.1 -> 41.7.0 - Changelog: https://github.com/electron/electron/releases/tag/v41.7.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v41.6.1...v41.7.0 (cherry picked from commit 952ee85bfef4e288529231cee467e8950a235c93) --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 159212b3031e..a619343eac4f 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -45,14 +45,14 @@ }, "41": { "hashes": { - "aarch64-darwin": "b41988e6aa105e550931d9d2eff15c0bb99c39871c2ff5af87f105c44edc5a7a", - "aarch64-linux": "b69fb25275d744e272afe3775aed0cce20c8ad2309744558089c33da92c0432a", - "armv7l-linux": "f318e60b182fc791ba90bd7c586ee7e1f603daf90925b64d7c295e8b7a610875", - "headers": "1n1w2ngk44w9khbh4bnw6kfakawdxh3wii3hkynbjzj21swvqzrb", - "x86_64-darwin": "fc802de570925bf75ca5911ffd8a8736232de2c742430938b2b621c79af93db4", - "x86_64-linux": "8f1bbd1ea46c5e4fc5f3ae9a04554de9da2fe0c65fbd8751b8493d2b39bf7a97" + "aarch64-darwin": "3de9c5eba1cf79a512058134d65ecff899623375ff1419dff2fe11346a5c45dd", + "aarch64-linux": "c8d4294e052bc83b840523237538ae131d8e387243c25e763f0d14fabffa37c2", + "armv7l-linux": "45d9df68739b0328db884db8e403f40087ffb1725fefa4185f4898a161623633", + "headers": "015x9hjafkimpji1pvkd33yn4v89is2ggv0hvmy16c39f4vfkk7z", + "x86_64-darwin": "41f6f769fb555380214588675ad0728fa69aec90166ceb51ebd0f1a08d608cd2", + "x86_64-linux": "f3bf38de05ce8fafe1039251ebfaa75fd090b0a13cd861322ccd2f6db4d6bb82" }, - "version": "41.6.1" + "version": "41.7.0" }, "42": { "hashes": { From 9c08d0c349208d54bea06685c29a33ccb323daa0 Mon Sep 17 00:00:00 2001 From: yaya Date: Wed, 20 May 2026 12:34:46 +0200 Subject: [PATCH 22/58] electron-chromedriver_41: 41.6.1 -> 41.7.0 - Changelog: https://github.com/electron/electron/releases/tag/v41.7.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v41.6.1...v41.7.0 (cherry picked from commit 04875e4ff0a7866656982d6657de152d9306b35c) --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 8eb79c035a8a..7c85821a9315 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -45,14 +45,14 @@ }, "41": { "hashes": { - "aarch64-darwin": "33852f5e551e18c43e1031492fe62153759fc7968bd14f9cc179673517e10bd0", - "aarch64-linux": "2f99b486290989bc4d756ffc0448c93c728e03d519872e492b1cadd5d5905885", - "armv7l-linux": "27d03e18b3e3e484ceb7f7f05ace5eda075a5a468223797d4ae988a75424b6d0", - "headers": "1n1w2ngk44w9khbh4bnw6kfakawdxh3wii3hkynbjzj21swvqzrb", - "x86_64-darwin": "5e47e5ae1d0401b32838a9074fc13d291b09bad0cb61a265ad5388ef9eb8ade7", - "x86_64-linux": "9921145c87cb6f279e5baa2c5af8763a4695c84bc5206273dbbb0385b493513c" + "aarch64-darwin": "55db5abc88c2420e77f5b57fcb09608ddb5a6cdeaacfa0a517641e3c8c306605", + "aarch64-linux": "8d620805836959803a8460952424d5c6e463a5145097b4ddb2e1157da34342e6", + "armv7l-linux": "29f06b78139e26f6ebbb7735969d29668734b2e44a4f0e54b749bdcf6baac304", + "headers": "015x9hjafkimpji1pvkd33yn4v89is2ggv0hvmy16c39f4vfkk7z", + "x86_64-darwin": "cdc45610de036fa981ec2b1726c0d9e41c24cfe30c40fdf6ce8ec062bafc661a", + "x86_64-linux": "2a3598718754ff599f6fe3e7490686bb093a9c922a1631725d85b1fc0209b941" }, - "version": "41.6.1" + "version": "41.7.0" }, "42": { "hashes": { From 780a0c1f84fc2849630aba88b88f8b3ca2c92002 Mon Sep 17 00:00:00 2001 From: yaya Date: Wed, 20 May 2026 12:34:49 +0200 Subject: [PATCH 23/58] electron_42-bin: 42.1.0 -> 42.2.0 - Changelog: https://github.com/electron/electron/releases/tag/v42.2.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v42.1.0...v42.2.0 (cherry picked from commit 17d01dc56f70327c4682b146f76cd96c88d8aef5) --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index a619343eac4f..edf0b8411736 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -56,13 +56,13 @@ }, "42": { "hashes": { - "aarch64-darwin": "98d097299eb08094d0df3312b2d6e8677069d8defdab891143628d4f82f46117", - "aarch64-linux": "1e700f7f3daef794cc45235e51c1172664aed49a4e7737b8896ddc398bff4d7d", - "armv7l-linux": "576a317dda0dc8ea150d5b6f792c3eb0631a5065ec9c100af954d1cabddde93a", - "headers": "0r0g3iaji6a7gx51bv2ijq23zpcz8ip8kmfy0x9fxqpm9angvins", - "x86_64-darwin": "63b938cbe6696f67f172d8f7cb6c31a58c38853d03d33f047fcba8c628cc700f", - "x86_64-linux": "882047343a9e203c6cfc5d39b166ea9e025dd256943e0d3711f86725ad0e3bd9" + "aarch64-darwin": "f45f80da0a2d005530b70f6f6b00756dbf875947a21e533041a05b3c4d629f79", + "aarch64-linux": "1f2037dbdcb8b1327b855ec15fbe3fb8a7f27786b331d17866e88377a0606ad8", + "armv7l-linux": "00de1cc51859a4e064a2178cb29c899feadfabf24d926d8f684c30e6ab9b72a7", + "headers": "193c7vyzly6yln4zr0b7v5vlzixl9wz59lfmgwd86h4fc79kj9na", + "x86_64-darwin": "cd6a2d4feca84b7e7b2c4a5a13a443fc3c1173e77b05f798deaab2f0f41002a1", + "x86_64-linux": "9caeeb15dada37cb3a2d80bf0f5899d175db026a4def11560890bd2f19684909" }, - "version": "42.1.0" + "version": "42.2.0" } } From 641a0957452ea54f7a1ce657b3d2c906a20f8f58 Mon Sep 17 00:00:00 2001 From: yaya Date: Wed, 20 May 2026 12:34:51 +0200 Subject: [PATCH 24/58] electron-chromedriver_42: 42.1.0 -> 42.2.0 - Changelog: https://github.com/electron/electron/releases/tag/v42.2.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v42.1.0...v42.2.0 (cherry picked from commit 2595d33117f5c68e9366a218f11305d54b996b75) --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 7c85821a9315..66a983c3be8b 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -56,13 +56,13 @@ }, "42": { "hashes": { - "aarch64-darwin": "15f47f905b59c37a2c1845595001589a1867e03c627a1880a8d6599e8ff65b21", - "aarch64-linux": "81a094306b68190e27fd253958e2047d4786d6a19035d118089100257b1c64f1", - "armv7l-linux": "6dad4f6c6ed82445cb10a86f6878dd7cb86ec49e5e48a2837ee1526f209e510b", - "headers": "0r0g3iaji6a7gx51bv2ijq23zpcz8ip8kmfy0x9fxqpm9angvins", - "x86_64-darwin": "1328a03d7f4f08946984b51dee62e761375bc9c912887965fb2dd900e65b2dfb", - "x86_64-linux": "05ffcaa8ae2f71a153217b5ffcd4aad7aed5428a70beb84b02888eb9a4097f6e" + "aarch64-darwin": "6c25b7496a0f3f4e325965ac3d934f9460e6b39fc2aa05b2aefecb1e212e7535", + "aarch64-linux": "8f6c2462e05491ab7a6ea6492fe7f62c8de1b01900978dd3dcbc878fde6f5e3e", + "armv7l-linux": "72cdb458b48306ec4939021198696926651a6a6dd47b8acf4486d77689ffe88f", + "headers": "193c7vyzly6yln4zr0b7v5vlzixl9wz59lfmgwd86h4fc79kj9na", + "x86_64-darwin": "7ea0a5378a615b816c6652c1e8f62b25fee751f34c669eb3eff122dcde98dffc", + "x86_64-linux": "ebe0fb1e5eb8a83a20612d660191d8292826d46d93701fe6390a9a5ab69aede0" }, - "version": "42.1.0" + "version": "42.2.0" } } From def9342bd41ff88328289e9e16c0bb9178bdf680 Mon Sep 17 00:00:00 2001 From: yaya Date: Wed, 20 May 2026 12:39:01 +0200 Subject: [PATCH 25/58] electron-source.electron_40: 40.10.0 -> 40.10.1 - Changelog: https://github.com/electron/electron/releases/tag/v40.10.1 - Diff: https://github.com/electron/electron/compare/refs/tags/v40.10.0...v40.10.1 (cherry picked from commit ec588199a5419b1ec14f9e9f10f5f480f67ee574) --- pkgs/development/tools/electron/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 3ea459f02d53..71fc72c359ec 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -56,10 +56,10 @@ }, "src/electron": { "args": { - "hash": "sha256-H4mLOoA2fdI5yF1qnXC1s1+BVO/ouxXOHh2ZzqJVAVc=", + "hash": "sha256-0koDZtv9T/Jkg3cndIp/1ThYa3hgFf4UfwpY8yliyaY=", "owner": "electron", "repo": "electron", - "tag": "v40.10.0" + "tag": "v40.10.1" }, "fetcher": "fetchFromGitHub" }, @@ -1387,7 +1387,7 @@ }, "modules": "143", "node": "24.15.0", - "version": "40.10.0" + "version": "40.10.1" }, "41": { "chrome": "146.0.7680.216", From 8307f118992d16e0026090151e46489e604b5ce5 Mon Sep 17 00:00:00 2001 From: yaya Date: Wed, 20 May 2026 12:48:15 +0200 Subject: [PATCH 26/58] electron-source.electron_41: 41.6.1 -> 41.7.0 - Changelog: https://github.com/electron/electron/releases/tag/v41.7.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v41.6.1...v41.7.0 (cherry picked from commit 73df9eb6e6230a984854ceec8ecec7d31e9cd88e) --- pkgs/development/tools/electron/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 71fc72c359ec..0ad4c1c4d9b2 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -1446,10 +1446,10 @@ }, "src/electron": { "args": { - "hash": "sha256-0i3h/60XFgtX3/uJ5wI36o1EU0nKn0HawXBzv8RJuKs=", + "hash": "sha256-MmVCtlvDxDKjWE45uhBI4bs0Qel5pBpbGuhHlQ4OzOg=", "owner": "electron", "repo": "electron", - "tag": "v41.6.1" + "tag": "v41.7.0" }, "fetcher": "fetchFromGitHub" }, @@ -2793,7 +2793,7 @@ }, "modules": "145", "node": "24.15.0", - "version": "41.6.1" + "version": "41.7.0" }, "42": { "chrome": "148.0.7778.97", From 1e1060e76825454bc5371c7bcb32f378ae1808c7 Mon Sep 17 00:00:00 2001 From: yaya Date: Wed, 20 May 2026 13:03:53 +0200 Subject: [PATCH 27/58] electron-source.electron_42: 42.1.0 -> 42.2.0 - Changelog: https://github.com/electron/electron/releases/tag/v42.2.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v42.1.0...v42.2.0 (cherry picked from commit 401586866891a9e2d8b8a5984c71e7f001da86b5) --- pkgs/development/tools/electron/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 0ad4c1c4d9b2..09acf09cd6d6 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -2852,10 +2852,10 @@ }, "src/electron": { "args": { - "hash": "sha256-QVWPIw2G5ai9dCLZ6K1ZuJKydMFexA17X1gtB3XeXKc=", + "hash": "sha256-UshbCxXPTrY2YQetb0B8OLohlLhQ1EHbl/zP7eNV9Yk=", "owner": "electron", "repo": "electron", - "tag": "v42.1.0" + "tag": "v42.2.0" }, "fetcher": "fetchFromGitHub" }, @@ -4207,6 +4207,6 @@ }, "modules": "146", "node": "24.15.0", - "version": "42.1.0" + "version": "42.2.0" } } From c9251f7ac6d44ed01533e3c396604008789d1079 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 28 May 2026 11:04:40 +0200 Subject: [PATCH 28/58] electron-source.electron_40: 40.10.1 -> 40.10.2 - Changelog: https://github.com/electron/electron/releases/tag/v40.10.2 - Diff: https://github.com/electron/electron/compare/refs/tags/v40.10.1...v40.10.2 (cherry picked from commit 84d3a10d69f7f5e21b30d4a80a2f979dccbfd155) --- pkgs/development/tools/electron/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 09acf09cd6d6..510caff67140 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -56,10 +56,10 @@ }, "src/electron": { "args": { - "hash": "sha256-0koDZtv9T/Jkg3cndIp/1ThYa3hgFf4UfwpY8yliyaY=", + "hash": "sha256-zpM+4Jok6FGaSKH4JxHKf9xrWNbdEVUBvgvd3Q9JnlU=", "owner": "electron", "repo": "electron", - "tag": "v40.10.1" + "tag": "v40.10.2" }, "fetcher": "fetchFromGitHub" }, @@ -1387,7 +1387,7 @@ }, "modules": "143", "node": "24.15.0", - "version": "40.10.1" + "version": "40.10.2" }, "41": { "chrome": "146.0.7680.216", From cbbbe031c1a5547a18c96638b49f39ffa2cbff9a Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 28 May 2026 11:05:05 +0200 Subject: [PATCH 29/58] electron-source.electron_41: 41.7.0 -> 41.7.1 - Changelog: https://github.com/electron/electron/releases/tag/v41.7.1 - Diff: https://github.com/electron/electron/compare/refs/tags/v41.7.0...v41.7.1 (cherry picked from commit 56c67f7f2a4bba80bc3dc6a509c4f67e2a413e3e) --- pkgs/development/tools/electron/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 510caff67140..aad1eaca97c8 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -1446,10 +1446,10 @@ }, "src/electron": { "args": { - "hash": "sha256-MmVCtlvDxDKjWE45uhBI4bs0Qel5pBpbGuhHlQ4OzOg=", + "hash": "sha256-8I/3aDZgi5iIwujKnUQ/Uxx2VeFAuwvCPXgPl04HQdg=", "owner": "electron", "repo": "electron", - "tag": "v41.7.0" + "tag": "v41.7.1" }, "fetcher": "fetchFromGitHub" }, @@ -2793,7 +2793,7 @@ }, "modules": "145", "node": "24.15.0", - "version": "41.7.0" + "version": "41.7.1" }, "42": { "chrome": "148.0.7778.97", From 52b29907ab8025b9d0bb3e80be5074a8a8159026 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 28 May 2026 11:14:12 +0200 Subject: [PATCH 30/58] electron-source.electron_42: 42.2.0 -> 42.3.0 - Changelog: https://github.com/electron/electron/releases/tag/v42.3.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v42.2.0...v42.3.0 (cherry picked from commit b06f2ab17fe1e6af1a6e08fbd1e4a0e94d9a5991) --- pkgs/development/tools/electron/info.json | 38 +++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index aad1eaca97c8..42cc5a0eaaef 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -2796,7 +2796,7 @@ "version": "41.7.1" }, "42": { - "chrome": "148.0.7778.97", + "chrome": "148.0.7778.180", "chromium": { "deps": { "gn": { @@ -2805,15 +2805,15 @@ "version": "0-unstable-2026-04-01" } }, - "version": "148.0.7778.97" + "version": "148.0.7778.180" }, "chromium_npm_hash": "sha256-JuVcY8iFRDWcPcP4Pg+qm5rnTXkiVfNsqSkXbDWqsE8=", "deps": { "src": { "args": { - "hash": "sha256-nr/bMzJ+4b7/WeT3yG6rddGHvBi51ZzDTdQLIvJYBtg=", + "hash": "sha256-Cjna6Z4uzdyuqZCacu01f1p2DoNl/x7NaZmU/NoiD3k=", "postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "tag": "148.0.7778.97", + "tag": "148.0.7778.180", "url": "https://chromium.googlesource.com/chromium/src.git" }, "fetcher": "fetchFromGitiles" @@ -2852,10 +2852,10 @@ }, "src/electron": { "args": { - "hash": "sha256-UshbCxXPTrY2YQetb0B8OLohlLhQ1EHbl/zP7eNV9Yk=", + "hash": "sha256-HwfRacBv+em/gF+eEm+hAX+k/ZUBzj9DP30aPpydWXk=", "owner": "electron", "repo": "electron", - "tag": "v42.2.0" + "tag": "v42.3.0" }, "fetcher": "fetchFromGitHub" }, @@ -2885,8 +2885,8 @@ }, "src/third_party/angle": { "args": { - "hash": "sha256-3KVTEBcnQTn99ccdKzylzUvua2jlS4g8/nfIDdLk6ug=", - "rev": "cc0e3572e8789f4a184dd9714a04b3d98ae81015", + "hash": "sha256-HcfKm7UQmg3wMDOytmaYzm7Z7gRdOrRoqAKaE0ZdI4E=", + "rev": "50fd896fb21cca91f325812d01d1e971593efc73", "url": "https://chromium.googlesource.com/angle/angle.git" }, "fetcher": "fetchFromGitiles" @@ -3359,8 +3359,8 @@ }, "src/third_party/harfbuzz/src": { "args": { - "hash": "sha256-/RT2OPWFiVwFqmNS4o+gE0JrcVO1cQDkCkgrSEe7BzE=", - "rev": "4fc96139259ebc35f40118e0382ac8037d928e5c", + "hash": "sha256-HWb3QbPl+RE2oI/Jwv5BjKwv9UnJ8VcJvk+uGy9cAqM=", + "rev": "f027b8e9039f73bf803eae684fee2eb2d30e4180", "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" }, "fetcher": "fetchFromGitiles" @@ -3383,8 +3383,8 @@ }, "src/third_party/icu": { "args": { - "hash": "sha256-yQ55MGzqkVkp/arTlmKqySBvQFtaPaBk9UUAFE0imhE=", - "rev": "ff7995a708a10ab44db101358083c7f74752da9f", + "hash": "sha256-rNErsn11FZUh8GXAl7jK+NyLHIKrQR3LuoM1qFFGtmM=", + "rev": "3859e64eed5d34544b27fbcab0ac1685ce83df3c", "url": "https://chromium.googlesource.com/chromium/deps/icu.git" }, "fetcher": "fetchFromGitiles" @@ -3840,8 +3840,8 @@ }, "src/third_party/skia": { "args": { - "hash": "sha256-HsKHffZWTls362kjokxzdhaxb/xJD1g70VHGk9l6GVM=", - "rev": "afe8b760ada5128164f9826866b4381a3463df41", + "hash": "sha256-eOjFuMmXr9YtZ0e4yDB8JMjTrNWEg5OlTkAMGuHZIWE=", + "rev": "a2888b27a98e4ff30085d4d2dba8a1a99baf6dfb", "url": "https://skia.googlesource.com/skia.git" }, "fetcher": "fetchFromGitiles" @@ -4115,8 +4115,8 @@ }, "src/third_party/webrtc": { "args": { - "hash": "sha256-jTJv53qt971Va5q6MaULysYiChBVmsFYxG9fzkcE0ak=", - "rev": "9600e77d854090669817d22aa2fc941ee92aaacd", + "hash": "sha256-k5cHE4XURJQrPURmXk4MMNV5k8+ryKfjmsVTzARRro4=", + "rev": "9a7f650bcd14f241d20f88f4e1ea3b7300de72ac", "url": "https://webrtc.googlesource.com/src.git" }, "fetcher": "fetchFromGitiles" @@ -4155,8 +4155,8 @@ }, "src/v8": { "args": { - "hash": "sha256-x2FGL3J+JaWO1m6jBrcayR7Vlz90fYEAuufm4PULYyM=", - "rev": "ddc9a95905de5268332a8f0216dc2bc67d26e829", + "hash": "sha256-+cQdsWTgIohd3yOCsNCprSr4Ctes77fWGdmPxN2tQlM=", + "rev": "ad6e4525c418a92147c8247ef9d144ce4c242a38", "url": "https://chromium.googlesource.com/v8/v8.git" }, "fetcher": "fetchFromGitiles" @@ -4207,6 +4207,6 @@ }, "modules": "146", "node": "24.15.0", - "version": "42.2.0" + "version": "42.3.0" } } From 0ab3ce4fa9a60e79ea634fb35c9abdb5f3df2cd8 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 28 May 2026 11:46:38 +0200 Subject: [PATCH 31/58] electron_40-bin: 40.10.1 -> 40.10.2 - Changelog: https://github.com/electron/electron/releases/tag/v40.10.2 - Diff: https://github.com/electron/electron/compare/refs/tags/v40.10.1...v40.10.2 (cherry picked from commit d4c613447215725e4f43e38411add2a62a7f2c4f) --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index edf0b8411736..b69bd17c6cf8 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -34,14 +34,14 @@ }, "40": { "hashes": { - "aarch64-darwin": "42d8823af50d8720a3834a816ec32985f37935d412bd39344f4b16d139282568", - "aarch64-linux": "90eb3582e74ebebe6330c89506fbb356162d20e57cfe54cc5918759e63253a41", - "armv7l-linux": "623d4658b2186350cfae47941d870a1cbe508dd523a8f185ffd6ede479381ce4", - "headers": "1rq2wn46l7svsprzhs61h9c26nldacyhhwyawa863kkw68b8r5bd", - "x86_64-darwin": "d5b8f5e429a4904c5eeba0607532c8382a89c5da927cade207e54ef31337e783", - "x86_64-linux": "f5c140c64719659a1bc530237b5a3580fe031a0157d49ab67ff2192ad551e88e" + "aarch64-darwin": "e889b35e399f374f5dca932195287b373c4b43f8bf242e50c35f88a751511a13", + "aarch64-linux": "b9725dd7a387960e778b66700836d178528ba2235c6b14135fb57ce4d3826257", + "armv7l-linux": "dd3bc8b27e905d7ac1f2d312b795e9f0f7491022aae5719ed5adf8ab4b203ef7", + "headers": "0f9c09vk9kn3c7phw3dm8k1iaf8gw3g2s37r3qdycf9akirprpf2", + "x86_64-darwin": "5d171014187fb737f34c70b09ea886215e3d88a1b79cb5370a0815c34dd15668", + "x86_64-linux": "0246201400600ac089c51a36f15a8045b5db723ba42b864f732a9b4e48731e97" }, - "version": "40.10.1" + "version": "40.10.2" }, "41": { "hashes": { From 676db8c61e8c1e8ce1e1e6567060f954df262245 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 28 May 2026 11:46:42 +0200 Subject: [PATCH 32/58] electron-chromedriver_40: 40.10.1 -> 40.10.2 - Changelog: https://github.com/electron/electron/releases/tag/v40.10.2 - Diff: https://github.com/electron/electron/compare/refs/tags/v40.10.1...v40.10.2 (cherry picked from commit b4b7495a812b3d999df416c493807e3f3485765c) --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 66a983c3be8b..c2da2afb1147 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -34,14 +34,14 @@ }, "40": { "hashes": { - "aarch64-darwin": "fc48122b2f8d666f890ba4c4db54b57386b679bf036102cb29245bed18a38298", - "aarch64-linux": "f859a1e26fa8d06829e88dc5950ced43c043d6e862945edffa3ee40ef8dd0b7d", - "armv7l-linux": "75c06087fc56bb2dbfc9a7f14a0ab403b0b41949c860481b9599edcd29e5a06c", - "headers": "1rq2wn46l7svsprzhs61h9c26nldacyhhwyawa863kkw68b8r5bd", - "x86_64-darwin": "f54b0fdee2e6d22857fb81b435d1f67faf9151a7ac67561a1048885692314dd9", - "x86_64-linux": "f3e373e2211f9f8fc0218199d1d761949c7fb3400bee1f702598878dc9911c0d" + "aarch64-darwin": "d54eec731e52b9daa25c80f8c5461928a5c8132e3af8f7dc9ecddde3e6da98d6", + "aarch64-linux": "f7cba7e899daae46e4dfaf292425dd61a97edfc6820d16d6ea6a600a8e968390", + "armv7l-linux": "a987bb7b31ed153ac304bc4dbcbfaa48139b60f3d33888ca1bbedb869dd74564", + "headers": "0f9c09vk9kn3c7phw3dm8k1iaf8gw3g2s37r3qdycf9akirprpf2", + "x86_64-darwin": "1928d63140157ede242d5111e2a5327abd01f2f9ae23e1a6bf1eb82a53029847", + "x86_64-linux": "e1dd0e162e248ca11aeca1485ccae8d813c7c7a6ef2959c42f1f8f486dad3963" }, - "version": "40.10.1" + "version": "40.10.2" }, "41": { "hashes": { From d213feb387603db8123dd2969023c03a649d1913 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 28 May 2026 11:46:45 +0200 Subject: [PATCH 33/58] electron_41-bin: 41.7.0 -> 41.7.1 - Changelog: https://github.com/electron/electron/releases/tag/v41.7.1 - Diff: https://github.com/electron/electron/compare/refs/tags/v41.7.0...v41.7.1 (cherry picked from commit 67f4d62779bae641a167633b8457fa9ec3bccaeb) --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index b69bd17c6cf8..72ec557df912 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -45,14 +45,14 @@ }, "41": { "hashes": { - "aarch64-darwin": "3de9c5eba1cf79a512058134d65ecff899623375ff1419dff2fe11346a5c45dd", - "aarch64-linux": "c8d4294e052bc83b840523237538ae131d8e387243c25e763f0d14fabffa37c2", - "armv7l-linux": "45d9df68739b0328db884db8e403f40087ffb1725fefa4185f4898a161623633", - "headers": "015x9hjafkimpji1pvkd33yn4v89is2ggv0hvmy16c39f4vfkk7z", - "x86_64-darwin": "41f6f769fb555380214588675ad0728fa69aec90166ceb51ebd0f1a08d608cd2", - "x86_64-linux": "f3bf38de05ce8fafe1039251ebfaa75fd090b0a13cd861322ccd2f6db4d6bb82" + "aarch64-darwin": "a092f0c1aa722037fa07d3256d5bf4aef2833d990bf4d09fe907d588c35b341d", + "aarch64-linux": "8a8bc763406ad19954432922347ca7c3c8db130f966871687cfb8b4ddccfa28e", + "armv7l-linux": "895ecc3b61321699c24d3554272d116113c5dc2bf72df9b94ade87957cb8c9b3", + "headers": "1n1w2ngk44w9khbh4bnw6kfakawdxh3wii3hkynbjzj21swvqzrb", + "x86_64-darwin": "4e8ab5beb895c9fe29cd46090034b214e6b404868bf5e0a5f6eb92e5c8633cc4", + "x86_64-linux": "0165fc68656f49ad7ae0c4254b1ff3af1718c114b6007a2aeef5211e0562f174" }, - "version": "41.7.0" + "version": "41.7.1" }, "42": { "hashes": { From e617fb6cbd0326457d03e87c90b5a3f86bfc57c3 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 28 May 2026 11:46:48 +0200 Subject: [PATCH 34/58] electron-chromedriver_41: 41.7.0 -> 41.7.1 - Changelog: https://github.com/electron/electron/releases/tag/v41.7.1 - Diff: https://github.com/electron/electron/compare/refs/tags/v41.7.0...v41.7.1 (cherry picked from commit 255ffe870b5bc0a0cfb0751bc0ad5f5ceea6dcc9) --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index c2da2afb1147..dddc3a6fb5b2 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -45,14 +45,14 @@ }, "41": { "hashes": { - "aarch64-darwin": "55db5abc88c2420e77f5b57fcb09608ddb5a6cdeaacfa0a517641e3c8c306605", - "aarch64-linux": "8d620805836959803a8460952424d5c6e463a5145097b4ddb2e1157da34342e6", - "armv7l-linux": "29f06b78139e26f6ebbb7735969d29668734b2e44a4f0e54b749bdcf6baac304", - "headers": "015x9hjafkimpji1pvkd33yn4v89is2ggv0hvmy16c39f4vfkk7z", - "x86_64-darwin": "cdc45610de036fa981ec2b1726c0d9e41c24cfe30c40fdf6ce8ec062bafc661a", - "x86_64-linux": "2a3598718754ff599f6fe3e7490686bb093a9c922a1631725d85b1fc0209b941" + "aarch64-darwin": "adbc1b646cbd2cb6d9e9b6c71bab2caa7c00b05faaa699585f52decd0e89dfa8", + "aarch64-linux": "336f67cce0d702066c9d42fbc1221a2ab136193b85c5ca102dafc4050ebb3a02", + "armv7l-linux": "c7d42966f343703353e1b14a37ac7724f3661f6f11095f845149cafbf3e90941", + "headers": "1n1w2ngk44w9khbh4bnw6kfakawdxh3wii3hkynbjzj21swvqzrb", + "x86_64-darwin": "c01e23366b2e51b2c57669831cb57333cc78d6db94b8be500db3347c5425c0a1", + "x86_64-linux": "15abcca021cd649a03aa73c058cdbb3a32bf9cb882191c4930073458de496189" }, - "version": "41.7.0" + "version": "41.7.1" }, "42": { "hashes": { From 7a6be6d3fc3ad6e990a40ea822ad7956d8063ee8 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 28 May 2026 11:46:52 +0200 Subject: [PATCH 35/58] electron_42-bin: 42.2.0 -> 42.3.0 - Changelog: https://github.com/electron/electron/releases/tag/v42.3.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v42.2.0...v42.3.0 (cherry picked from commit 41e8fdefe0207787e14f8aa32d86d8f65247cd13) --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 72ec557df912..ed2888a12a12 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -56,13 +56,13 @@ }, "42": { "hashes": { - "aarch64-darwin": "f45f80da0a2d005530b70f6f6b00756dbf875947a21e533041a05b3c4d629f79", - "aarch64-linux": "1f2037dbdcb8b1327b855ec15fbe3fb8a7f27786b331d17866e88377a0606ad8", - "armv7l-linux": "00de1cc51859a4e064a2178cb29c899feadfabf24d926d8f684c30e6ab9b72a7", - "headers": "193c7vyzly6yln4zr0b7v5vlzixl9wz59lfmgwd86h4fc79kj9na", - "x86_64-darwin": "cd6a2d4feca84b7e7b2c4a5a13a443fc3c1173e77b05f798deaab2f0f41002a1", - "x86_64-linux": "9caeeb15dada37cb3a2d80bf0f5899d175db026a4def11560890bd2f19684909" + "aarch64-darwin": "19f4b0a4fcc3574e79befb53495cca8de02a126210d04363cf76f67099d128ef", + "aarch64-linux": "2a375ff973fb7bddc538a4f67b2141947e9d72513a1baa2beabec2a7f65cd0f0", + "armv7l-linux": "5d15e602d978d53772ec0c58af4ef02d1ba514dc3d6752ffe79c0ad21804c38c", + "headers": "1jh4r2ivgrgwq3bvw3a89lic97xmr9r37y5xfy2sqzqlss6sq2c7", + "x86_64-darwin": "92bc6bc82cbfe4c855e9b8c55cf48c32f0448553bb74defe8cc436da9588a73e", + "x86_64-linux": "487a667ca6a734b958c16cff1df74d9d44d2c18a6cccdb4dd51f6301a356c420" }, - "version": "42.2.0" + "version": "42.3.0" } } From 70c70509597766c6265164e98ff9770c251c9c77 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 28 May 2026 11:46:56 +0200 Subject: [PATCH 36/58] electron-chromedriver_42: 42.2.0 -> 42.3.0 - Changelog: https://github.com/electron/electron/releases/tag/v42.3.0 - Diff: https://github.com/electron/electron/compare/refs/tags/v42.2.0...v42.3.0 (cherry picked from commit 1dfbc500bdad4e8b62c865c21d8811ff1a7e9cc1) --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index dddc3a6fb5b2..cb5195e8eba7 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -56,13 +56,13 @@ }, "42": { "hashes": { - "aarch64-darwin": "6c25b7496a0f3f4e325965ac3d934f9460e6b39fc2aa05b2aefecb1e212e7535", - "aarch64-linux": "8f6c2462e05491ab7a6ea6492fe7f62c8de1b01900978dd3dcbc878fde6f5e3e", - "armv7l-linux": "72cdb458b48306ec4939021198696926651a6a6dd47b8acf4486d77689ffe88f", - "headers": "193c7vyzly6yln4zr0b7v5vlzixl9wz59lfmgwd86h4fc79kj9na", - "x86_64-darwin": "7ea0a5378a615b816c6652c1e8f62b25fee751f34c669eb3eff122dcde98dffc", - "x86_64-linux": "ebe0fb1e5eb8a83a20612d660191d8292826d46d93701fe6390a9a5ab69aede0" + "aarch64-darwin": "caaf3fe945de448b908aec28eb2012eebd091dd7604d586ccba9d8dcde570564", + "aarch64-linux": "140bac763a2793c82782eef9c27272027a1aace5b02ad2dda99a1bb342063d35", + "armv7l-linux": "e4ddb1ff88404ca0c189a54466924eba6c67e0bd67aeeefe4f894ef09eff7423", + "headers": "1jh4r2ivgrgwq3bvw3a89lic97xmr9r37y5xfy2sqzqlss6sq2c7", + "x86_64-darwin": "c50daf833921ce7c9c4628d8fb8d9b294394cd4202a3dd4cd3a750dec6656ba9", + "x86_64-linux": "3c29fef7bf4873a57318fc25e77bc57bec1758e40ec8c56b4717f8dac2decc71" }, - "version": "42.2.0" + "version": "42.3.0" } } From 4a108076b58d5c7ec49e0e1993da7f5254c82cd6 Mon Sep 17 00:00:00 2001 From: Dee Anzorge Date: Thu, 11 Sep 2025 20:37:31 +0200 Subject: [PATCH 37/58] streamlink: 7.5.0 -> 8.0.0 Changes: https://github.com/streamlink/streamlink/releases/tag/7.6.0 https://github.com/streamlink/streamlink/releases/tag/8.0.0 (cherry picked from commit ac89d7862753ded4fab26124fac826f5881e7bd6) --- pkgs/by-name/st/streamlink/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/streamlink/package.nix b/pkgs/by-name/st/streamlink/package.nix index 7bcd013d9c96..07663efe3a24 100644 --- a/pkgs/by-name/st/streamlink/package.nix +++ b/pkgs/by-name/st/streamlink/package.nix @@ -11,12 +11,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "7.5.0"; + version = "8.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-wJG8d6PMjhKaIy2z4sjYuuLf75aBP83sYu4CB5QGj7k="; + hash = "sha256-+2JSuHyx1NFN/Fvx9K3RAB6HAWsVC3SV4i6Xrq4mRlU="; }; patches = [ @@ -35,6 +35,7 @@ python3Packages.buildPythonApplication rec { requests-mock freezegun pytest-trio + pytest-cov-stub ]; disabledTests = [ From 550819149b5d3efa298598d8d87636aa392dd15e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Dec 2025 19:22:15 +0000 Subject: [PATCH 38/58] streamlink: 8.0.0 -> 8.1.0 (cherry picked from commit dba748dfc009194b95157e937f89b6d864c2440c) --- pkgs/by-name/st/streamlink/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/streamlink/package.nix b/pkgs/by-name/st/streamlink/package.nix index 07663efe3a24..f035a674b6b4 100644 --- a/pkgs/by-name/st/streamlink/package.nix +++ b/pkgs/by-name/st/streamlink/package.nix @@ -11,12 +11,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "8.0.0"; + version = "8.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-+2JSuHyx1NFN/Fvx9K3RAB6HAWsVC3SV4i6Xrq4mRlU="; + hash = "sha256-rNKXIZoMuq/+TikikFVLnEVAj6n25NwSEdHM0fSkQDk="; }; patches = [ From 39bcf29882533e1a8ebaf456e72a208184f049ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Jan 2026 04:13:24 +0000 Subject: [PATCH 39/58] streamlink: 8.1.0 -> 8.1.2 (cherry picked from commit 94721f5ff8534406aeb20f096a67d10c9acea1c7) --- pkgs/by-name/st/streamlink/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/streamlink/package.nix b/pkgs/by-name/st/streamlink/package.nix index f035a674b6b4..989662a50fc1 100644 --- a/pkgs/by-name/st/streamlink/package.nix +++ b/pkgs/by-name/st/streamlink/package.nix @@ -11,12 +11,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "8.1.0"; + version = "8.1.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-rNKXIZoMuq/+TikikFVLnEVAj6n25NwSEdHM0fSkQDk="; + hash = "sha256-0ICZ+hsWm61KmR0xsquJ8EugixMZ7R9b0OrYVH1MWtM="; }; patches = [ From 4a2cd0b1ca02e3cd967873f39316fa12a5525562 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Feb 2026 06:54:11 +0000 Subject: [PATCH 40/58] streamlink: 8.1.2 -> 8.2.0 (cherry picked from commit 38b2c4b4a0560e682bfd299a51b95c050ac9fa73) --- pkgs/by-name/st/streamlink/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/streamlink/package.nix b/pkgs/by-name/st/streamlink/package.nix index 989662a50fc1..e7e0432acab2 100644 --- a/pkgs/by-name/st/streamlink/package.nix +++ b/pkgs/by-name/st/streamlink/package.nix @@ -11,12 +11,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "8.1.2"; + version = "8.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-0ICZ+hsWm61KmR0xsquJ8EugixMZ7R9b0OrYVH1MWtM="; + hash = "sha256-ZFI+mUAd307n8J9VF4fcEnER7rmsjYsOgDeWbv3XoaU="; }; patches = [ From 91a8535b3672a22ecf959f7e67fdeb3f3c411c06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Mar 2026 01:35:28 +0000 Subject: [PATCH 41/58] streamlink: 8.2.0 -> 8.2.1 (cherry picked from commit 0267b4b01a587270de1e119c51c061416716059b) --- pkgs/by-name/st/streamlink/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/streamlink/package.nix b/pkgs/by-name/st/streamlink/package.nix index e7e0432acab2..179b18aec179 100644 --- a/pkgs/by-name/st/streamlink/package.nix +++ b/pkgs/by-name/st/streamlink/package.nix @@ -11,12 +11,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "8.2.0"; + version = "8.2.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ZFI+mUAd307n8J9VF4fcEnER7rmsjYsOgDeWbv3XoaU="; + hash = "sha256-r6Jlgsq/ND9Jcz154ryaW76QrsfbskbsX5d5ZJnGN+4="; }; patches = [ From a94a0df2bf4ff7ee8f6022ea886c61dc727d8f66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Apr 2026 12:24:51 +0000 Subject: [PATCH 42/58] streamlink: 8.2.1 -> 8.3.0 (cherry picked from commit b23bfc0347e393395abe284507fa603c10ff75c2) --- pkgs/by-name/st/streamlink/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/streamlink/package.nix b/pkgs/by-name/st/streamlink/package.nix index 179b18aec179..c14ab1bddfe5 100644 --- a/pkgs/by-name/st/streamlink/package.nix +++ b/pkgs/by-name/st/streamlink/package.nix @@ -11,12 +11,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "8.2.1"; + version = "8.3.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-r6Jlgsq/ND9Jcz154ryaW76QrsfbskbsX5d5ZJnGN+4="; + hash = "sha256-bP/lW0LfOzwubdHAzEH8AUd6+8SWuoZ0D/pe7FwzPTQ="; }; patches = [ From 3b13be97f5c7c6f2dd249349f384e65205ad05e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 May 2026 05:20:37 +0000 Subject: [PATCH 43/58] streamlink: 8.3.0 -> 8.4.0 (cherry picked from commit 72bc38b8176e39148e268b10ad236e84d2840b49) --- pkgs/by-name/st/streamlink/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/streamlink/package.nix b/pkgs/by-name/st/streamlink/package.nix index c14ab1bddfe5..4cd06f7701f8 100644 --- a/pkgs/by-name/st/streamlink/package.nix +++ b/pkgs/by-name/st/streamlink/package.nix @@ -11,12 +11,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "8.3.0"; + version = "8.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-bP/lW0LfOzwubdHAzEH8AUd6+8SWuoZ0D/pe7FwzPTQ="; + hash = "sha256-9HfpSTM2vLfDorEO6nKmCumn9J6WitoNTQG/946sRLs="; }; patches = [ From c1bbe8cbd9577a1effc62f1894e3ec956d0a8952 Mon Sep 17 00:00:00 2001 From: Sean Gilligan Date: Tue, 12 May 2026 22:00:45 -0700 Subject: [PATCH 44/58] 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. (cherry picked from commit 6f2c0a34f359f019a961a8b63d92c70c4995ff5f) --- 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 312b6ceed4bad56c3520034a89a85cfaa32a5792 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Sat, 30 May 2026 00:25:06 +0200 Subject: [PATCH 45/58] nixos/kernel_config: remove redundant mergeEqualOption (cherry picked from commit 6996a952c99caa705282ba98bc3a4fcc292d8579) --- nixos/modules/system/boot/kernel_config.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/kernel_config.nix b/nixos/modules/system/boot/kernel_config.nix index 2cf34e899cae..115b55d98143 100644 --- a/nixos/modules/system/boot/kernel_config.nix +++ b/nixos/modules/system/boot/kernel_config.nix @@ -29,9 +29,7 @@ let }; freeform = mkOption { - type = types.nullOr types.str // { - merge = mergeEqualOption; - }; + type = types.nullOr types.str; default = null; example = ''MMC_BLOCK_MINORS.freeform = "32";''; description = '' From 840ebf42101dd551bb6fc33742954e7dec8e053e Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Sat, 30 May 2026 23:17:45 +0100 Subject: [PATCH 46/58] =?UTF-8?q?nixfmt:=201.2.0=20=E2=86=92=201.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/NixOS/nixfmt/releases/tag/v1.3.0 https://github.com/NixOS/nixfmt/releases/tag/v1.3.1 (cherry picked from commit 2dcf354cc02be34a2ab823be68fbf4b809f9a9ff) --- pkgs/by-name/ni/nixfmt/generated-package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ni/nixfmt/generated-package.nix b/pkgs/by-name/ni/nixfmt/generated-package.nix index 15d12a654017..e1c3e1c67fd1 100644 --- a/pkgs/by-name/ni/nixfmt/generated-package.nix +++ b/pkgs/by-name/ni/nixfmt/generated-package.nix @@ -24,10 +24,10 @@ }: mkDerivation { pname = "nixfmt"; - version = "1.2.0"; + version = "1.3.1"; src = fetchzip { - url = "https://github.com/nixos/nixfmt/archive/v1.2.0.tar.gz"; - sha256 = "1qvj1sddh7bgggqnj7cnhvfh4iz1pwzc9a9awc1g7y349yvpwad3"; + url = "https://github.com/nixos/nixfmt/archive/v1.3.1.tar.gz"; + sha256 = "1c0iz6hrzafld8vkldcmall7fvby6xgzzqgap8c3bxwhaxhq86hm"; }; isLibrary = true; isExecutable = true; @@ -58,6 +58,6 @@ mkDerivation { jailbreak = true; homepage = "https://github.com/NixOS/nixfmt"; description = "Official formatter for Nix code"; - license = lib.licenses.mpl20; + license = lib.meta.getLicenseFromSpdxId "MPL-2.0"; mainProgram = "nixfmt"; } From d95a002e88fd116e2c7e12a04e34ce8befba8467 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Sat, 30 May 2026 23:44:21 +0100 Subject: [PATCH 47/58] nixfmt: add versionCheckHook Replace the `passthru.tests` --version test by running versionCheckHook during the package build. As `haskellPackages.mkDerivation` is very locked-down and doesn't allow access to things like `nativeInstallCheckInputs` (or any input lists), we add a separate `.overrideAttrs` call to the pipeline. Running phase: installCheckPhase Executing versionCheckPhase Successfully managed to find version 1.3.0 in the output of the command /nix/store/3fg7y7qww3c3hvyb66n75d9j5y362n4j-nixfmt-1.3.0/bin/nixfmt --version nixfmt 1.3.0 Finished versionCheckPhase (cherry picked from commit ce5210e9c728c8a89a103d7a6c8c6662cac081c3) --- pkgs/by-name/ni/nixfmt/package.nix | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ni/nixfmt/package.nix b/pkgs/by-name/ni/nixfmt/package.nix index 93a198f73f2a..ebd16230063c 100644 --- a/pkgs/by-name/ni/nixfmt/package.nix +++ b/pkgs/by-name/ni/nixfmt/package.nix @@ -2,27 +2,31 @@ haskell, haskellPackages, lib, - runCommand, - nixfmt, + stdenv, + versionCheckHook, }: let inherit (haskell.lib.compose) overrideCabal justStaticExecutables; - overrides = { + cabalOverrides = { passthru.updateScript = ./update.sh; - teams = [ lib.teams.formatter ]; - - # These tests can be run with the following command. - # - # $ nix-build -A nixfmt.tests - passthru.tests = runCommand "nixfmt-tests" { nativeBuildInputs = [ nixfmt ]; } '' - nixfmt --version > $out - ''; }; + + # haskellPackages.mkDerivation and haskell.lib.compose.overrideCabal + # do not allow access to `doInstallCheck` or `nativeInstallCheckInputs`, + # so we override directly with `.overrideAttrs`. + lateOverrides = finalAttrs: prevAttrs: { + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + nativeInstallCheckInputs = prevAttrs.nativeInstallCheckInputs or [ ] ++ [ + versionCheckHook + ]; + }; + raw-pkg = haskellPackages.callPackage ./generated-package.nix { }; in lib.pipe raw-pkg [ - (overrideCabal overrides) + (overrideCabal cabalOverrides) justStaticExecutables + (drv: drv.overrideAttrs lateOverrides) ] From f611502e2f261e0f9f421b27572386ed128b087f Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Sat, 30 May 2026 23:58:22 +0100 Subject: [PATCH 48/58] nixfmt: add `meta.changelog` (cherry picked from commit dededefefa26bd3ebb20ab5b0c3676d19687b5d5) --- pkgs/by-name/ni/nixfmt/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nixfmt/package.nix b/pkgs/by-name/ni/nixfmt/package.nix index ebd16230063c..c12ec5d2ed4f 100644 --- a/pkgs/by-name/ni/nixfmt/package.nix +++ b/pkgs/by-name/ni/nixfmt/package.nix @@ -8,9 +8,10 @@ let inherit (haskell.lib.compose) overrideCabal justStaticExecutables; - cabalOverrides = { + cabalOverrides = drv: { passthru.updateScript = ./update.sh; teams = [ lib.teams.formatter ]; + changelog = "https://github.com/NixOS/nixfmt/releases/tag/v${drv.version}"; }; # haskellPackages.mkDerivation and haskell.lib.compose.overrideCabal From 758214ba77e4b79a85d00ef0980e9cb9b8b4c32c Mon Sep 17 00:00:00 2001 From: whispers Date: Mon, 1 Jun 2026 13:38:52 -0400 Subject: [PATCH 49/58] tor: 0.4.9.8 -> 0.4.9.9 Release notes: https://gitlab.torproject.org/tpo/core/tor/-/raw/tor-0.4.9.9/ReleaseNotes TROVE: https://gitlab.torproject.org/tpo/core/team/-/wikis/NetworkTeam/TROVE This release fixes nine medium severity and one low severity security issues. Fixes: TROVE-2026-013, TROVE-2026-014, TROVE-2026-015, TROVE-2026-016, TROVE-2026-017, TROVE-2026-018, TROVE-2026-019, TROVE-2026-020, TROVE-2026-021, TROVE-2026-022 (cherry picked from commit abf5c51c47919b6240e8fd66930a12328d19c271) --- pkgs/by-name/to/tor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/to/tor/package.nix b/pkgs/by-name/to/tor/package.nix index d9c20ea7469a..0dc294b13f30 100644 --- a/pkgs/by-name/to/tor/package.nix +++ b/pkgs/by-name/to/tor/package.nix @@ -46,11 +46,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "tor"; - version = "0.4.9.8"; + version = "0.4.9.9"; src = fetchurl { url = "https://dist.torproject.org/tor-${finalAttrs.version}.tar.gz"; - hash = "sha256-rB85Ti3Sqwh30n2Sj9DZ6GZi/jymr9/7n9m28PltBd4="; + hash = "sha256-vXW6f9aPYHx4Bvz3AVajAKqSbprWml5WqOZBT1In6DM="; }; outputs = [ From 191a89a79b8bfe3cfd41b5b4837defadf327165d Mon Sep 17 00:00:00 2001 From: "nixpkgs-ci[bot]" <190413589+nixpkgs-ci[bot]@users.noreply.github.com> Date: Mon, 1 Jun 2026 21:03:17 +0000 Subject: [PATCH 50/58] maintainers/github-teams.json: Automated sync (cherry picked from commit 5dca05f1d0639ae5bf7140994aeb7a5732a61bd1) --- maintainers/github-teams.json | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index 6ef8ff8e70a9..baa4550e5f8a 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -935,6 +935,7 @@ "infinisil": 20525370 }, "members": { + "andir": 638836, "pyrox0": 35778371 }, "name": "Security review" From 067966c13d385ec0f0496b917467cb292ccda9a6 Mon Sep 17 00:00:00 2001 From: Bart Oostveen Date: Mon, 1 Jun 2026 18:25:05 +0200 Subject: [PATCH 51/58] linux_testing: 7.1-rc4 -> 7.1-rc6 (cherry picked from commit bda3d9ef3698485db769cba08eb6af1341cf6ab0) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index fd9cf5dac790..ce7caad77c1c 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "7.1-rc4", - "hash": "sha256:06z73f1vprl4adbdj01h3407p3f8bl8jsz91zx454c62k2jg3w40", + "version": "7.1-rc6", + "hash": "sha256:1fmbsjhdrkzim6vzqc40raikv1szfw28q0lbvap8a1g77an0qi58", "lts": false }, "6.1": { From 935feb016cc2f132eecb1cbbdf422aeac264e5ca Mon Sep 17 00:00:00 2001 From: Bart Oostveen Date: Mon, 1 Jun 2026 18:25:20 +0200 Subject: [PATCH 52/58] linux_7_0: 7.0.10 -> 7.0.11 (cherry picked from commit 3e9caa186f62c8e1dc03b403004f888fc71d6b3c) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index ce7caad77c1c..99ce785eed42 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -35,8 +35,8 @@ "lts": true }, "7.0": { - "version": "7.0.10", - "hash": "sha256:1p1j9s0b4qv9m0pm6vj477rqgyd1b0lsk0gy74cks3n2cbmpfj89", + "version": "7.0.11", + "hash": "sha256:012307ni1v555a1rgzsxsg99pj8fplrghvhw0jk3c4d0vmb86v75", "lts": false } } From d87275b816f6badfc0e43ad73bcc0f34461e620f Mon Sep 17 00:00:00 2001 From: Bart Oostveen Date: Mon, 1 Jun 2026 18:25:27 +0200 Subject: [PATCH 53/58] linux_6_18: 6.18.33 -> 6.18.34 (cherry picked from commit 28254d87ca1a4f205a74ca48690daf940d723185) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 99ce785eed42..df241fb95ae1 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -30,8 +30,8 @@ "lts": true }, "6.18": { - "version": "6.18.33", - "hash": "sha256:10mp1ypsdz42jr26g1xxbw806mvpy0n35418fhsgxxlr4lqgy5kg", + "version": "6.18.34", + "hash": "sha256:0q6palsvwx0gnisjr658hlngfpvyzv0k5q4pvdk23122zcr4f334", "lts": true }, "7.0": { From a430b4f7abc67da12da4b60200018a520a365028 Mon Sep 17 00:00:00 2001 From: Bart Oostveen Date: Mon, 1 Jun 2026 18:25:34 +0200 Subject: [PATCH 54/58] linux_6_12: 6.12.91 -> 6.12.92 (cherry picked from commit 221fae9c48d2b98fc0cb02ef21cfe48a4238d68a) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index df241fb95ae1..2f030c72634a 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -25,8 +25,8 @@ "lts": true }, "6.12": { - "version": "6.12.91", - "hash": "sha256:0sbrb612b653w64g5jkpbf68y0fka2sgnwblam41k7wz2sgapwhg", + "version": "6.12.92", + "hash": "sha256:0gly5wld3x8l0f3zk9pspsw1q2d7zbjbx4c2ndb49b1wvfvpdqqg", "lts": true }, "6.18": { From 05c97eddbe9467fac65c872dd8d870da5785cd9d Mon Sep 17 00:00:00 2001 From: Bart Oostveen Date: Mon, 1 Jun 2026 18:25:40 +0200 Subject: [PATCH 55/58] linux_6_6: 6.6.141 -> 6.6.142 (cherry picked from commit 10035889cf19e0264b390247844d497d716b5c56) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 2f030c72634a..4f037c04cfdc 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "lts": true }, "6.6": { - "version": "6.6.141", - "hash": "sha256:1qbzxgqs7q9gyqfrf0j7p0pgjxnjj5mibamhm280mf9anqp6bhiv", + "version": "6.6.142", + "hash": "sha256:0w1bdzp9x1sqcr9xlk7dvylhs7kycghjabfgd3iv49ydfmx61xmj", "lts": true }, "6.12": { From fdd22a35138c6f56489b425b7b0a354eb050dcf1 Mon Sep 17 00:00:00 2001 From: Bart Oostveen Date: Mon, 1 Jun 2026 18:25:46 +0200 Subject: [PATCH 56/58] linux_6_1: 6.1.174 -> 6.1.175 (cherry picked from commit 2a612a8cbf3bd600afea16628592ba3d52568d75) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 4f037c04cfdc..62ecc569be5f 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -5,8 +5,8 @@ "lts": false }, "6.1": { - "version": "6.1.174", - "hash": "sha256:0vp07x4v82qnmc1pifv3ynp2ab5mvlbfnpqvs5893bi3yrnk927d", + "version": "6.1.175", + "hash": "sha256:11fapr04y96p9ja6mfzm7bcd3zb4dzyw6qrh7c11bss9wjlq9s9p", "lts": true }, "5.15": { From 3b2730cdfa12df25e36552588e5a4a1824e71424 Mon Sep 17 00:00:00 2001 From: Bart Oostveen Date: Mon, 1 Jun 2026 18:25:51 +0200 Subject: [PATCH 57/58] linux_5_15: 5.15.208 -> 5.15.209 (cherry picked from commit 661833f61e0b987bb8900086a71b8411468de5a4) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 62ecc569be5f..eac04ed0a54b 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -10,8 +10,8 @@ "lts": true }, "5.15": { - "version": "5.15.208", - "hash": "sha256:0wmi50q8vgblhbh77d1a4sw4snymr6srqd22bxcjg9i7wcv70gdm", + "version": "5.15.209", + "hash": "sha256:1d0yhbpqlkr1znahky15dfavr6dzb3wb8c15k9qqvkf2xb3pfv9l", "lts": true }, "5.10": { From 1bf4245a9b5237de8bba263aef5c58419ef40dfa Mon Sep 17 00:00:00 2001 From: Bart Oostveen Date: Mon, 1 Jun 2026 18:25:56 +0200 Subject: [PATCH 58/58] linux_5_10: 5.10.257 -> 5.10.258 (cherry picked from commit d07b0d9dacbe69dd061c3d738b60c58e9a9db9f4) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index eac04ed0a54b..f2e87f79b99c 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -15,8 +15,8 @@ "lts": true }, "5.10": { - "version": "5.10.257", - "hash": "sha256:1lghcrxc1fqarvym03jrcda2a3labc887ci9yjqgbmv3nphzvc88", + "version": "5.10.258", + "hash": "sha256:1rdldzb3g33v6zvcmxafqpkjgqpp4n5qlxwb77wfd5jpzhgcnz4y", "lts": true }, "6.6": {