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" 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 = '' diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix deleted file mode 100644 index 6ee360b9e226..000000000000 --- a/pkgs/applications/misc/plover/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - config, - fetchFromGitHub, - python3Packages, - wmctrl, - qtbase, - mkDerivationWith, -}: - -{ - dev = - with python3Packages; - mkDerivationWith buildPythonPackage rec { - pname = "plover"; - version = "4.0.2"; - format = "setuptools"; - - meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; - description = "OpenSteno Plover stenography software"; - maintainers = with lib.maintainers; [ - twey - kovirobi - ]; - 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/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) 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"; } diff --git a/pkgs/by-name/ni/nixfmt/package.nix b/pkgs/by-name/ni/nixfmt/package.nix index 93a198f73f2a..c12ec5d2ed4f 100644 --- a/pkgs/by-name/ni/nixfmt/package.nix +++ b/pkgs/by-name/ni/nixfmt/package.nix @@ -2,27 +2,32 @@ haskell, haskellPackages, lib, - runCommand, - nixfmt, + stdenv, + versionCheckHook, }: let inherit (haskell.lib.compose) overrideCabal justStaticExecutables; - overrides = { + cabalOverrides = drv: { 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 - ''; + changelog = "https://github.com/NixOS/nixfmt/releases/tag/v${drv.version}"; }; + + # 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) ] 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/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 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 diff --git a/pkgs/by-name/st/streamlink/package.nix b/pkgs/by-name/st/streamlink/package.nix index 7bcd013d9c96..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 = "7.5.0"; + version = "8.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-wJG8d6PMjhKaIy2z4sjYuuLf75aBP83sYu4CB5QGj7k="; + hash = "sha256-9HfpSTM2vLfDorEO6nKmCumn9J6WitoNTQG/946sRLs="; }; patches = [ @@ -35,6 +35,7 @@ python3Packages.buildPythonApplication rec { requests-mock freezegun pytest-trio + pytest-cov-stub ]; disabledTests = [ 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 = [ 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/development/python-modules/plover/4.nix b/pkgs/development/python-modules/plover/4.nix new file mode 100644 index 000000000000..bda985cb0122 --- /dev/null +++ b/pkgs/development/python-modules/plover/4.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; + }; +}) diff --git a/pkgs/development/python-modules/plover/5.nix b/pkgs/development/python-modules/plover/5.nix new file mode 100644 index 000000000000..45899b201b7a --- /dev/null +++ b/pkgs/development/python-modules/plover/5.nix @@ -0,0 +1,128 @@ +{ + lib, + stdenv, + buildPackages, + buildPythonPackage, + fetchFromGitHub, + versionCheckHook, + appdirs, + babel, + evdev, + mock, + 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, +}: + +buildPythonPackage (finalAttrs: { + __structuredAttrs = true; + + pname = "plover"; + version = "5.0.0.dev2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "openstenoproject"; + repo = "plover"; + tag = "v${finalAttrs.version}"; + hash = "sha256-PZwxVrdQPhgbj+YmWZIUETngeJGs6IQty0hY43tLQO0="; + }; + + # pythonRelaxDeps seemingly doesn't work here + postPatch = '' + sed -i 's/,<77//g' pyproject.toml + sed -i /PySide6-Essentials/d pyproject.toml + ''; + + build-system = [ + babel + setuptools + 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 + 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 + ]; + + 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; + }; +}) 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/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index b552e8d10884..ed2888a12a12 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -34,35 +34,35 @@ }, "40": { "hashes": { - "aarch64-darwin": "c3dd4d70aeb214a5b755af59e4e5d7b5b743f3f662a8a452b0afc2741953b7a5", - "aarch64-linux": "cb4454ae64f00f43cef86f57d38eff9a6cef7b1e0690debc1dc81323f98e6e63", - "armv7l-linux": "d3a99f2f734b407ab7de45dbb992825089a2f9e351c470a5fea0273ec027a681", - "headers": "0x534f94ds3qavwh90a4l63wpsagscwnbzi8399z067d2ghyzh18", - "x86_64-darwin": "a73b879e5cfa880e0b82e0a75d7a2ba1c892715d2db95dc6578277e74c7b8a04", - "x86_64-linux": "35efe7401822e8d2e474e13788a6191362c7494dd1f7ae327b70087e0768a667" + "aarch64-darwin": "e889b35e399f374f5dca932195287b373c4b43f8bf242e50c35f88a751511a13", + "aarch64-linux": "b9725dd7a387960e778b66700836d178528ba2235c6b14135fb57ce4d3826257", + "armv7l-linux": "dd3bc8b27e905d7ac1f2d312b795e9f0f7491022aae5719ed5adf8ab4b203ef7", + "headers": "0f9c09vk9kn3c7phw3dm8k1iaf8gw3g2s37r3qdycf9akirprpf2", + "x86_64-darwin": "5d171014187fb737f34c70b09ea886215e3d88a1b79cb5370a0815c34dd15668", + "x86_64-linux": "0246201400600ac089c51a36f15a8045b5db723ba42b864f732a9b4e48731e97" }, - "version": "40.10.0" + "version": "40.10.2" }, "41": { "hashes": { - "aarch64-darwin": "b41988e6aa105e550931d9d2eff15c0bb99c39871c2ff5af87f105c44edc5a7a", - "aarch64-linux": "b69fb25275d744e272afe3775aed0cce20c8ad2309744558089c33da92c0432a", - "armv7l-linux": "f318e60b182fc791ba90bd7c586ee7e1f603daf90925b64d7c295e8b7a610875", + "aarch64-darwin": "a092f0c1aa722037fa07d3256d5bf4aef2833d990bf4d09fe907d588c35b341d", + "aarch64-linux": "8a8bc763406ad19954432922347ca7c3c8db130f966871687cfb8b4ddccfa28e", + "armv7l-linux": "895ecc3b61321699c24d3554272d116113c5dc2bf72df9b94ade87957cb8c9b3", "headers": "1n1w2ngk44w9khbh4bnw6kfakawdxh3wii3hkynbjzj21swvqzrb", - "x86_64-darwin": "fc802de570925bf75ca5911ffd8a8736232de2c742430938b2b621c79af93db4", - "x86_64-linux": "8f1bbd1ea46c5e4fc5f3ae9a04554de9da2fe0c65fbd8751b8493d2b39bf7a97" + "x86_64-darwin": "4e8ab5beb895c9fe29cd46090034b214e6b404868bf5e0a5f6eb92e5c8633cc4", + "x86_64-linux": "0165fc68656f49ad7ae0c4254b1ff3af1718c114b6007a2aeef5211e0562f174" }, - "version": "41.6.1" + "version": "41.7.1" }, "42": { "hashes": { - "aarch64-darwin": "98d097299eb08094d0df3312b2d6e8677069d8defdab891143628d4f82f46117", - "aarch64-linux": "1e700f7f3daef794cc45235e51c1172664aed49a4e7737b8896ddc398bff4d7d", - "armv7l-linux": "576a317dda0dc8ea150d5b6f792c3eb0631a5065ec9c100af954d1cabddde93a", - "headers": "0r0g3iaji6a7gx51bv2ijq23zpcz8ip8kmfy0x9fxqpm9angvins", - "x86_64-darwin": "63b938cbe6696f67f172d8f7cb6c31a58c38853d03d33f047fcba8c628cc700f", - "x86_64-linux": "882047343a9e203c6cfc5d39b166ea9e025dd256943e0d3711f86725ad0e3bd9" + "aarch64-darwin": "19f4b0a4fcc3574e79befb53495cca8de02a126210d04363cf76f67099d128ef", + "aarch64-linux": "2a375ff973fb7bddc538a4f67b2141947e9d72513a1baa2beabec2a7f65cd0f0", + "armv7l-linux": "5d15e602d978d53772ec0c58af4ef02d1ba514dc3d6752ffe79c0ad21804c38c", + "headers": "1jh4r2ivgrgwq3bvw3a89lic97xmr9r37y5xfy2sqzqlss6sq2c7", + "x86_64-darwin": "92bc6bc82cbfe4c855e9b8c55cf48c32f0448553bb74defe8cc436da9588a73e", + "x86_64-linux": "487a667ca6a734b958c16cff1df74d9d44d2c18a6cccdb4dd51f6301a356c420" }, - "version": "42.1.0" + "version": "42.3.0" } } diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index bf6f7c0d6cd3..cb5195e8eba7 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -34,35 +34,35 @@ }, "40": { "hashes": { - "aarch64-darwin": "ed4e021fe841be3b04c6c4cf3968a1628b9d84ca07b5362aa54c377b3fde18f0", - "aarch64-linux": "bfb57aa77b06e2179c5076274f9d61615414c295e16eabd99206a7553c9eacdc", - "armv7l-linux": "8f35c8b25f98d18d5d5852d2b244e64183dfb61b10b9a64b0be579f450f2cb73", - "headers": "0x534f94ds3qavwh90a4l63wpsagscwnbzi8399z067d2ghyzh18", - "x86_64-darwin": "f2caf8c9fe1c5c38259881824adce6b11a5a482576d47d7dc113a950e9315bf8", - "x86_64-linux": "303345908d998a83b953c9f60a8b0f07e8fa82ed839260784a7b5c2fc517a86f" + "aarch64-darwin": "d54eec731e52b9daa25c80f8c5461928a5c8132e3af8f7dc9ecddde3e6da98d6", + "aarch64-linux": "f7cba7e899daae46e4dfaf292425dd61a97edfc6820d16d6ea6a600a8e968390", + "armv7l-linux": "a987bb7b31ed153ac304bc4dbcbfaa48139b60f3d33888ca1bbedb869dd74564", + "headers": "0f9c09vk9kn3c7phw3dm8k1iaf8gw3g2s37r3qdycf9akirprpf2", + "x86_64-darwin": "1928d63140157ede242d5111e2a5327abd01f2f9ae23e1a6bf1eb82a53029847", + "x86_64-linux": "e1dd0e162e248ca11aeca1485ccae8d813c7c7a6ef2959c42f1f8f486dad3963" }, - "version": "40.10.0" + "version": "40.10.2" }, "41": { "hashes": { - "aarch64-darwin": "33852f5e551e18c43e1031492fe62153759fc7968bd14f9cc179673517e10bd0", - "aarch64-linux": "2f99b486290989bc4d756ffc0448c93c728e03d519872e492b1cadd5d5905885", - "armv7l-linux": "27d03e18b3e3e484ceb7f7f05ace5eda075a5a468223797d4ae988a75424b6d0", + "aarch64-darwin": "adbc1b646cbd2cb6d9e9b6c71bab2caa7c00b05faaa699585f52decd0e89dfa8", + "aarch64-linux": "336f67cce0d702066c9d42fbc1221a2ab136193b85c5ca102dafc4050ebb3a02", + "armv7l-linux": "c7d42966f343703353e1b14a37ac7724f3661f6f11095f845149cafbf3e90941", "headers": "1n1w2ngk44w9khbh4bnw6kfakawdxh3wii3hkynbjzj21swvqzrb", - "x86_64-darwin": "5e47e5ae1d0401b32838a9074fc13d291b09bad0cb61a265ad5388ef9eb8ade7", - "x86_64-linux": "9921145c87cb6f279e5baa2c5af8763a4695c84bc5206273dbbb0385b493513c" + "x86_64-darwin": "c01e23366b2e51b2c57669831cb57333cc78d6db94b8be500db3347c5425c0a1", + "x86_64-linux": "15abcca021cd649a03aa73c058cdbb3a32bf9cb882191c4930073458de496189" }, - "version": "41.6.1" + "version": "41.7.1" }, "42": { "hashes": { - "aarch64-darwin": "15f47f905b59c37a2c1845595001589a1867e03c627a1880a8d6599e8ff65b21", - "aarch64-linux": "81a094306b68190e27fd253958e2047d4786d6a19035d118089100257b1c64f1", - "armv7l-linux": "6dad4f6c6ed82445cb10a86f6878dd7cb86ec49e5e48a2837ee1526f209e510b", - "headers": "0r0g3iaji6a7gx51bv2ijq23zpcz8ip8kmfy0x9fxqpm9angvins", - "x86_64-darwin": "1328a03d7f4f08946984b51dee62e761375bc9c912887965fb2dd900e65b2dfb", - "x86_64-linux": "05ffcaa8ae2f71a153217b5ffcd4aad7aed5428a70beb84b02888eb9a4097f6e" + "aarch64-darwin": "caaf3fe945de448b908aec28eb2012eebd091dd7604d586ccba9d8dcde570564", + "aarch64-linux": "140bac763a2793c82782eef9c27272027a1aace5b02ad2dda99a1bb342063d35", + "armv7l-linux": "e4ddb1ff88404ca0c189a54466924eba6c67e0bd67aeeefe4f894ef09eff7423", + "headers": "1jh4r2ivgrgwq3bvw3a89lic97xmr9r37y5xfy2sqzqlss6sq2c7", + "x86_64-darwin": "c50daf833921ce7c9c4628d8fb8d9b294394cd4202a3dd4cd3a750dec6656ba9", + "x86_64-linux": "3c29fef7bf4873a57318fc25e77bc57bec1758e40ec8c56b4717f8dac2decc71" }, - "version": "42.1.0" + "version": "42.3.0" } } diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 3ea459f02d53..42cc5a0eaaef 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-zpM+4Jok6FGaSKH4JxHKf9xrWNbdEVUBvgvd3Q9JnlU=", "owner": "electron", "repo": "electron", - "tag": "v40.10.0" + "tag": "v40.10.2" }, "fetcher": "fetchFromGitHub" }, @@ -1387,7 +1387,7 @@ }, "modules": "143", "node": "24.15.0", - "version": "40.10.0" + "version": "40.10.2" }, "41": { "chrome": "146.0.7680.216", @@ -1446,10 +1446,10 @@ }, "src/electron": { "args": { - "hash": "sha256-0i3h/60XFgtX3/uJ5wI36o1EU0nKn0HawXBzv8RJuKs=", + "hash": "sha256-8I/3aDZgi5iIwujKnUQ/Uxx2VeFAuwvCPXgPl04HQdg=", "owner": "electron", "repo": "electron", - "tag": "v41.6.1" + "tag": "v41.7.1" }, "fetcher": "fetchFromGitHub" }, @@ -2793,10 +2793,10 @@ }, "modules": "145", "node": "24.15.0", - "version": "41.6.1" + "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-QVWPIw2G5ai9dCLZ6K1ZuJKydMFexA17X1gtB3XeXKc=", + "hash": "sha256-HwfRacBv+em/gF+eEm+hAX+k/ZUBzj9DP30aPpydWXk=", "owner": "electron", "repo": "electron", - "tag": "v42.1.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.1.0" + "version": "42.3.0" } } diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index fd9cf5dac790..f2e87f79b99c 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,42 +1,42 @@ { "testing": { - "version": "7.1-rc4", - "hash": "sha256:06z73f1vprl4adbdj01h3407p3f8bl8jsz91zx454c62k2jg3w40", + "version": "7.1-rc6", + "hash": "sha256:1fmbsjhdrkzim6vzqc40raikv1szfw28q0lbvap8a1g77an0qi58", "lts": false }, "6.1": { - "version": "6.1.174", - "hash": "sha256:0vp07x4v82qnmc1pifv3ynp2ab5mvlbfnpqvs5893bi3yrnk927d", + "version": "6.1.175", + "hash": "sha256:11fapr04y96p9ja6mfzm7bcd3zb4dzyw6qrh7c11bss9wjlq9s9p", "lts": true }, "5.15": { - "version": "5.15.208", - "hash": "sha256:0wmi50q8vgblhbh77d1a4sw4snymr6srqd22bxcjg9i7wcv70gdm", + "version": "5.15.209", + "hash": "sha256:1d0yhbpqlkr1znahky15dfavr6dzb3wb8c15k9qqvkf2xb3pfv9l", "lts": true }, "5.10": { - "version": "5.10.257", - "hash": "sha256:1lghcrxc1fqarvym03jrcda2a3labc887ci9yjqgbmv3nphzvc88", + "version": "5.10.258", + "hash": "sha256:1rdldzb3g33v6zvcmxafqpkjgqpp4n5qlxwb77wfd5jpzhgcnz4y", "lts": true }, "6.6": { - "version": "6.6.141", - "hash": "sha256:1qbzxgqs7q9gyqfrf0j7p0pgjxnjj5mibamhm280mf9anqp6bhiv", + "version": "6.6.142", + "hash": "sha256:0w1bdzp9x1sqcr9xlk7dvylhs7kycghjabfgd3iv49ydfmx61xmj", "lts": true }, "6.12": { - "version": "6.12.91", - "hash": "sha256:0sbrb612b653w64g5jkpbf68y0fka2sgnwblam41k7wz2sgapwhg", + "version": "6.12.92", + "hash": "sha256:0gly5wld3x8l0f3zk9pspsw1q2d7zbjbx4c2ndb49b1wvfvpdqqg", "lts": true }, "6.18": { - "version": "6.18.33", - "hash": "sha256:10mp1ypsdz42jr26g1xxbw806mvpy0n35418fhsgxxlr4lqgy5kg", + "version": "6.18.34", + "hash": "sha256:0q6palsvwx0gnisjr658hlngfpvyzv0k5q4pvdk23122zcr4f334", "lts": true }, "7.0": { - "version": "7.0.10", - "hash": "sha256:1p1j9s0b4qv9m0pm6vj477rqgyd1b0lsk0gy74cks3n2cbmpfj89", + "version": "7.0.11", + "hash": "sha256:012307ni1v555a1rgzsxsg99pj8fplrghvhw0jk3c4d0vmb86v75", "lts": false } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28c9d777c342..bac6cb176e28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11914,8 +11914,6 @@ with pkgs; plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; - plover = recurseIntoAttrs (libsForQt5.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 e8e1bac97cb1..9610ddd70c37 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12170,6 +12170,24 @@ 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 { + 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 { }; @@ -16529,6 +16547,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 { };