Merge staging-next into staging

2026-09-28 02:40:50 +00:00 · 2025-07-12 12:07:05 +00:00
parent 916612fbc1 21e18ff955
commit e9d89ecb97
64 changed files with 1099 additions and 369 deletions
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -3078,6 +3078,19 @@ final: prev: {
    meta.hydraPlatforms = [ ];
  };

+  comfy-line-numbers-nvim = buildVimPlugin {
+    pname = "comfy-line-numbers.nvim";
+    version = "2025-05-27";
+    src = fetchFromGitHub {
+      owner = "mluders";
+      repo = "comfy-line-numbers.nvim";
+      rev = "eb1c966e22fbabe3a3214c78bda9793ccf9d2a5d";
+      sha256 = "0dp4sk695s2ra89zsb69g1xsh27qkfv16jp7b4nr316idsdf3899";
+    };
+    meta.homepage = "https://github.com/mluders/comfy-line-numbers.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
  command-t = buildVimPlugin {
    pname = "command-t";
    version = "2025-07-03";
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -235,6 +235,7 @@ https://github.com/xzbdmw/colorful-menu.nvim/,HEAD,
 https://github.com/nvim-zh/colorful-winsep.nvim/,HEAD,
 https://github.com/lilydjwg/colorizer/,,
 https://github.com/Domeee/com.cloudedmountain.ide.neovim/,HEAD,
+https://github.com/mluders/comfy-line-numbers.nvim/,HEAD,
 https://github.com/wincent/command-t/,,
 https://github.com/LudoPinelli/comment-box.nvim/,HEAD,
 https://github.com/numtostr/comment.nvim/,,
--- a/pkgs/applications/emulators/libretro/cores/flycast.nix
+++ b/pkgs/applications/emulators/libretro/cores/flycast.nix
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
  core = "flycast";
-  version = "0-unstable-2025-06-27";
+  version = "0-unstable-2025-07-11";

  src = fetchFromGitHub {
    owner = "flyinghead";
    repo = "flycast";
-    rev = "3f79b6baed2eebbf133b950197c418de06f28916";
-    hash = "sha256-C4Q9jTS5UcnwiP7i+Ka4CH2S+dXLbm2vwS93955/RoY=";
+    rev = "48c58dbd18501fae92e641b6ee6ca5ca9de0d5c3";
+    hash = "sha256-AlvNh+tDY7FEqUm5zgm7072Z1zIXn54tvLGzLbTjLXo=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1030,11 +1030,11 @@
    "vendorHash": "sha256-Koojva0MAw5WC942VbxZ6d1Pf1VwFvJMmp16TsHRS3w="
  },
  "pocketid": {
-    "hash": "sha256-lXhxW75m4Tam5vyurDDxM4NJ+226VjBrNnNeK1dVZ1o=",
+    "hash": "sha256-rUCjvJKLZE+cSsHZdntBF9WpZDtIkVkukmLGEvGVC8s=",
    "homepage": "https://registry.terraform.io/providers/Trozz/pocketid",
    "owner": "Trozz",
    "repo": "terraform-provider-pocketid",
-    "rev": "v0.1.2",
+    "rev": "v0.1.5",
    "spdx": "MIT",
    "vendorHash": "sha256-0oX7f4L5eljmOL8+g6KYdBcoIwng87+pi3XCXKDEb3w="
  },
--- a/pkgs/applications/office/libreoffice/skip-broken-tests.patch
+++ b/pkgs/applications/office/libreoffice/skip-broken-tests.patch
@@ -1,6 +1,8 @@
+diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
+index 231aea8d0f3c..214a23c82562 100644
 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
 +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
-@@ -595,6 +595,8 @@ void DesktopLOKTest::testGetFilterTypes()
+@@ -603,6 +603,8 @@ void DesktopLOKTest::testGetFilterTypes()
 
 void DesktopLOKTest::testSearchCalc()
 {
@@ -9,7 +11,7 @@
     LibLibreOffice_Impl aOffice;
     LibLODocument_Impl* pDocument = loadDoc("search.ods");
     pDocument->pClass->initializeForRendering(pDocument, nullptr);
-@@ -625,6 +627,8 @@ void DesktopLOKTest::testSearchCalc()
+@@ -633,6 +635,8 @@ void DesktopLOKTest::testSearchCalc()
 
 void DesktopLOKTest::testSearchAllNotificationsCalc()
 {
@@ -18,6 +20,8 @@
     LibLibreOffice_Impl aOffice;
     LibLODocument_Impl* pDocument = loadDoc("search.ods");
     pDocument->pClass->initializeForRendering(pDocument, nullptr);
+diff --git a/svgio/qa/cppunit/data/tdf160386.svg b/svgio/qa/cppunit/data/tdf160386.svg
+index 1644b0d15514..cf429508bcd4 100644
 --- a/svgio/qa/cppunit/data/tdf160386.svg
 +++ b/svgio/qa/cppunit/data/tdf160386.svg
@@ -8,7 +8,6 @@
@@ -28,9 +32,11 @@
     <text systemLanguage="ru">Привет!</text>
     <text>☺</text>
   </switch>
+diff --git a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
+index d8093e57a4e8..c95a742a68d3 100644
 --- a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
 +++ b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
-@@ -361,6 +361,8 @@ void checkIssuePosition(std::shared_ptr<sfx::AccessibilityIssue> const& pIssue,
+@@ -422,6 +422,8 @@ void checkIssuePosition(std::shared_ptr<sfx::AccessibilityIssue> const& pIssue,
 
 CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testOnlineNodeSplitAppend)
 {
@@ -39,9 +45,11 @@
     // Checks the a11y checker is setting the a11y issues to the nodes
     // correctly when splitting and appending nodes (through undo), which
     // happen on editing all the time.
+diff --git a/sw/qa/core/text/text.cxx b/sw/qa/core/text/text.cxx
+index b81146642bd4..2094b7ea9477 100644
 --- a/sw/qa/core/text/text.cxx
 +++ b/sw/qa/core/text/text.cxx
-@@ -1630,6 +1630,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testParaUpperMarginFlyIntersect)
+@@ -1596,6 +1596,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testParaUpperMarginFlyIntersect)
 
 CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testTdf129810)
 {
@@ -50,9 +58,23 @@
     // Load the document.
     // The document embeds a subset of "Source Han Serif SC" so that it works
     // even when the font is not installed.
+diff --git a/sw/qa/extras/docbookexport/docbookexport.cxx b/sw/qa/extras/docbookexport/docbookexport.cxx
+index e7543d99577e..f44f92a47c7e 100644
+--- a/sw/qa/extras/docbookexport/docbookexport.cxx
+++ b/sw/qa/extras/docbookexport/docbookexport.cxx
+@@ -21,6 +21,7 @@ public:
+ 
+ CPPUNIT_TEST_FIXTURE(DocbookExportTest, testsimple)
+ {
+    return; // fails on latest libxml
+     createSwDoc("simple.docx");
+     save(mpFilter);
+     xmlDocUniquePtr pDoc = parseXml(maTempFile);
+diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx b/sw/qa/extras/htmlimport/htmlimport.cxx
+index 6cf8f22647b9..12848713771b 100644
 --- a/sw/qa/extras/htmlimport/htmlimport.cxx
 +++ b/sw/qa/extras/htmlimport/htmlimport.cxx
-@@ -308,6 +308,8 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testTableBorder1px)
+@@ -297,6 +297,8 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testTableBorder1px)
 
 CPPUNIT_TEST_FIXTURE(HtmlImportTest, testOutlineLevel)
 {
@@ -61,9 +83,11 @@
     createSwWebDoc("outline-level.html");
     // This was 0, HTML imported into Writer lost the outline numbering for
     // Heading 1 styles.
+diff --git a/sw/qa/extras/layout/layout3.cxx b/sw/qa/extras/layout/layout3.cxx
+index e53d22c8fd1a..2f9decb0d931 100644
 --- a/sw/qa/extras/layout/layout3.cxx
 +++ b/sw/qa/extras/layout/layout3.cxx
-@@ -1038,6 +1038,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf158658c)
+@@ -1388,6 +1388,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf158658c)
 
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf155177)
 {
@@ -72,6 +96,8 @@
     createSwDoc("tdf155177-1-min.odt");
 
     uno::Reference<beans::XPropertySet> xStyle(
+diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
+index 794b3bd16ed4..3feaadd7a20f 100644
 --- a/sw/qa/extras/odfimport/odfimport.cxx
 +++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -602,6 +602,8 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo56272)
@@ -83,18 +109,20 @@
     createSwDoc("incorrectsum.odt");
     Scheduler::ProcessEventsToIdle();
     uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
+diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
+index 4ebc4be96149..85b8908e16b9 100644
 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
 +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
-@@ -2762,6 +2762,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDeleteNodeRedlineCallback)
+@@ -2538,6 +2538,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testVisCursorInvalidation)
 
- CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testVisCursorInvalidation)
+ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDeselectCustomShape)
 {
 +    return; // flaky on some backends?
 +
     SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
-     ViewCallback aView1;
-     int nView1 = SfxLokHelper::getView();
-@@ -3048,6 +3050,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDoubleUnderlineAndStrikeOut)
+     SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();
+     SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
+@@ -2745,6 +2747,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDoubleUnderlineAndStrikeOut)
 
 CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testTdf43244_SpacesOnMargin)
 {
@@ -103,7 +131,7 @@
     // Load a document where the top left tile contains
     // paragraph and line break symbols with redlining.
     SwXTextDocument* pXTextDocument = createDoc("tdf43244_SpacesOnMargin.odt");
-@@ -4091,6 +4095,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip)
+@@ -3786,6 +3790,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip)
 // toggling Formatting Marks on/off for one view should have no effect on other views
 CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testToggleFormattingMarks)
 {
@@ -111,13 +139,15 @@
     SwXTextDocument* pXTextDocument = createDoc();
     int nView1 = SfxLokHelper::getView();
 
+diff --git a/sw/qa/extras/uiwriter/uiwriter5.cxx b/sw/qa/extras/uiwriter/uiwriter5.cxx
+index e37df27fd817..937c12e8c4c5 100644
 --- a/sw/qa/extras/uiwriter/uiwriter5.cxx
 +++ b/sw/qa/extras/uiwriter/uiwriter5.cxx
-@@ -1571,6 +1571,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldContentOperations)
+@@ -1549,6 +1549,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldContentOperations)
 
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldCurrentDateHandling)
 {
 +    return; // flaky on KF6
     createSwDoc();
     SwDoc* pDoc = getSwDoc();
-     CPPUNIT_ASSERT(pDoc);
+     IDocumentMarkAccess* pMarkAccess = pDoc->getIDocumentMarkAccess();
--- a/pkgs/by-name/ab/abcmidi/package.nix
+++ b/pkgs/by-name/ab/abcmidi/package.nix
@@ -6,13 +6,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "abcmidi";
-  version = "2025.06.14";
+  version = "2025.06.27";

  src = fetchFromGitHub {
    owner = "sshlien";
    repo = "abcmidi";
    tag = finalAttrs.version;
-    hash = "sha256-nJkSh6ZsiL52muRR2ktkNXirULGYjp9m0/OxLv0/7L8=";
+    hash = "sha256-bOuMiFm4wP+AgCLbarhZMmtGcEzzVsqiwi8sBRj/jy8=";
  };

  meta = {
--- a/pkgs/by-name/an/ansible-doctor/package.nix
+++ b/pkgs/by-name/an/ansible-doctor/package.nix
@@ -1,57 +1,54 @@
 {
  lib,
+  stdenv,
+  python3Packages,
  fetchFromGitHub,
-  fetchpatch,
-  python3,
+  versionCheckHook,
 }:

-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
  pname = "ansible-doctor";
-  version = "2.0.4";
-  format = "pyproject";
+  version = "7.0.8";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "thegeeklab";
    repo = "ansible-doctor";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-nZv1PdR0kGrke2AjcDWjDWBdsw64UpHYFNDFAe/UoJo=";
+    tag = "v${version}";
+    hash = "sha256-BwmmAd1mmyGQ5QQo6uS3+JmPP9kmZe2OOBDNAKFqEl0=";
  };

-  patches = [
-    # https://github.com/thegeeklab/ansible-doctor/pull/541
-    (fetchpatch {
-      name = "poetry-dynamic-versioning-pep517.patch";
-      url = "https://github.com/thegeeklab/ansible-doctor/commit/b77ba9dccaef4b386bd54b128136c948665eb61a.patch";
-      hash = "sha256-XfdTkRk9B857V5DQnxlbwxTb098YwHzKGzNQBTQzWCM=";
-    })
-  ];
-
-  pythonRelaxDeps = true;
-
-  nativeBuildInputs = with python3.pkgs; [
+  build-system = with python3Packages; [
    poetry-core
    poetry-dynamic-versioning
  ];

-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3Packages; [
    anyconfig
    appdirs
    colorama
+    dynaconf
    environs
+    gitpython
    jinja2
    jsonschema
    nested-lookup
    pathspec
    python-json-logger
    ruamel-yaml
+    structlog
  ];

-  # Module has no tests
-  doCheck = false;
+  pythonRelaxDeps = true;

-  pythonImportsCheck = [
-    "ansibledoctor"
-  ];
+  doCheck = true;
+
+  pythonImportsCheck = [ "ansibledoctor" ];
+
+  # ansible.errors.AnsibleError: Unable to create local directories(/private/var/empty/.ansible/tmp)
+  nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ versionCheckHook ];
+
+  versionCheckProgramArg = "--version";

  meta = {
    description = "Annotation based documentation for your Ansible roles";
--- a/pkgs/by-name/br/breads-ad/package.nix
+++ b/pkgs/by-name/br/breads-ad/package.nix
@@ -16,9 +16,9 @@ python3.pkgs.buildPythonApplication rec {
    hash = "sha256-U1q15D59N55qBf4NVOpe5RpQjlE1ye2TNNIZf2IZV3U=";
  };

-  build-system = with python3.pkgs; [
-    setuptools
-  ];
+  pythonRelaxDeps = [ "ldap3" ];
+
+  build-system = with python3.pkgs; [ setuptools ];

  dependencies = with python3.pkgs; [
    impacket
--- a/pkgs/by-name/bt/btcpayserver/package.nix
+++ b/pkgs/by-name/bt/btcpayserver/package.nix
@@ -8,13 +8,13 @@

 buildDotnetModule rec {
  pname = "btcpayserver";
-  version = "2.1.5";
+  version = "2.1.6";

  src = fetchFromGitHub {
    owner = "btcpayserver";
    repo = "btcpayserver";
    tag = "v${version}";
-    hash = "sha256-qm/MdgM5sPQu7fI1S8qf/dvkMZbmP4rLA1RdSQHSawE=";
+    hash = "sha256-zMCjG8baQeXYLgiSr1jqHxvyeeVDiOZXOq/8MQiggCI=";
  };

  projectFile = "BTCPayServer/BTCPayServer.csproj";
--- a/pkgs/by-name/ce/certsync/package.nix
+++ b/pkgs/by-name/ce/certsync/package.nix
@@ -4,34 +4,33 @@
  fetchFromGitHub,
 }:

-python3.pkgs.buildPythonApplication {
+python3.pkgs.buildPythonApplication rec {
  pname = "certsync";
-  version = "1.5-unstable-2024-03-08";
+  version = "0.1.6";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "zblurx";
    repo = "certsync";
-    rev = "712e34c54a63537efd630561aa55dc9d35962c3f";
-    hash = "sha256-YkxEExeu3sBJ93WJGtU5oe3rDS0Ki88vAeGpE23xRwo=";
+    tag = version;
+    hash = "sha256-UNeO9Ldf6h6ykziKVCdAoBIzL5QedbRLFEwyeWDCtUU=";
  };

-  nativeBuildInputs = with python3.pkgs; [
-    poetry-core
-  ];
+  pythonRelaxDeps = [ "certipy-ad" ];

-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [ poetry-core ];
+
+  dependencies = with python3.pkgs; [
    certipy-ad
    tqdm
  ];

-  pythonImportsCheck = [
-    "certsync"
-  ];
+  pythonImportsCheck = [ "certsync" ];

  meta = with lib; {
    description = "Dump NTDS with golden certificates and UnPAC the hash";
    homepage = "https://github.com/zblurx/certsync";
+    changelog = "https://github.com/zblurx/certsync/releases/tag/${src.tag}";
    license = licenses.mit;
    maintainers = with maintainers; [ fab ];
    mainProgram = "certsync";
--- a/pkgs/by-name/ch/check-jsonschema/package.nix
+++ b/pkgs/by-name/ch/check-jsonschema/package.nix
@@ -6,14 +6,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "check-jsonschema";
-  version = "0.33.1";
+  version = "0.33.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "python-jsonschema";
    repo = "check-jsonschema";
    tag = version;
-    hash = "sha256-rcoZZ4fd6ATBL+aG1Lqvch6wnKtGmEYdCBd9F2danoE=";
+    hash = "sha256-lYmKhNMXLnEesnNNCWyx5hyS3l2UwTiJH/uTdy2XTb4=";
  };

  build-system = with python3Packages; [ setuptools ];
--- a/pkgs/by-name/ch/checkov/package.nix
+++ b/pkgs/by-name/ch/checkov/package.nix
@@ -25,14 +25,14 @@ with py.pkgs;

 python3.pkgs.buildPythonApplication rec {
  pname = "checkov";
-  version = "3.2.447";
+  version = "3.2.450";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "bridgecrewio";
    repo = "checkov";
    tag = version;
-    hash = "sha256-CSLp3ykBvTcx8xDpW5HKGtQsVQZGflXkNT3ktXb6dJU=";
+    hash = "sha256-jU3qb+ds5A4a/FXw0+G8BU7iPVpunEJuTA0GyQYjqTc=";
  };

  pythonRelaxDeps = [
--- a/pkgs/by-name/ck/ckbcomp/package.nix
+++ b/pkgs/by-name/ck/ckbcomp/package.nix
@@ -8,14 +8,14 @@

 stdenv.mkDerivation rec {
  pname = "ckbcomp";
-  version = "1.237";
+  version = "1.239";

  src = fetchFromGitLab {
    domain = "salsa.debian.org";
    owner = "installer-team";
    repo = "console-setup";
    rev = version;
-    sha256 = "sha256-xNZsbTOXlrLveHr7LRK3/j0jYXtuBw08kng3yl9s7AU=";
+    sha256 = "sha256-jyV+tgasZPjidcOmWhnK/ggf+ocN8ZZODMQfA6ZAHcc=";
  };

  buildInputs = [ perl ];
--- a/pkgs/by-name/co/coin3d/package.nix
+++ b/pkgs/by-name/co/coin3d/package.nix
@@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "coin";
-  version = "4.0.3";
+  version = "4.0.4";

  src = fetchFromGitHub {
    owner = "coin3d";
    repo = "coin";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-dUFmcUOdNc3ZFtr+Hnh3Q3OY/JA/WxmiRJiU2RFSSus=";
+    hash = "sha256-Zk9tlGMbNhfHKv+Z5VFWr1g3wNuPFzof+7vsLAlOBC4=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -7,13 +7,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "exploitdb";
-  version = "2025-07-03";
+  version = "2025-07-09";

  src = fetchFromGitLab {
    owner = "exploit-database";
    repo = "exploitdb";
    tag = finalAttrs.version;
-    hash = "sha256-/mNq9366QK/rcKV+JM/2WJcnSPBUy7NoezUriQgupOk=";
+    hash = "sha256-AOasRKblz35p1UdMZFNxVoaTcvL39ssLCW3rVBqZEx8=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix
+++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "fcitx5-pinyin-moegirl";
-  version = "20250610";
+  version = "20250711";

  src = fetchurl {
    url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict";
-    hash = "sha256-krtBLVcF6qKQ7xIUuJsxYmbBlFXezzGXczg9Th0NPYo=";
+    hash = "sha256-kjdgsq5n+7rjPBrXOjrb13+JLPLeXNQFv9uhl4NSszM=";
  };

  dontUnpack = true;
--- a/pkgs/by-name/fo/fosrl-newt/package.nix
+++ b/pkgs/by-name/fo/fosrl-newt/package.nix
@@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "newt";
-  version = "1.2.1";
+  version = "1.3.0";

  src = fetchFromGitHub {
    owner = "fosrl";
    repo = "newt";
    tag = version;
-    hash = "sha256-EXMAPIxSK3H2w7jHSGAfxL9wWR8kGloh6oO+/Eo7+Vc=";
+    hash = "sha256-8wE0ut+pej1rGve4jyT6/Km2yIcubeAlZL+4yEyuNww=";
  };

-  vendorHash = "sha256-Yc5IXnShciek/bKkVezkAcaq47zGiZP8vUHFb9p09LI=";
+  vendorHash = "sha256-rLyGju1UfKlzOSH2/NIKvZ8hpVE9+yJdcy4CK/NyoNc=";

  postPatch = ''
    substituteInPlace main.go \
--- a/pkgs/by-name/ge/gemmi/package.nix
+++ b/pkgs/by-name/ge/gemmi/package.nix
@@ -12,13 +12,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gemmi";
-  version = "0.7.1";
+  version = "0.7.3";

  src = fetchFromGitHub {
    owner = "project-gemmi";
    repo = "gemmi";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-1msV/gW6BH90rHm6t7xm0hYqbG/yGBt65GVTbKuwdtg=";
+    hash = "sha256-T7vmQEP7+3yNkQ7l36xbeLJsm5eYZvt7oRq/ksy6zQU=";
  };

  nativeBuildInputs =
--- a/pkgs/by-name/la/last/package.nix
+++ b/pkgs/by-name/la/last/package.nix
@@ -10,13 +10,13 @@

 stdenv.mkDerivation rec {
  pname = "last";
-  version = "1639";
+  version = "1642";

  src = fetchFromGitLab {
    owner = "mcfrith";
    repo = "last";
    rev = "refs/tags/${version}";
-    hash = "sha256-s3sWLkTmjLNEzYH4P2DHo95OTV5stwAML2b/uTQf5a8=";
+    hash = "sha256-CBpx7dTL709nTBIUxbnuUBGpgaxo7zj5SPMvsBsvYVs=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/li/libzmf/doxygen.patch
+++ b/pkgs/by-name/li/libzmf/doxygen.patch
@@ -0,0 +1,30 @@
+diff --git a/docs/doxygen/Makefile.am b/docs/doxygen/Makefile.am
+index 4351042..40a02e8 100644
+--- a/docs/doxygen/Makefile.am
+++ b/docs/doxygen/Makefile.am
+@@ -6,9 +6,7 @@ if WITH_LIBZMF_DOCS
+ 
+ install-data-am:
+ 	mkdir -p $(DESTDIR)$(docdir)/html
+-	$(INSTALL_DATA) html/*.html $(DESTDIR)$(docdir)/html/
+-	$(INSTALL_DATA) html/*.png $(DESTDIR)$(docdir)/html/
+-	$(INSTALL_DATA) html/*.css $(DESTDIR)$(docdir)/html/
+	$(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/
+ 
+ uninstall-am:
+ 	-rm -rf $(DESTDIR)$(docdir)/html
+diff --git a/docs/doxygen/Makefile.in b/docs/doxygen/Makefile.in
+index 9ad8360..0ff329d 100644
+--- a/docs/doxygen/Makefile.in
+++ b/docs/doxygen/Makefile.in
+@@ -476,9 +476,7 @@ ps-am:
+ 
+ @WITH_LIBZMF_DOCS_TRUE@install-data-am:
+ @WITH_LIBZMF_DOCS_TRUE@	mkdir -p $(DESTDIR)$(docdir)/html
+-@WITH_LIBZMF_DOCS_TRUE@	$(INSTALL_DATA) html/*.html $(DESTDIR)$(docdir)/html/
+-@WITH_LIBZMF_DOCS_TRUE@	$(INSTALL_DATA) html/*.png $(DESTDIR)$(docdir)/html/
+-@WITH_LIBZMF_DOCS_TRUE@	$(INSTALL_DATA) html/*.css $(DESTDIR)$(docdir)/html/
+@WITH_LIBZMF_DOCS_TRUE@	$(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/
+ 
+ @WITH_LIBZMF_DOCS_TRUE@uninstall-am:
+ @WITH_LIBZMF_DOCS_TRUE@	-rm -rf $(DESTDIR)$(docdir)/html
--- a/pkgs/by-name/li/libzmf/package.nix
+++ b/pkgs/by-name/li/libzmf/package.nix
@@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
    sha256 = "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197";
  };

+  patches = [
+    # https://git.libreoffice.org/libzmf/+/48f94abff2fcc4943626a62c6180c60862288b08%5E%21
+    ./doxygen.patch
+  ];
+
  buildInputs = [
    boost
    icu
--- a/pkgs/by-name/li/linux-wallpaperengine/package.nix
+++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix
@@ -2,102 +2,119 @@
  lib,
  stdenv,
  fetchFromGitHub,
+  autoPatchelfHook,
  cmake,
+  file,
+  pkg-config,
+  python3,
+  SDL2,
+  SDL2_mixer,
+  cef-binary,
+  egl-wayland,
  ffmpeg,
-  libglut,
+  fftw,
  glew,
  glfw,
  glm,
-  libpulseaudio,
+  kissfftFloat,
  libXau,
  libXdmcp,
  libXpm,
  libXrandr,
  libXxf86vm,
+  libdecor,
+  libffi,
+  libglut,
+  libpng,
+  libpulseaudio,
  lz4,
  mpv,
-  pkg-config,
-  SDL2,
-  SDL2_mixer,
-  zlib,
  wayland,
  wayland-protocols,
-  egl-wayland,
-  libffi,
  wayland-scanner,
-  cef-binary,
-  libdecor,
-  autoPatchelfHook,
+  zlib,
 }:

 let
  cef = cef-binary.overrideAttrs (oldAttrs: {
-    version = "120.1.10";
+    version = "135.0.17"; # follow upstream. https://github.com/Almamu/linux-wallpaperengine/blob/be0fc25e72203310f268221a132c5d765874b02c/CMakeLists.txt#L47
    __intentionallyOverridingVersion = true; # `cef-binary` uses the overridden `srcHash` values in its source FOD
-    gitRevision = "3ce3184";
-    chromiumVersion = "120.0.6099.129";
+    gitRevision = "cbc1c5b";
+    chromiumVersion = "135.0.7049.52";

    srcHash =
      {
-        aarch64-linux = "sha256-l0PSW4ZeLhfEauf1bez1GoLfu9cwXZzEocDlGI9yFsQ=";
-        x86_64-linux = "sha256-OdIVEy77tiYRfDWXgyceSstFqCNeZHswzkpw06LSnP0=";
+        aarch64-linux = "sha256-LK5JvtcmuwCavK7LnWmMF2UDpM5iIZOmsuZS/t9koDs=";
+        x86_64-linux = "sha256-JKwZgOYr57GuosM31r1Lx3DczYs35HxtuUs5fxPsTcY=";
      }
      .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
  });
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "linux-wallpaperengine";
-  version = "0-unstable-2024-11-08";
+  version = "0-unstable-2025-05-17";

  src = fetchFromGitHub {
    owner = "Almamu";
    repo = "linux-wallpaperengine";
-    rev = "4a063d0b84d331a0086b3f4605358ee177328d41";
-    hash = "sha256-IRTGFxHPRRRSg0J07pq8fpo1XbMT4aZC+wMVimZlH/Y=";
+    rev = "be0fc25e72203310f268221a132c5d765874b02c";
+    fetchSubmodules = true;
+    hash = "sha256-Wkxt6c5aSMJnQPx/n8MeNKLQ8YmdFilzhJ1wQooKprI=";
  };

  nativeBuildInputs = [
-    cmake
-    pkg-config
    autoPatchelfHook
+    cmake
+    file
+    pkg-config
+    python3
  ];

  buildInputs = [
-    libdecor
+    SDL2
+    SDL2_mixer
+    egl-wayland
    ffmpeg
-    libglut
+    fftw
    glew
    glfw
    glm
-    libpulseaudio
+    kissfftFloat
    libXau
-    SDL2_mixer
    libXdmcp
    libXpm
+    libXrandr
    libXxf86vm
-    mpv
+    libdecor
+    libffi
+    libglut
+    libpng
+    libpulseaudio
    lz4
-    SDL2
-    zlib
+    mpv
    wayland
    wayland-protocols
-    egl-wayland
-    libffi
    wayland-scanner
-    libXrandr
+    zlib
  ];

  cmakeFlags = [
    "-DCMAKE_BUILD_TYPE=${cef.buildType}"
    "-DCEF_ROOT=${cef}"
-    "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/app/linux-wallpaperengine"
+    "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/share/linux-wallpaperengine"
  ];

-  preFixup = ''
-    patchelf --set-rpath "${lib.makeLibraryPath buildInputs}:${cef}" $out/app/linux-wallpaperengine/linux-wallpaperengine
-    chmod 755 $out/app/linux-wallpaperengine/linux-wallpaperengine
+  postInstall = ''
+    rm -rf $out/bin $out/lib $out/include
+    chmod 755 $out/share/linux-wallpaperengine/linux-wallpaperengine
    mkdir $out/bin
-    ln -s $out/app/linux-wallpaperengine/linux-wallpaperengine $out/bin/linux-wallpaperengine
+    ln -s $out/share/linux-wallpaperengine/linux-wallpaperengine $out/bin/linux-wallpaperengine
+  '';
+
+  preFixup = ''
+    find $out/share/linux-wallpaperengine -type f -exec file {} \; | grep 'ELF' | cut -d: -f1 | while read -r elf_file; do
+      patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$elf_file"
+    done
  '';

  meta = {
@@ -112,4 +129,4 @@ stdenv.mkDerivation rec {
    ];
    hydraPlatforms = [ "x86_64-linux" ]; # Hydra "aarch64-linux" fails with "Output limit exceeded"
  };
-}
+})
--- a/pkgs/by-name/od/odpic/package.nix
+++ b/pkgs/by-name/od/odpic/package.nix
@@ -8,7 +8,7 @@
 }:

 let
-  version = "5.4.1";
+  version = "5.6.0";
  libPath = lib.makeLibraryPath [ oracle-instantclient.lib ];

 in
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
    owner = "oracle";
    repo = "odpi";
    rev = "v${version}";
-    sha256 = "sha256-CvsQ/w5r0d/l0m6wkgZtVBkX66Hcrz4U3b8qpHM0Dm8=";
+    sha256 = "sha256-kdhL+yvolf7paNBbUN0V/Zp0mwHS2BEhP8bRUwa3dhQ=";
  };

  nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
--- a/pkgs/by-name/pr/pre2k/package.nix
+++ b/pkgs/by-name/pr/pre2k/package.nix
@@ -18,16 +18,15 @@ python3.pkgs.buildPythonApplication rec {

  pythonRelaxDeps = [
    "impacket"
+    "ldap3"
    "pyasn1"
    "rich"
    "typer"
  ];

-  nativeBuildInputs = with python3.pkgs; [
-    poetry-core
-  ];
+  build-system = with python3.pkgs; [ poetry-core ];

-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
    impacket
    ldap3
    pyasn1
@@ -35,14 +34,12 @@ python3.pkgs.buildPythonApplication rec {
    typer
  ];

-  pythonImportsCheck = [
-    "pre2k"
-  ];
+  pythonImportsCheck = [ "pre2k" ];

  meta = {
    description = "Tool to query for the existence of pre-windows 2000 computer objects";
    homepage = "https://github.com/garrettfoster13/pre2k";
-    changelog = "https://github.com/garrettfoster13/pre2k/releases/tag/${version}";
+    changelog = "https://github.com/garrettfoster13/pre2k/releases/tag/${src.tag}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ fab ];
    mainProgram = "pre2k";
--- a/pkgs/by-name/rg/rgbds/package.nix
+++ b/pkgs/by-name/rg/rgbds/package.nix
@@ -10,12 +10,12 @@

 stdenv.mkDerivation rec {
  pname = "rgbds";
-  version = "0.9.2";
+  version = "0.9.3";
  src = fetchFromGitHub {
    owner = "gbdev";
    repo = "rgbds";
    rev = "v${version}";
-    hash = "sha256-Ho9aSpENukNutb5VscopY2p6RGXbRgvtIcRgxTtZews=";
+    hash = "sha256-G83AoURZWrKto64Aga2vpg4/vY9pwLS+SDkFX0arKQw=";
  };
  nativeBuildInputs = [
    bison
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -16,19 +16,19 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "ruff";
-  version = "0.12.2";
+  version = "0.12.3";

  src = fetchFromGitHub {
    owner = "astral-sh";
    repo = "ruff";
    tag = finalAttrs.version;
-    hash = "sha256-BnQm0Q3KbtlGjvN+bkYWyllBjX4Z3HD4LTWCrDwj7fE=";
+    hash = "sha256-KvTRoiySjLhm5jmYqXZAehRAzkB9CufyNisXkuagOv8=";
  };

  cargoBuildFlags = [ "--package=ruff" ];

  useFetchCargoVendor = true;
-  cargoHash = "sha256-BVGH+i2p0O0nbbOKRNUTJcR0cxgwsTmfJYzeCmttu2M=";
+  cargoHash = "sha256-5fK5VQ+UqkHmPdFz3FKAY9TVjvpePiYifrTHsxnkThM=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/by-name/sh/shadowsocks-rust/package.nix
+++ b/pkgs/by-name/sh/shadowsocks-rust/package.nix
@@ -9,17 +9,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "shadowsocks-rust";
-  version = "1.23.4";
+  version = "1.23.5";

  src = fetchFromGitHub {
    owner = "shadowsocks";
    repo = "shadowsocks-rust";
    tag = "v${version}";
-    hash = "sha256-YUDPD46EVCJe/FFUaSyDDSXPk87CiGduzFyPtjr2fDI=";
+    hash = "sha256-szFFnQw38d8EWDKUF3/biuniNkd4Rz4sq7TvZGM8dcc=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-E4vhgaUtUTNt+tRrLxDNXICMIH8N3EL+mkC9Ga+lI70=";
+  cargoHash = "sha256-I+qHJ5w4aJOZCNhoMJpqOjrcmiHI+Mjfy5d8rl6L+Hw=";

  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];

--- a/pkgs/by-name/sp/spacectl/package.nix
+++ b/pkgs/by-name/sp/spacectl/package.nix
@@ -9,13 +9,13 @@

 buildGoModule rec {
  pname = "spacectl";
-  version = "1.14.3";
+  version = "1.14.4";

  src = fetchFromGitHub {
    owner = "spacelift-io";
    repo = "spacectl";
    rev = "v${version}";
-    hash = "sha256-TDJnXOzzi5VunXyxz8XYOZDZVAdEuWkp3fXu5sZJydc=";
+    hash = "sha256-l55mkCHx7x4a423u88PfZwXXdfUcdk1PqRfeDYKz1i8=";
  };

  vendorHash = "sha256-iyB6GFkTa4ci+TC2mDTtkuqCXFBnz3rwLns+3ovkUxg=";
--- a/pkgs/by-name/ti/tigerbeetle/package.nix
+++ b/pkgs/by-name/ti/tigerbeetle/package.nix
@@ -10,14 +10,14 @@ let
  platform =
    if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
  hash = builtins.getAttr platform {
-    "universal-macos" = "sha256-8RyNDE8br4fPjCE38MVci7eatiEHIMUtVGa0pCTKj1k=";
-    "x86_64-linux" = "sha256-18dj7GNXYhsjECIp4oqGbBSLWZhQjPORm3ohNL/jXmg=";
-    "aarch64-linux" = "sha256-u4JIJtEu7+YtfIpTxqmSb2xTBA57YtNtQCCNkkoEURg=";
+    "universal-macos" = "sha256-fN/TiIT3x78uyh78jzj9NtJ80W6cTlB6wWa+SztpqDw=";
+    "x86_64-linux" = "sha256-aNDtIHP9KX2KKsN0YgISqzoT+TMea4pppXJaiZEMXLA=";
+    "aarch64-linux" = "sha256-VB0hqlFAJle+J7kwyGb+eFMVlExT7uoJpgqGaP53V/I=";
  };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "tigerbeetle";
-  version = "0.16.47";
+  version = "0.16.49";

  src = fetchzip {
    url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";
--- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
@@ -9,12 +9,12 @@
 let
  generator = pkgsBuildBuild.buildGoModule rec {
    pname = "v2ray-domain-list-community";
-    version = "20250608120644";
+    version = "20250627153051";
    src = fetchFromGitHub {
      owner = "v2fly";
      repo = "domain-list-community";
      rev = version;
-      hash = "sha256-pGd8HBKtyum5+CE1WsjdDj5QxjbCA8sQ85LPEDCubiI=";
+      hash = "sha256-KQiWWBdiD/lECfiaczlzAJ9chtKEdg2kHi8/SHtzdQQ=";
    };
    vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
    meta = with lib; {
--- a/pkgs/by-name/vi/virt-viewer/package.nix
+++ b/pkgs/by-name/vi/virt-viewer/package.nix
@@ -111,6 +111,7 @@ stdenv.mkDerivation rec {
    ];
    platforms = with platforms; linux ++ darwin;
    license = licenses.gpl2;
+    mainProgram = "virt-viewer";
  };
  passthru = {
    updateInfo = {
--- a/pkgs/by-name/yu/yubihsm-shell/package.nix
+++ b/pkgs/by-name/yu/yubihsm-shell/package.nix
@@ -16,13 +16,13 @@

 stdenv.mkDerivation rec {
  pname = "yubihsm-shell";
-  version = "2.6.0";
+  version = "2.7.0";

  src = fetchFromGitHub {
    owner = "Yubico";
    repo = "yubihsm-shell";
    rev = version;
-    hash = "sha256-0IsdIhuKpzfArVB4xBaxCPqtk0fKWb6RuGImUj1E4Zs=";
+    hash = "sha256-ymGS35kjhNlFee3FEXF8n6Jm7NVaynjv+lpix6F75BQ=";
  };

  postPatch = ''
--- a/pkgs/development/compilers/openjdk/11/source.json
+++ b/pkgs/development/compilers/openjdk/11/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-7yeyr2UbMntuOtEjRLdLoiyN0zC+fZZSGL9XxI2D7GU=",
+  "hash": "sha256-2LZJBF8d6TsNFWBhnH7Z8i6ulavzKetPK2A9g0o79Ks=",
  "owner": "openjdk",
  "repo": "jdk11u",
-  "rev": "refs/tags/jdk-11.0.26+4"
+  "rev": "refs/tags/jdk-11.0.27+6"
 }
--- a/pkgs/development/libraries/java/rhino/default.nix
+++ b/pkgs/development/libraries/java/rhino/default.nix
@@ -1,57 +1,32 @@
 {
-  fetchurl,
  lib,
  stdenv,
-  unzip,
-  ant,
-  javac,
-  jvm,
+  fetchFromGitHub,
+  gradle,
 }:

-let
-  xbeans = fetchurl {
-    url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip";
-    sha256 = "1pb08d9j81d0wz5wj31idz198iwhqb7mch872n08jh1354rjlqwk";
-  };
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
  pname = "rhino";
-  version = "1.7R2";
+  version = "1.8.0";

-  src = fetchurl {
-    url = "mirror://mozilla/js/rhino1_7R2.zip";
-    sha256 = "1p32hkghi6bkc3cf2dcqyaw5cjj7403mykcp0fy8f5bsnv0pszv7";
+  src = fetchFromGitHub {
+    owner = "mozilla";
+    repo = "rhino";
+    tag = "Rhino1_8_0_Release";
+    hash = "sha256-H8DbcRPMm4SKmGf40dXnjGeEbbj9COzdHgUIkcCimTM=";
  };

-  patches = [ ./gcj-type-mismatch.patch ];
+  nativeBuildInputs = [ gradle ];

-  hardeningDisable = [
-    "fortify"
-    "format"
-  ];
+  mitmCache = gradle.fetchDeps {
+    inherit (finalAttrs) pname;
+    data = ./deps.json;
+  };

-  preConfigure = ''
-    find -name \*.jar -or -name \*.class -exec rm -v {} \;
-
-    # The build process tries to download it by itself.
-    mkdir -p "build/tmp-xbean"
-    ln -sv "${xbeans}" "build/tmp-xbean/xbean.zip"
-  '';
-
-  nativeBuildInputs = [ unzip ];
-  buildInputs = [
-    ant
-    javac
-    jvm
-  ];
-
-  buildPhase = "ant jar";
-  doCheck = false;
-
-  # FIXME: Install javadoc as well.
  installPhase = ''
    mkdir -p "$out/share/java"
-    cp -v *.jar "$out/share/java"
+    cp -v rhino-all/build/libs/rhino-all-*.jar "$out/share/java/js-$pkgver.jar"
+    ln -s "js-$pkgver.jar" "$out/share/java/js.jar"
  '';

  meta = with lib; {
@@ -71,4 +46,4 @@ stdenv.mkDerivation {
    ];
    platforms = platforms.linux ++ platforms.darwin;
  };
-}
+})
--- a/pkgs/development/libraries/java/rhino/deps.json
+++ b/pkgs/development/libraries/java/rhino/deps.json
@@ -0,0 +1,601 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://plugins.gradle.org/m2": {
+  "com/diffplug/durian#durian-collect/1.2.0": {
+   "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=",
+   "pom": "sha256-i7diCGoKT9KmRzu/kFx0R2OvodWaVjD3O7BLeHLAn/M="
+  },
+  "com/diffplug/durian#durian-core/1.2.0": {
+   "jar": "sha256-F+0KrLOjwWMjMyFou96thpTzKACytH1p1KTEmxFNXa4=",
+   "pom": "sha256-hwMg6QdVNxsBeW/oG6Ul/R3ui3A0b1VFUe7dQonwtmI="
+  },
+  "com/diffplug/durian#durian-io/1.2.0": {
+   "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=",
+   "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4="
+  },
+  "com/diffplug/durian#durian-swt.os/4.2.2": {
+   "jar": "sha256-a1Mca0vlgaizLq2GHdwVwsk7IMZl+00z4DgUg8JERfQ=",
+   "module": "sha256-rVlQLGknZu48M0vkliigDctNka4aSPJjLitxUStDXPk=",
+   "pom": "sha256-GzxJFP1eLM4pZq1wdWY5ZBFFwdNCB3CTV4Py3yY2kIU="
+  },
+  "com/diffplug/spotless#spotless-lib-extra/2.45.0": {
+   "jar": "sha256-YCy7zTgo7pz7LjCn+bMDNcaScTB3FBTUzdKU0h/ly2c=",
+   "module": "sha256-9pnkNfTlzgPbYJpHaO6wNj1uB8ZfvPrx/GKcTnbuf7A=",
+   "pom": "sha256-5x2LkRDdSNLn9KVLi/uozlWpbmteu9T0OpJGZJz1b7A="
+  },
+  "com/diffplug/spotless#spotless-lib/2.45.0": {
+   "jar": "sha256-sllply4dmAKAyirlKRl+2bMWCq5ItQbPGTXwG9Exhmc=",
+   "module": "sha256-+x+8+TUAczrHWcp99E8P9mVTEze0LaAS4on/CINNiQ8=",
+   "pom": "sha256-WKd8IsQLIc8m29tCEwFu9HrM9bBwchfHkyqQ9D+PMNw="
+  },
+  "com/diffplug/spotless#spotless-plugin-gradle/6.25.0": {
+   "jar": "sha256-9euQikxdpGKZ51Q/qtoEAtLEt31Yx7Qy1Lblk0mygKM=",
+   "module": "sha256-RoHRe/PJIF2DeOynBcAAywzJjcx40DATy2iJjGvSx0Q=",
+   "pom": "sha256-q1ZuPYS2w/rHqPySXy279TzZdZywOvPAfQ3EN9OXqNo="
+  },
+  "com/fasterxml#oss-parent/48": {
+   "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.14.1": {
+   "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.14": {
+   "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk="
+  },
+  "com/github/johnrengelman#shadow/8.1.1": {
+   "jar": "sha256-CEGXVVWQpTuyG1lQijMwVZ9TbdtEjq/R7GdfVGIDb88=",
+   "module": "sha256-nQ87SqpniYcj6vbF6c0nOHj5V03azWSqNwJDYgzgLko=",
+   "pom": "sha256-Mu55f8hDI3xM5cSeX0FSxYoIlK/OCg6SY25qLU/JjDU="
+  },
+  "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/8.1.1": {
+   "pom": "sha256-PLOIa5ffbgZvEIwxayGfJiyXw8st9tp4kn5kXetkPLA="
+  },
+  "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": {
+   "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=",
+   "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE="
+  },
+  "com/googlecode/javaewah#JavaEWAH/1.2.3": {
+   "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=",
+   "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM="
+  },
+  "com/squareup/okhttp3#okhttp/4.12.0": {
+   "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=",
+   "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=",
+   "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg="
+  },
+  "com/squareup/okio#okio-jvm/3.6.0": {
+   "jar": "sha256-Z1Q/Bzb8QirpJ+0OUEuYvF4mn9oNNQBXkzfLcT2ihBI=",
+   "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=",
+   "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8="
+  },
+  "com/squareup/okio#okio/3.6.0": {
+   "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=",
+   "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU="
+  },
+  "commons-codec#commons-codec/1.16.0": {
+   "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=",
+   "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ="
+  },
+  "commons-io#commons-io/2.11.0": {
+   "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=",
+   "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k="
+  },
+  "dev/equo/ide#solstice/1.7.5": {
+   "jar": "sha256-BuFLxDrMMx2ra16iAfxnNk7RI/mCyF+lEx8IF+1lrk8=",
+   "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=",
+   "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8="
+  },
+  "io/fabric8#kubernetes-client-bom/5.12.2": {
+   "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs="
+  },
+  "io/netty#netty-bom/4.1.86.Final": {
+   "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0="
+  },
+  "jakarta/platform#jakarta.jakartaee-bom/9.0.0": {
+   "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4="
+  },
+  "jakarta/platform#jakartaee-api-parent/9.0.0": {
+   "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs="
+  },
+  "me/champeau/jmh#jmh-gradle-plugin/0.7.2": {
+   "jar": "sha256-2Wcgmf+Pw/m/PU0BWGThWG8H7L0qihd6ZhhO8LaKumU=",
+   "module": "sha256-bYSa50VKs5Fxjl/HDicWQY7z7SZEcjRb2Axt5k4AtsQ=",
+   "pom": "sha256-FdkdAH98O7wCJseQSM3cRf/BJPoegAgu//jhAwxoSg8="
+  },
+  "me/champeau/jmh#me.champeau.jmh.gradle.plugin/0.7.2": {
+   "pom": "sha256-V+DCOsYJRa77WgxKkzm+poopU2TKR8epB5oDL3kBOrs="
+  },
+  "net/ltgt/gradle#gradle-errorprone-plugin/4.0.0": {
+   "jar": "sha256-pKlc7+x8JsZgFQuBNo/2+4Ksi90vL0ChVaRn8KQtsXs=",
+   "module": "sha256-u9obPcdbvcZH/6wkeFyJU7A8HnZKGAqzucbRG+cjeFE=",
+   "pom": "sha256-thpbK0StvEjE674dUux0Bz+Yyv3hrgoeQNGkLuYb+KY="
+  },
+  "net/sf/jopt-simple#jopt-simple/5.0.4": {
+   "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=",
+   "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU="
+  },
+  "org/apache#apache/16": {
+   "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4="
+  },
+  "org/apache#apache/23": {
+   "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
+  },
+  "org/apache#apache/27": {
+   "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk="
+  },
+  "org/apache#apache/29": {
+   "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c="
+  },
+  "org/apache/ant#ant-launcher/1.10.13": {
+   "jar": "sha256-zXaVs7+2lkq3G2oLMdrWAAWud/5QITI2Rnmqzwj3eXA=",
+   "pom": "sha256-ApkvvDgFU1bzyU0B6qJJmcsCoJuqnB/fXqx2t8MVY8o="
+  },
+  "org/apache/ant#ant-parent/1.10.13": {
+   "pom": "sha256-blv8hwgiFD8f+7LG8I7EiHctsxSlKDMC9IFLEms0aTk="
+  },
+  "org/apache/ant#ant/1.10.13": {
+   "jar": "sha256-vvv8eedE6Yks+n25bfO26C3BfSVxr0KqQnl2/CIpmDg=",
+   "pom": "sha256-J5NR7tkLj3QbtIyVvmHD7CRU48ipr7Q7zB0LrB3aE3o="
+  },
+  "org/apache/commons#commons-math3/3.6.1": {
+   "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=",
+   "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA="
+  },
+  "org/apache/commons#commons-parent/39": {
+   "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac="
+  },
+  "org/apache/commons#commons-parent/52": {
+   "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
+  },
+  "org/apache/commons#commons-parent/58": {
+   "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA="
+  },
+  "org/apache/logging#logging-parent/7": {
+   "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys="
+  },
+  "org/apache/logging/log4j#log4j-api/2.20.0": {
+   "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=",
+   "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc="
+  },
+  "org/apache/logging/log4j#log4j-bom/2.20.0": {
+   "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE="
+  },
+  "org/apache/logging/log4j#log4j-core/2.20.0": {
+   "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=",
+   "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4="
+  },
+  "org/apache/logging/log4j#log4j/2.20.0": {
+   "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk="
+  },
+  "org/codehaus/groovy#groovy-bom/3.0.14": {
+   "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric="
+  },
+  "org/codehaus/plexus#plexus-utils/3.5.1": {
+   "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=",
+   "pom": "sha256-lP9o7etIIE0SyZGJx2cWTTqfd4oTctHc4RpBRi5iNvI="
+  },
+  "org/codehaus/plexus#plexus/10": {
+   "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8="
+  },
+  "org/eclipse/ee4j#project/1.0.6": {
+   "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0="
+  },
+  "org/eclipse/jetty#jetty-bom/9.4.50.v20221201": {
+   "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM="
+  },
+  "org/eclipse/jgit#org.eclipse.jgit-parent/6.7.0.202309050840-r": {
+   "pom": "sha256-u56FQW2Y0HMfx2f41w6EaAQWAdZnKuItsqx5n3qjkR8="
+  },
+  "org/eclipse/jgit#org.eclipse.jgit/6.7.0.202309050840-r": {
+   "jar": "sha256-tWRHfQkiQaqrUMhKxd0aw3XAGCBE1+VlnTpgqQ4ugBo=",
+   "pom": "sha256-BNB83b8ZjfpuRIuan7lA94HAEq2T2eqCBv4KTTplwZI="
+  },
+  "org/eclipse/platform#org.eclipse.osgi/3.18.300": {
+   "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=",
+   "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ="
+  },
+  "org/jdom#jdom2/2.0.6.1": {
+   "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=",
+   "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M="
+  },
+  "org/jetbrains#annotations/13.0": {
+   "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
+   "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": {
+   "jar": "sha256-zeM0G6GKK6JisLfPbFWyDJDo1DTkLJoT5qP3cNuWWog=",
+   "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": {
+   "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": {
+   "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=",
+   "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": {
+   "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": {
+   "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=",
+   "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": {
+   "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/1.9.10": {
+   "jar": "sha256-VemJxRK4CQd5n4VDCfO8d4LFs9E5MkQtA3nVxHJxFQQ=",
+   "pom": "sha256-fin79z/fceBnnT3ufmgP1XNGT6AWRKT1irgZ0sCI09I="
+  },
+  "org/junit#junit-bom/5.7.2": {
+   "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=",
+   "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs="
+  },
+  "org/junit#junit-bom/5.9.1": {
+   "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=",
+   "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw="
+  },
+  "org/junit#junit-bom/5.9.3": {
+   "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=",
+   "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc="
+  },
+  "org/openjdk/jmh#jmh-core/1.37": {
+   "jar": "sha256-3A6vK78ANqcLYHmMeF1uA6na8GtouO2w8bqes0IbrrM=",
+   "pom": "sha256-BEU74Abwb4bXxD88SS97TrM2JoDK5PHugLpl2yM3P1o="
+  },
+  "org/openjdk/jmh#jmh-parent/1.37": {
+   "pom": "sha256-DCTyFvNjfd52ORFPcCc6aX+FRvekxtWs1Mxtrum+9Mk="
+  },
+  "org/ow2#ow2/1.5.1": {
+   "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
+  },
+  "org/ow2/asm#asm-commons/9.4": {
+   "jar": "sha256-DBKKnsPzPJiVknL20WzxQke1CPWJUVdLzb0rVtYyY2Q=",
+   "pom": "sha256-tCyiq8+IEXdqXdwCkPIQbX8xP4LHiw3czVzOTGOjUXk="
+  },
+  "org/ow2/asm#asm-tree/9.4": {
+   "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=",
+   "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY="
+  },
+  "org/ow2/asm#asm/9.4": {
+   "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=",
+   "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q="
+  },
+  "org/slf4j#slf4j-api/1.7.36": {
+   "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=",
+   "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ="
+  },
+  "org/slf4j#slf4j-parent/1.7.36": {
+   "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI="
+  },
+  "org/sonatype/oss#oss-parent/5": {
+   "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  },
+  "org/springframework#spring-framework-bom/5.3.24": {
+   "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=",
+   "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE="
+  },
+  "org/tukaani#xz/1.9": {
+   "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=",
+   "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo="
+  },
+  "org/vafer#jdependency/2.8.0": {
+   "jar": "sha256-v9LMfhv8eKqDtEwKVL8s3jikOC7CRyivaD2Y3GvngZI=",
+   "pom": "sha256-EBhn8/npJlei74mjELYE1D0JDJuQqj4LBS3NFqO78y0="
+  }
+ },
+ "https://repo.maven.apache.org/maven2": {
+  "aopalliance#aopalliance/1.0": {
+   "jar": "sha256-Ct3sZw/tzT8RPFyAkdeDKA0j9146y4QbYanNsHk3agg=",
+   "pom": "sha256-JugjMBV9a4RLZ6gGSUXiBlgedyl3GD4+Mf7GBYqppZs="
+  },
+  "com/github/ben-manes/caffeine#caffeine/3.0.5": {
+   "jar": "sha256-iptU01BqO5LuRrIXvO55GWshym1S3ClnxoaiBfsvnBU=",
+   "module": "sha256-MNqUAgRzgsSZ0djzcgH8Ead8mTTSxYa8WkKvrEr6wrI=",
+   "pom": "sha256-vM/bJH7Xa1K7sUMMIoLEO61BjtPGl7TiqVrQmbvyXPg="
+  },
+  "com/github/kevinstern#software-and-algorithms/1.0": {
+   "jar": "sha256-YauCQ5zvNzQ7FPUxVMRhYZN1NzpWuTOOiVcJ+1Tghkw=",
+   "pom": "sha256-7ZcfAJNU5owJQUyWT74aLIXCyLvUYBIrdJenuMXU84g="
+  },
+  "com/google#google/5": {
+   "pom": "sha256-4J00XnPKP7yn8+BfMN63Tp053Wt5qT/ujFEfI0F7aCg="
+  },
+  "com/google/auto#auto-common/1.2.2": {
+   "jar": "sha256-9Qsc6KQfrTGoqBnAUvj/o2LqCj2+nvj3x9yaNtRzilk=",
+   "pom": "sha256-A6mS+6T8+7z3ekYJgRgWMARuW64JZzpIGTxuD3YSceo="
+  },
+  "com/google/auto/service#auto-service-aggregator/1.0.1": {
+   "pom": "sha256-BIFGDbWZAzYrJvq9O9zV7CAHUPk5G7tlAv48fcLfPkw="
+  },
+  "com/google/auto/service#auto-service-annotations/1.0.1": {
+   "jar": "sha256-x77FS3tViLWWfocDQQkcVpEYHZVM8gOfG/Cm7rg3Rzs=",
+   "pom": "sha256-6bvxs9ZsoYAEpqB6INv6EMos6DZzSPdB3i/o/vzmjMI="
+  },
+  "com/google/auto/value#auto-value-annotations/1.9": {
+   "jar": "sha256-+lRp9MRO5Zii2PAzqwqdy8ZJigxeDJmN+gwq31E1gEQ=",
+   "pom": "sha256-kiCj2r51x5M08GGw5A34M0SGZrrCiouCO8Ho/VL4yYo="
+  },
+  "com/google/auto/value#auto-value-parent/1.9": {
+   "pom": "sha256-Lj2d/2OWAcq4gdfhcIBry9jgMffr/yWcu0W+V7TL14c="
+  },
+  "com/google/code/findbugs#jsr305/3.0.2": {
+   "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
+   "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
+  },
+  "com/google/errorprone#error_prone_annotation/2.28.0": {
+   "jar": "sha256-H7c7F09Cd7vn7hZTBF+kSY9QQCilySQJJsDztNW1IbQ=",
+   "pom": "sha256-gmNP+45oXAyzHo+xU8hHVScrlIhzFS5zlfryFL17HCs="
+  },
+  "com/google/errorprone#error_prone_annotations/2.28.0": {
+   "jar": "sha256-8/yKOgpAIHBqNzsA5/V8JRLdJtH4PSjH04do+GgrIx4=",
+   "pom": "sha256-DOkJ8TpWgUhHbl7iAPOA+Yx1ugiXGq8V2ylet3WY7zo="
+  },
+  "com/google/errorprone#error_prone_check_api/2.28.0": {
+   "jar": "sha256-JQ0POIalzPkSMQf2a6LtF6DaDWZr/mOL07sMAcIfrtA=",
+   "pom": "sha256-H/VLXFVUGyrORWuOya+Tw8TRZkf+Mc8s/n0sDWzxlxE="
+  },
+  "com/google/errorprone#error_prone_core/2.28.0": {
+   "jar": "sha256-pd4c/izgInch1idQqCNWmyboDNdcR8oh6p2hVKhkzew=",
+   "pom": "sha256-+pUv36UYlqDOOtvEz7FHXrzSoy4tatFoPGSvtEyzE4o="
+  },
+  "com/google/errorprone#error_prone_parent/2.28.0": {
+   "pom": "sha256-rM79u1QWzvX80t3DfbTx/LNKIZPMGlXf5ZcKExs+doM="
+  },
+  "com/google/errorprone#error_prone_type_annotations/2.28.0": {
+   "jar": "sha256-8jeFPr+hAOcxBUPq8snpDF7TTV/ujjMTn1+yPm5lP14=",
+   "pom": "sha256-N6YrIHbszmhIFabNSGSmwgZGCb/laE383M7LYApq5TM="
+  },
+  "com/google/errorprone#javac/9+181-r4173-1": {
+   "jar": "sha256-HY00eg4VefP8hqwE0ZdOSJr8ZjV/AAmsmASnrDCRLtY=",
+   "pom": "sha256-FWnAgfqDWKBhZDcvn1Qbig6l7Alkkx9fdOrTb/UrQBU="
+  },
+  "com/google/guava#failureaccess/1.0.1": {
+   "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=",
+   "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk="
+  },
+  "com/google/guava#guava-parent/26.0-android": {
+   "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
+  },
+  "com/google/guava#guava-parent/32.1.1-jre": {
+   "pom": "sha256-BqpdGsBo8vgJUw8/9T+1yMlAFSolNiPQtTxPU/WhOj0="
+  },
+  "com/google/guava#guava/32.1.1-jre": {
+   "jar": "sha256-kfu6N/HIslHPnqnn06Np63nrHmpd8dS79IPdA4B0AoE=",
+   "module": "sha256-pY+TjSOeaYtZs8OcrVgO/Ro/1MoTq5KzBCbUJFLE7z4=",
+   "pom": "sha256-LJBx19FSKwx2IFfDToub+uOZJ6DrdVw2qnZRlyGHDXs="
+  },
+  "com/google/inject#guice-parent/5.1.0": {
+   "pom": "sha256-Y9XAxkF5feumwFHEfV9pI/OhA+9x5OvDqF0Bw+h4WWw="
+  },
+  "com/google/inject#guice/5.1.0": {
+   "jar": "sha256-QTDlC/rEgJnIYPDZA7kYYMgaJJyQ84JF+P7Vj8gXvCY=",
+   "pom": "sha256-s7jcZSE9Yj+3DteVjb3WFjJCVrqDajFlJWDDiJmf2c0="
+  },
+  "com/google/protobuf#protobuf-bom/3.19.6": {
+   "pom": "sha256-8tqbt1IIO0yJDV69ZjFMRyb1M67+dvbCQn6dcfKIIxE="
+  },
+  "com/google/protobuf#protobuf-java/3.19.6": {
+   "jar": "sha256-apot/5Hc9x+FvnGulx9hZLWmMdzTS/8I8GGFNcpErQI=",
+   "pom": "sha256-0QlO6w21FqBQC7C+xZATbmBoqD0P94K3wcdxqeidHaQ="
+  },
+  "com/google/protobuf#protobuf-parent/3.19.6": {
+   "pom": "sha256-rM3kgjBu27qah3rfuxBoD+pME2tueX5TupuEaeolqlw="
+  },
+  "com/tngtech/archunit#archunit-junit4/1.3.0": {
+   "jar": "sha256-lGu5zP5h5viJ9x//5sKxsCOQvYm6EOUXBxTWuDk7yGE=",
+   "pom": "sha256-XAYdoxSOgubsxm+jQhYnEPJF+zrRY5R1uOJkPovDgLY="
+  },
+  "com/tngtech/archunit#archunit/1.3.0": {
+   "jar": "sha256-U2JATLWVsxvZKk0PrvQK3MS9Jz2gyIEavvf8yHnnyyY=",
+   "pom": "sha256-8xM35B4lX6BfWBsMtjpdmq6E6Udg4Qa5k7FcinF4fQo="
+  },
+  "io/github/eisop#dataflow-errorprone/3.41.0-eisop1": {
+   "jar": "sha256-EENPuk5T9V+px2kEzeQUuRiTJUjJ38Ti1jSsBf96fRA=",
+   "pom": "sha256-I/HN+kYTwAzG6lyfU2DhRxtEn4JjPxPPX/bNs0+jHr0="
+  },
+  "io/github/java-diff-utils#java-diff-utils-parent/4.12": {
+   "pom": "sha256-2BHPnxGMwsrRMMlCetVcF01MCm8aAKwa4cm8vsXESxk="
+  },
+  "io/github/java-diff-utils#java-diff-utils/4.12": {
+   "jar": "sha256-mZCiA5d49rTMlHkBQcKGiGTqzuBiDGxFlFESGpAc1bU=",
+   "pom": "sha256-wm4JftyOxoBdExmBfSPU5JbMEBXMVdxSAhEtj2qRZfw="
+  },
+  "javax/inject#javax.inject/1": {
+   "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=",
+   "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o="
+  },
+  "javax/xml/soap#javax.xml.soap-api/1.4.0": {
+   "jar": "sha256-FBN04zvpl2hhGi1CudM1caDFuXY77KnC3JCQDYzI92c=",
+   "pom": "sha256-f0QbXEpuotXviFh1zw4wrbjDy4+dCpK+cJVMc7kGwK0="
+  },
+  "junit#junit/4.13.2": {
+   "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
+   "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
+  },
+  "net/java#jvnet-parent/5": {
+   "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo="
+  },
+  "net/sf/jopt-simple#jopt-simple/5.0.4": {
+   "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=",
+   "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU="
+  },
+  "org/apache#apache/13": {
+   "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
+  },
+  "org/apache/commons#commons-math3/3.2": {
+   "jar": "sha256-YmipoOo+dp/Ek6IURmZMDvZo5IyT0SZ5H28/dXl4/uI=",
+   "pom": "sha256-LNDbe843DBQEAlzAE8Efj9SfPzw0Cm0tz5nTY9eUimk="
+  },
+  "org/apache/commons#commons-parent/28": {
+   "pom": "sha256-FHM6aOixILad5gzZbSIhRtzzLwPBxsxqdQsSabr+hsc="
+  },
+  "org/apiguardian#apiguardian-api/1.1.2": {
+   "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
+   "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
+   "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
+  },
+  "org/checkerframework#checker-qual/3.19.0": {
+   "module": "sha256-U+GJnd48UTyh79N2q/+sDmkH6OhKvV+WYkJjTJXk0Vc=",
+   "pom": "sha256-KbqcXOGpS3AL2CPE7WEvWCe1kPGaSXdf1+uPmX+Ko3E="
+  },
+  "org/checkerframework#checker-qual/3.33.0": {
+   "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=",
+   "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=",
+   "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM="
+  },
+  "org/hamcrest#hamcrest-core/1.3": {
+   "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
+   "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
+  },
+  "org/hamcrest#hamcrest-parent/1.3": {
+   "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
+  },
+  "org/jacoco#org.jacoco.agent/0.8.13": {
+   "jar": "sha256-nbPJ1ddPqHCyYbZKMIJBLhvW4i6fqY9HN7G/+K+cxk0=",
+   "pom": "sha256-auuUf988z1Qlydq41oPWu+MPCSjEWnAuYlWMblXmRLc="
+  },
+  "org/jacoco#org.jacoco.ant/0.8.13": {
+   "jar": "sha256-ZDS4VS/z0OSi+70Tpu+xJODJykU4F8YsA96DkNh//RE=",
+   "pom": "sha256-I4tCPVxuZQ9LQPF1T42iYQDHpzYz5d1RKIxzgHRj744="
+  },
+  "org/jacoco#org.jacoco.build/0.8.13": {
+   "pom": "sha256-mUw64c/KZ2WWj+Pt5PN5mGrrLn61GiAUyqSgnXGo9KM="
+  },
+  "org/jacoco#org.jacoco.core/0.8.13": {
+   "jar": "sha256-UUwj32z9AV19g8EKeS41q2int+gvPWo6RIF2LBMuM6k=",
+   "pom": "sha256-73/2F3zZcB1QXv6C9N1P6l5fcssEesK088qitBbaD08="
+  },
+  "org/jacoco#org.jacoco.report/0.8.13": {
+   "jar": "sha256-gTMoCgqkQ1i+nRNrUjcDQvRVzLlEquB0OCIKd2YleKI=",
+   "pom": "sha256-EBBlOpAAx+qoVqJx+E0HH/Rt6nojdbhKitmiOz5lPOg="
+  },
+  "org/junit#junit-bom/5.10.3": {
+   "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=",
+   "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw="
+  },
+  "org/junit/jupiter#junit-jupiter-api/5.10.3": {
+   "jar": "sha256-bv5uAcof95t79Mbx7tCykpLhZsJ+r3sArJgaFNTeYao=",
+   "module": "sha256-HH5GU3/EOyd29N5BmpCEpkAREQn6QLSHiUCynOI4vh4=",
+   "pom": "sha256-c0ocaMNMWt870vW8pL9JjLtPScSJ18JNgM8OIQK+bxQ="
+  },
+  "org/junit/jupiter#junit-jupiter-engine/5.10.3": {
+   "jar": "sha256-u9POjcEemSUHHvlpHWivGrbnEvqmhR98UnW8iq/IhnM=",
+   "module": "sha256-t34vIrhuzSrvh/C3LGoHDwsOdqNKvaqKd1ECweDRYSE=",
+   "pom": "sha256-g+8P1otgv2vHmnj+sRiCxiXEgu9p1iv+LRFwQKZEgUQ="
+  },
+  "org/junit/jupiter#junit-jupiter-params/5.10.3": {
+   "jar": "sha256-fD7YzvsSSWt2xTw9qYbqjwvz9CZ4GGlHVVGuOlBsGtg=",
+   "module": "sha256-TnM9YVyqFuDs17mum/6I+YqUAgkpMzx+4rT6CaegTZE=",
+   "pom": "sha256-bNnfkGpi/mTMMBw9YAeX9iTb1CJff6UFpajtsx/5iQY="
+  },
+  "org/junit/jupiter#junit-jupiter/5.10.3": {
+   "jar": "sha256-5vwJ+IHrqLjYp2YKbH9NWC+niB8wYTav4tgpZKLnwi8=",
+   "module": "sha256-hrCGx1WStDQ9pPdL6V4mhSxMqqWzToLVaqg/MYBLyBA=",
+   "pom": "sha256-Jd7AgvAkZ81iKQ7xOJv0smhu9QVKGo7d+xtbfVTeGZE="
+  },
+  "org/junit/platform#junit-platform-commons/1.10.3": {
+   "jar": "sha256-l4fwTUnbWTl83XVV1CGlvS0URWZpl9MnuU+F44vtV/E=",
+   "module": "sha256-n9gMr9DRm5pTrhnq4Eq94bIwVfQXXXbI52ibzkRImCs=",
+   "pom": "sha256-dZdXLFnxl1Ji+Nj8+I7GeDN2hUvwjOipPZnb3InuQ/k="
+  },
+  "org/junit/platform#junit-platform-engine/1.10.3": {
+   "jar": "sha256-33wyv3XPR8TI3dGUIJECeUen12XTC3Mf4AgwEV+voTM=",
+   "module": "sha256-D7CUb/Z+Q9A2K71CwjRNUUc4nkMVKCN3EW/rZOJrgNE=",
+   "pom": "sha256-b5uZvKDBfdwZ9RvAN+OxfKsPx+bx2nA4ejCrTgUgcig="
+  },
+  "org/junit/platform#junit-platform-launcher/1.10.3": {
+   "jar": "sha256-3q7t4vAR6vlPW8aB4E7uL0oPbWl3Hhp5qpUNiYtAXY0=",
+   "module": "sha256-t8tPKSY20uTbEbgazAMRJsfOvhLotss9JF6t5/3Qg0M=",
+   "pom": "sha256-cBNMufwHJ1YgZdX+faWPEF5KHHh36JnUkUm10/j9bRc="
+  },
+  "org/junit/vintage#junit-vintage-engine/5.10.3": {
+   "jar": "sha256-1gKI0+hQup8q9HASA6UXHvMGNO/TTaQKtH+s69LGXWw=",
+   "module": "sha256-nsdj0t+xBgbUdX7Jodku/362xiBt2urEexpZmQCI1Zo=",
+   "pom": "sha256-T558FJjpb+ai9S++LViw1/FQq+H4SspuPTo12m+go4g="
+  },
+  "org/openjdk/jmh#jmh-core/1.36": {
+   "jar": "sha256-+Ql0430NqIhrXAXm4+fiBVaQDXR8WkHBAjtHwzAepzw=",
+   "pom": "sha256-mBI0JlrAQfFmsXxa3GsdRZ6JTKv/6vawnAB08PQDguQ="
+  },
+  "org/openjdk/jmh#jmh-generator-asm/1.36": {
+   "jar": "sha256-dGCxG4I97nSz4ZYX011ZEbASRTA9bjHDD4NBfPwvVLU=",
+   "pom": "sha256-V7u+h4OU+LP8G4DEEWHdSItCwNez1wpeR09CcbHqOkk="
+  },
+  "org/openjdk/jmh#jmh-generator-bytecode/1.36": {
+   "jar": "sha256-M3ZUL4lQvNcGxRbOBiDR34IjCecJK4+TOJFygxgdWF0=",
+   "pom": "sha256-URABHSX7lGay8Am/99fsCmLop6uvBomb+2tjBbBOKUQ="
+  },
+  "org/openjdk/jmh#jmh-generator-reflection/1.36": {
+   "jar": "sha256-qccnYOEsGZ4qLCjxoSbr8MxbUcC1jUZHJZb8Mvf5JTQ=",
+   "pom": "sha256-msCIMyyp0UcTCJk55zzaHn/0Q8fIx3usiFsIo7eHUUY="
+  },
+  "org/openjdk/jmh#jmh-parent/1.36": {
+   "pom": "sha256-O2PObo/vrLMgN24F6fuzuuhqiJI5AIdZGJoLDVylxdY="
+  },
+  "org/opentest4j#opentest4j/1.3.0": {
+   "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
+   "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
+   "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
+  },
+  "org/ow2#ow2/1.5": {
+   "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs="
+  },
+  "org/ow2#ow2/1.5.1": {
+   "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
+  },
+  "org/ow2/asm#asm-bom/9.8": {
+   "pom": "sha256-DaHcsibmzf2ttNrFkZFruRe1c3RnTZG9LxMAMTe0FSA="
+  },
+  "org/ow2/asm#asm-commons/9.8": {
+   "jar": "sha256-MwGhwctMWfzFKSZI2sHXxa7UwPBn376IhzuM3+d0BPQ=",
+   "pom": "sha256-95PnjwH3A3F9CUcuVs3yEv4piXDIguIRbo5Un7bRQMI="
+  },
+  "org/ow2/asm#asm-tree/9.8": {
+   "jar": "sha256-FLeIDLfIXu0QHicQQy/D/7gydVMqaolNxMQJXUmtWfE=",
+   "pom": "sha256-cUnn+qDhkSlvh5ru2SCciULTmPBpjSzKGpxijy4qj3c="
+  },
+  "org/ow2/asm#asm/9.0": {
+   "jar": "sha256-Dfl1dJFK7pL9NJ0MtOAPM0XUWywjngu1DwqQ6tR4iOA=",
+   "module": "sha256-ivgQlu06/6OaRyn8kApVtmOJSRHWfE1L7w6kJDk90/k=",
+   "pom": "sha256-3gNVWQ3Rv8zNyNeQJK6ZKXLoVSaKztua1oLQheA6lK0="
+  },
+  "org/ow2/asm#asm/9.8": {
+   "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=",
+   "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o="
+  },
+  "org/pcollections#pcollections/4.0.1": {
+   "jar": "sha256-H4J2bXwyIZMIVAM76/9Qc+pGtD8nMmB0u+FdFIwYv7M=",
+   "module": "sha256-nr2nwMnbETTTQd/3yK0LxZUyhvvwuZiuyil6HuboCfA=",
+   "pom": "sha256-+j8pi1AlO5bpz7BvARw7zHj9m0DY3NJZCbygRUlzjHE="
+  },
+  "org/slf4j#slf4j-api/2.0.16": {
+   "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=",
+   "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c="
+  },
+  "org/slf4j#slf4j-bom/2.0.16": {
+   "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk="
+  },
+  "org/slf4j#slf4j-parent/2.0.16": {
+   "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU="
+  },
+  "org/slf4j#slf4j-simple/2.0.16": {
+   "jar": "sha256-7/wyAYZYvqCdHgjH0QYMytRsCGlg9YPQfdf/6cEXKkc=",
+   "pom": "sha256-z2xVMUjop3lRz9oTHSCUgZgf1uLAKntI3G1mBVI83xw="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  },
+  "org/sonatype/oss#oss-parent/9": {
+   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+  },
+  "org/yaml#snakeyaml/1.33": {
+   "jar": "sha256-Ef9Fl4jwoteB9WpKhtfmkgLOus0Cc9UmnErp8C8/2PA=",
+   "pom": "sha256-6n1I/UUyGmAz2XzSiBhtSOXpLMDHBm5ziNfEzrSvWVc="
+  }
+ }
+}
--- a/pkgs/development/libraries/java/rhino/gcj-type-mismatch.patch
+++ b/pkgs/development/libraries/java/rhino/gcj-type-mismatch.patch
@@ -1,103 +0,0 @@
-Work around GCJ bug #35410:
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35410 .
-
-diff --git a/src/org/mozilla/javascript/Arguments.java b/src/org/mozilla/javascript/Arguments.java
-index d914294..d658f12 100644
--- a/src/org/mozilla/javascript/Arguments.java
-+++ b/src/org/mozilla/javascript/Arguments.java
-@@ -144,7 +144,7 @@ final class Arguments extends IdScriptableObject
-                 synchronized (this) {
-                     if (args[index] != NOT_FOUND) {
-                         if (args == activation.originalArgs) {
-                            args = args.clone();
-+                            args = (Object[]) args.clone();
-                         }
-                         args[index] = value;
-                         return;
-@@ -162,7 +162,7 @@ final class Arguments extends IdScriptableObject
-             synchronized (this) {
-                 if (args[index] != NOT_FOUND) {
-                     if (args == activation.originalArgs) {
-                        args = args.clone();
-+                        args = (Object[]) args.clone();
-                     }
-                     args[index] = NOT_FOUND;
-                     return;
-diff --git a/src/org/mozilla/javascript/FunctionObject.java b/src/org/mozilla/javascript/FunctionObject.java
-index 1d6c752..3adc100 100644
--- a/src/org/mozilla/javascript/FunctionObject.java
-+++ b/src/org/mozilla/javascript/FunctionObject.java
-@@ -455,7 +455,7 @@ public class FunctionObject extends BaseFunction
-                     Object converted = convertArg(cx, scope, arg, typeTags[i]);
-                     if (arg != converted) {
-                         if (invokeArgs == args) {
-                            invokeArgs = args.clone();
-+                            invokeArgs = (Object[]) args.clone();
-                         }
-                         invokeArgs[i] = converted;
-                     }
-diff --git a/src/org/mozilla/javascript/Interpreter.java b/src/org/mozilla/javascript/Interpreter.java
-index f7f544d..e125e2f 100644
--- a/src/org/mozilla/javascript/Interpreter.java
-+++ b/src/org/mozilla/javascript/Interpreter.java
-@@ -285,9 +285,9 @@ public class Interpreter implements Evaluator
-             // clone stack but keep varSource to point to values
-             // from this frame to share variables.
- 
-            copy.stack = stack.clone();
-            copy.stackAttributes = stackAttributes.clone();
-            copy.sDbl = sDbl.clone();
-+            copy.stack = (Object[]) stack.clone();
-+            copy.stackAttributes = (int[]) stackAttributes.clone();
-+            copy.sDbl = (double[]) sDbl.clone();
- 
-             copy.frozen = false;
-             return copy;
-diff --git a/src/org/mozilla/javascript/NativeJavaClass.java b/src/org/mozilla/javascript/NativeJavaClass.java
-index f72f9e7..25c6757 100644
--- a/src/org/mozilla/javascript/NativeJavaClass.java
-+++ b/src/org/mozilla/javascript/NativeJavaClass.java
-@@ -271,7 +271,7 @@ public class NativeJavaClass extends NativeJavaObject implements Function
-                 Object x = Context.jsToJava(arg, argTypes[i]);
-                 if (x != arg) {
-                     if (args == origArgs) {
-                        args = origArgs.clone();
-+                        args = (Object[]) origArgs.clone();
-                     }
-                     args[i] = x;
-                 }
-diff --git a/src/org/mozilla/javascript/NativeJavaMethod.java b/src/org/mozilla/javascript/NativeJavaMethod.java
-index b6eaf8b..dc699a0 100644
--- a/src/org/mozilla/javascript/NativeJavaMethod.java
-+++ b/src/org/mozilla/javascript/NativeJavaMethod.java
-@@ -213,7 +213,7 @@ public class NativeJavaMethod extends BaseFunction
-                 Object coerced = Context.jsToJava(arg, argTypes[i]);
-                 if (coerced != arg) {
-                     if (origArgs == args) {
-                        args = args.clone();
-+                        args = (Object[]) args.clone();
-                     }
-                     args[i] = coerced;
-                 }
-diff --git a/src/org/mozilla/javascript/regexp/NativeRegExp.java b/src/org/mozilla/javascript/regexp/NativeRegExp.java
-index 0bae489..f7124bf 100644
--- a/src/org/mozilla/javascript/regexp/NativeRegExp.java
-+++ b/src/org/mozilla/javascript/regexp/NativeRegExp.java
-@@ -2168,7 +2168,7 @@ System.out.println("Testing at " + gData.cp + ", op = " + op);
-                     // XXX: If backTrackData will no longer be used, then
-                     // there is no need to clone backTrackData.parens
-                     if (backTrackData.parens != null) {
-                        gData.parens = backTrackData.parens.clone();
-+                        gData.parens = (long[]) backTrackData.parens.clone();
-                     }
- 
-                     gData.cp = backTrackData.cp;
-@@ -2708,7 +2708,7 @@ class REBackTrackData {
-         continuation_pc = pc;
-         lastParen = gData.lastParen;
-         if (gData.parens != null) {
-            parens = gData.parens.clone();
-+            parens = (long[]) gData.parens.clone();
-         }
-         cp = gData.cp;
-         stateStackTop = gData.stateStackTop;
--- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix
+++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix
@@ -12,7 +12,6 @@
  pydantic,
  pytestCheckHook,
  pytest-cov-stub,
-  pythonOlder,
  rich,
  semver,
  setuptools,
@@ -21,16 +20,14 @@

 buildPythonPackage rec {
  pname = "appthreat-vulnerability-db";
-  version = "6.4.1";
+  version = "6.4.2";
  pyproject = true;

-  disabled = pythonOlder "3.10";
-
  src = fetchFromGitHub {
    owner = "AppThreat";
    repo = "vulnerability-db";
    tag = "v${version}";
-    hash = "sha256-yPe8AWh2L6KUFPb9rmUSjQ7/iDP77Tw2aTBF2rr8/dY=";
+    hash = "sha256-PmxlcdAUJjLIc0AWsN/oG11ESdsnln3LALsSnjV0yWM=";
  };

  pythonRelaxDeps = [
@@ -67,6 +64,7 @@ buildPythonPackage rec {
    # Tests require network access
    "test_bulk_search"
    "test_download_recent"
+    "test_parse_purl"
  ];

  pythonImportsCheck = [ "vdb" ];
--- a/pkgs/development/python-modules/dynaconf/default.nix
+++ b/pkgs/development/python-modules/dynaconf/default.nix
@@ -0,0 +1,102 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  ansible-core,
+  boto3,
+  commentjson,
+  configobj,
+  django,
+  django-debug-toolbar,
+  flask,
+  hvac,
+  ipython,
+  pytest-cov-stub,
+  pytest-mock,
+  pytest-xdist,
+  pytestCheckHook,
+  python-dotenv,
+  radon,
+  toml,
+  tox,
+  versionCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "dynaconf";
+  version = "3.2.11";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dynaconf";
+    repo = "dynaconf";
+    tag = version;
+    hash = "sha256-9E9us6niUtPJkZ89uKXz6wByoEERwxS/xW5qvkIXIhQ=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ ansible-core ];
+
+  nativeCheckInputs = [
+    boto3
+    commentjson
+    configobj
+    django
+    django-debug-toolbar
+    flask
+    hvac
+    ipython
+    pytest-cov-stub
+    pytest-mock
+    pytest-xdist
+    pytestCheckHook
+    python-dotenv
+    radon
+    toml
+    tox
+    versionCheckHook
+  ];
+
+  disabledTestPaths = [
+    # import file mismatch
+    # imported module 'app_test' has this __file__ attribute:
+    # /build/source/tests_functional/issues/1005-key-type-error/app_test.py
+    # which is not the same as the test file we want to collect:
+    # /build/source/tests_functional/issues/994_validate_on_update_fix/app_test.py
+    "tests_functional/django_pytest_pure/app/tests"
+    "tests_functional/issues/575_603_666_690__envvar_with_template_substitution/app_test.py"
+    "tests_functional/issues/658_nested_envvar_override/app_test.py"
+    "tests_functional/issues/835_926_enable-merge-equal-false/app_test.py"
+    "tests_functional/issues/994_validate_on_update_fix/app_test.py"
+    "tests_functional/pytest_example/app/tests"
+    "tests_functional/pytest_example/flask/tests"
+    # flask.cli.NoAppException: Failed to find Flask application or factory in module 'app'
+    # Use 'app:name' to specify one
+    "tests/test_cli.py"
+    # sqlite3.OperationalError: no such table: auth_user
+    "tests_functional/django_pytest/app/tests/test_app.py::test_admin_user"
+    # unable connect port
+    "tests/test_redis.py"
+    # need docker
+    "tests/test_vault.py"
+  ];
+
+  # django.core.exceptions.ImproperlyConfigured: Requested setting LOGGING_CONFIG
+  # but settings are not configured
+  env.DJANGO_SETTINGS_MODULE = "project.settings";
+
+  pythonImportsCheck = [ "dynaconf" ];
+
+  versionCheckProgramArg = "--version";
+
+  meta = {
+    description = "Dynamic configurator for Python Project";
+    homepage = "https://github.com/dynaconf/dynaconf";
+    changelog = "https://github.com/dynaconf/dynaconf/blob/${src.tag}/CHANGELOG.md";
+    mainProgram = "dynaconf";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ emaryn ];
+  };
+}
--- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
@@ -16,7 +16,7 @@

 buildPythonPackage rec {
  pname = "google-cloud-dataproc";
-  version = "5.20.0";
+  version = "5.21.0";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "google_cloud_dataproc";
    inherit version;
-    hash = "sha256-aBsuUfbjaaU99JHQhdTmLU+lXc6x+pL12ZfcQ+MUgf4=";
+    hash = "sha256-LSoMxquZrJVB9z0uIRqFH6TQp18btRsjwk3vyGzWxPo=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/ipyvuetify/default.nix
+++ b/pkgs/development/python-modules/ipyvuetify/default.nix
@@ -9,13 +9,13 @@

 buildPythonPackage rec {
  pname = "ipyvuetify";
-  version = "1.11.2";
+  version = "1.11.3";
  pyproject = true;

  # GitHub version tries to run npm (Node JS)
  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-P2fb45wct87QS5RshNKMAxCU7Lkx1DAC/nRRhYtREQo=";
+    hash = "sha256-NYCvp22a3UrgTMt/1X1KDPA6JhcFdC5xN97z67Zaxx0=";
  };

  # drop pynpm which tries to install node_modules
--- a/pkgs/development/python-modules/ldapdomaindump/default.nix
+++ b/pkgs/development/python-modules/ldapdomaindump/default.nix
@@ -1,32 +1,32 @@
 {
  lib,
  buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
  dnspython,
-  future,
  ldap3,
-  pythonOlder,
+  setuptools,
 }:

 buildPythonPackage rec {
  pname = "ldapdomaindump";
-  version = "0.9.4";
-  format = "setuptools";
+  version = "0.10.0-unstable-2025-04-06";
+  pyproject = true;

-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-mdzaFwUKllSZZuU7yJ5x2mcAlNU9lUKzsNAZfQNeb1I=";
+  src = fetchFromGitHub {
+    owner = "dirkjanm";
+    repo = "ldapdomaindump";
+    rev = "d559463eb29857f2660bf3867bfb9f8610d1ddb1";
+    hash = "sha256-gb/3gtXPQ86bkvunvj1wonxYAFHKkCh2H5dmSNTgz5g=";
  };

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    dnspython
-    future
    ldap3
  ];

-  # requires ldap server
+  # Tests require LDAP server
  doCheck = false;

  pythonImportsCheck = [ "ldapdomaindump" ];
@@ -34,8 +34,8 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Active Directory information dumper via LDAP";
    homepage = "https://github.com/dirkjanm/ldapdomaindump/";
-    changelog = "https://github.com/dirkjanm/ldapdomaindump/releases/tag/v${version}";
+    changelog = "https://github.com/dirkjanm/ldapdomaindump/releases/tag/${src.rev}";
    license = licenses.mit;
-    maintainers = [ ];
+    maintainers = with maintainers; [ fab ];
  };
 }
--- a/pkgs/development/python-modules/linode-api/default.nix
+++ b/pkgs/development/python-modules/linode-api/default.nix
@@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "linode-api";
-  version = "5.32.0";
+  version = "5.33.0";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "linode";
    repo = "python-linode-api";
    tag = "v${version}";
-    hash = "sha256-z1enJwdMy7yi+lVkeMkMMQ0kenCcVY8NQWKINAue5VA=";
+    hash = "sha256-XCmW9rpCpJhEMgaARduQ5JqE14oQNRZv3c9shvZp3+k=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/lsp-tree-sitter/default.nix
+++ b/pkgs/development/python-modules/lsp-tree-sitter/default.nix
@@ -45,5 +45,7 @@ buildPythonPackage rec {
    homepage = "https://github.com/neomutt/lsp-tree-sitter";
    license = licenses.gpl3Only;
    maintainers = with maintainers; [ doronbehar ];
+    # https://github.com/neomutt/lsp-tree-sitter/issues/4
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/mdutils/default.nix
+++ b/pkgs/development/python-modules/mdutils/default.nix
@@ -7,14 +7,14 @@
 }:
 buildPythonPackage rec {
  pname = "mdutils";
-  version = "1.7.0";
+  version = "1.8.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "didix21";
    repo = "mdutils";
    tag = "v${version}";
-    hash = "sha256-3/rqcRdyReQnllgVe0/KzwpcFdgHN0K6afisV4dj+Y8=";
+    hash = "sha256-UBq6xSGG49zaRVWe2RmsCDkpa3vZFqKRJZQEVUegTSM=";
  };

  build-system = [ setuptools ];
@@ -33,7 +33,7 @@ buildPythonPackage rec {
      this way, mdutils will make things easy for creating Markdown files.
    '';
    homepage = "https://github.com/didix21/mdutils";
-    changelog = "https://github.com/didix21/mdutils/releases/tag/v${version}";
+    changelog = "https://github.com/didix21/mdutils/releases/tag/${src.tag}";
    license = lib.licenses.mit;
    maintainers = [ lib.maintainers.azahi ];
  };
--- a/pkgs/development/python-modules/oracledb/default.nix
+++ b/pkgs/development/python-modules/oracledb/default.nix
@@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "oracledb";
-  version = "3.1.0";
+  version = "3.2.0";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-94z3RSEo+lZKmBnSE1c6fJPjsFOysu9QXxg85+R7Hns=";
+    hash = "sha256-m/nxyT5TFCsz0cXr9aur7r0gYqAdXq1ou7ZAQ57PIiM=";
  };

  build-system = [
--- a/pkgs/development/python-modules/patator/default.nix
+++ b/pkgs/development/python-modules/patator/default.nix
@@ -61,5 +61,8 @@ buildPythonPackage rec {
    homepage = "https://github.com/lanjelot/patator";
    license = licenses.gpl2Only;
    maintainers = with maintainers; [ y0no ];
+    # Still uses cx-oracle which is broken and was replaced by oracledb
+    # https://github.com/lanjelot/patator/issues/234
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/pyinstaller/default.nix
+++ b/pkgs/development/python-modules/pyinstaller/default.nix
@@ -25,12 +25,12 @@

 buildPythonPackage rec {
  pname = "pyinstaller";
-  version = "6.14.1";
+  version = "6.14.2";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-NdXAamaOIfASIXjb8g5A/SEBLcj2FwBCr2BQxOez7co=";
+    hash = "sha256-FCzOBxnnkxXwzCZADC5cRdm2sX5+BJH+5ESp+PFvSRc=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/pymetasploit3/default.nix
+++ b/pkgs/development/python-modules/pymetasploit3/default.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  msgpack,
+  pytestCheckHook,
+  requests,
+  retry,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pymetasploit3";
+  version = "1.0.6";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-y4YBQo6va+/NEuE+CWeueo0aEIHEnEZYBr1WH90qHxQ=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    msgpack
+    requests
+    retry
+  ];
+
+  # No tests available on PyPI
+  doCheck = false;
+
+  pythonImportsCheck = [ "pymetasploit3" ];
+
+  meta = {
+    description = "Library for Metasploit framework";
+    homepage = "https://pypi.org/project/pymetasploit3/";
+    license = with lib.licenses; [
+      gpl2Only
+      mit
+    ];
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/pysmartthings/default.nix
+++ b/pkgs/development/python-modules/pysmartthings/default.nix
@@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "pysmartthings";
-  version = "3.2.5";
+  version = "3.2.7";
  pyproject = true;

  disabled = pythonOlder "3.12";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "andrewsayre";
    repo = "pysmartthings";
    tag = "v${version}";
-    hash = "sha256-PT4S1VmAJKXDqfetJf5QIWdgKV5ZOOVM4yBOzGdJKsc=";
+    hash = "sha256-znaiCZiSGi3J9PhBtOhsh/ISHoa/lyd1lurneLPNHt4=";
  };

  build-system = [ poetry-core ];
--- a/pkgs/development/python-modules/pysmi/default.nix
+++ b/pkgs/development/python-modules/pysmi/default.nix
@@ -13,7 +13,7 @@
 }:

 buildPythonPackage rec {
-  version = "1.5.9";
+  version = "1.5.10";
  pname = "pysmi";
  pyproject = true;

@@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "lextudio";
    repo = "pysmi";
    tag = "v${version}";
-    hash = "sha256-cAeLoDwAf56aWWKKUjOB0fpy7C3gBJchJJtQ6986thc=";
+    hash = "sha256-fJwMkOzI5IrDEyH6wV/zD79k6rzuuqDvfZkuHC44TGY=";
  };

  build-system = [ poetry-core ];
--- a/pkgs/development/python-modules/pytapo/default.nix
+++ b/pkgs/development/python-modules/pytapo/default.nix
@@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "pytapo";
-  version = "3.3.46";
+  version = "3.3.48";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-AK8OFQ/cJJ9/KrpAIUaVBCY5lh3lENLkC5/Dhxx1vU0=";
+    hash = "sha256-2MBolLmcInRO1EMYsV0cV4AsvS9cJATDiP5iBjPkrk0=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/rapidgzip/default.nix
+++ b/pkgs/development/python-modules/rapidgzip/default.nix
@@ -10,14 +10,14 @@

 buildPythonPackage rec {
  pname = "rapidgzip";
-  version = "0.14.3";
+  version = "0.14.4";
  pyproject = true;

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-fTXwrxZXtAUakMPAwsDSQz886Dnbkw/b7T1lFt4qXfE=";
+    hash = "sha256-sHtL5TKVR6iP9pRg0/omw0gXqxgEQG8VcTAzkL3jjWs=";
  };

  prePatch = ''
--- a/pkgs/development/python-modules/rotary-embedding-torch/default.nix
+++ b/pkgs/development/python-modules/rotary-embedding-torch/default.nix
@@ -15,14 +15,14 @@

 buildPythonPackage rec {
  pname = "rotary-embedding-torch";
-  version = "0.8.6";
+  version = "0.8.7";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "lucidrains";
    repo = "rotary-embedding-torch";
    tag = version;
-    hash = "sha256-4/vKf5RwWbiFYKCQo4kAQzXLM85L4CwaL/MR7/xTkH8=";
+    hash = "sha256-xnLZ19IH6ellTmOjj7XVZ21Kly+Exe3ZQwaGzhSRGIA=";
  };

  nativeBuildInputs = [
@@ -43,7 +43,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Implementation of Rotary Embeddings, from the Roformer paper, in Pytorch";
    homepage = "https://github.com/lucidrains/rotary-embedding-torch";
-    changelog = "https://github.com/lucidrains/rotary-embedding-torch/releases/tag/${version}";
+    changelog = "https://github.com/lucidrains/rotary-embedding-torch/releases/tag/${src.tag}";
    license = licenses.mit;
    teams = [ teams.tts ];
  };
--- a/pkgs/development/python-modules/sharkiq/default.nix
+++ b/pkgs/development/python-modules/sharkiq/default.nix
@@ -4,26 +4,29 @@
  buildPythonPackage,
  fetchFromGitHub,
  requests,
+  setuptools,
 }:

 buildPythonPackage rec {
  pname = "sharkiq";
-  version = "1.1.0";
-  format = "setuptools";
+  version = "1.1.1";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "JeffResc";
    repo = "sharkiq";
    tag = "v${version}";
-    hash = "sha256-adSBFH5nGVPo7OBMak6rN5HA5uMKZCqnIVXBnR7REgQ=";
+    hash = "sha256-FIPU2D0e0JGcoxFKe5gf5nKZ0T/a18WS9I+LXeig1is=";
  };

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    aiohttp
    requests
  ];

-  # Project has no tests
+  # Module has no tests
  doCheck = false;

  pythonImportsCheck = [ "sharkiq" ];
@@ -31,6 +34,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Python API for Shark IQ robots";
    homepage = "https://github.com/JeffResc/sharkiq";
+    changelog = "https://github.com/JeffResc/sharkiq/releases/tag/${src.tag}";
    license = licenses.mit;
    maintainers = with maintainers; [ fab ];
  };
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "tencentcloud-sdk-python";
-  version = "3.0.1420";
+  version = "3.0.1421";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "TencentCloud";
    repo = "tencentcloud-sdk-python";
    tag = version;
-    hash = "sha256-XDhrf9um5So5JKNOUGQ4Vh/I701+3n6u+dSGuqrzccU=";
+    hash = "sha256-jUFi0KMj22PuCHQlVKV/yqWFam3/WfMZxcpCr2St9N8=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -101,5 +101,7 @@ buildPythonPackage rec {
    changelog = "https://github.com/Textualize/textual/blob/${src.tag}/CHANGELOG.md";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ gepbird ];
+    # https://github.com/Textualize/textual/issues/5868
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/tree-sitter/default.nix
+++ b/pkgs/development/python-modules/tree-sitter/default.nix
@@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "tree-sitter";
-  version = "0.24.0";
+  version = "0.24.0-unstable-2025-06-02";
  pyproject = true;

  disabled = pythonOlder "3.10";
@@ -23,8 +23,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "tree-sitter";
    repo = "py-tree-sitter";
-    tag = "v${version}";
-    hash = "sha256-ZDt/8suteaAjGdk71l8eej7jDkkVpVDBIZS63SA8tsU=";
+    rev = "9c78f3b8d10f81b97fbb2181c9333323d6375480";
+    hash = "sha256-jPqTraGrYFXBlci4Zaleyp/NTQhvuI39tYWRckjnV2E=";
    fetchSubmodules = true;
  };

@@ -56,11 +56,21 @@ buildPythonPackage rec {
    "test_dot_graphs"
  ];

-  meta = {
-    description = "Python bindings to the Tree-sitter parsing library";
-    homepage = "https://github.com/tree-sitter/py-tree-sitter";
-    changelog = "https://github.com/tree-sitter/py-tree-sitter/releases/tag/${src.tag}";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ fab ];
-  };
+  meta =
+    let
+      # for an -unstable version, we grab the release notes for the last tagged
+      # version it is based upon
+      lastTag = lib.pipe version [
+        lib.splitVersion
+        (lib.take 3)
+        (lib.concatStringsSep ".")
+      ];
+    in
+    {
+      description = "Python bindings to the Tree-sitter parsing library";
+      homepage = "https://github.com/tree-sitter/py-tree-sitter";
+      changelog = "https://github.com/tree-sitter/py-tree-sitter/releases/tag/v${lastTag}";
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [ fab ];
+    };
 }
--- a/pkgs/development/python-modules/txaio/default.nix
+++ b/pkgs/development/python-modules/txaio/default.nix
@@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "txaio";
-  version = "23.1.1";
+  version = "25.6.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-+akhbpduXjJG39ESrXrVXKkVYGtguEp1esdpvUBP9wQ=";
+    hash = "sha256-2MA9yoI1Fcm8qSDfM1BJI65U8tq/R2zFqe1cwWke1oc=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/univers/default.nix
+++ b/pkgs/development/python-modules/univers/default.nix
@@ -16,14 +16,14 @@

 buildPythonPackage rec {
  pname = "univers";
-  version = "30.12.1";
+  version = "31.0.0";
  pyproject = true;

  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-whuUM3IHnuK5bkXJ8SPrMoO3cRnm0yxKBPxBSfeQIFY=";
+    hash = "sha256-BqP5seUOhkZQBdi7ClaUDasr7h8A7YRidgISpQHVR1E=";
  };

  build-system = [
--- a/pkgs/development/python-modules/webauthn/default.nix
+++ b/pkgs/development/python-modules/webauthn/default.nix
@@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "webauthn";
-  version = "2.5.2";
+  version = "2.6.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "duo-labs";
    repo = "py_webauthn";
    tag = "v${version}";
-    hash = "sha256-r7enalDiFQDzjiLGuetXIJxFAUSGpWCnrCO/q5lkO10=";
+    hash = "sha256-TMEwgEXkd2ZTd3jWv94IS+GiGb8vdwourWWXWcnXpcg=";
  };

  build-system = [ setuptools ];
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -14,12 +14,12 @@ let
  # kernel config in the xanmod version commit
  variants = {
    lts = {
-      version = "6.12.36";
-      hash = "sha256-F/vdX8vAKf2/70Kni1UPcx/XBNF1b9tcoyzV4+q2/rY=";
+      version = "6.12.37";
+      hash = "sha256-VH5w802w6ugpMP5YPUuOJtf9TnrLZmFJUrGCQVH4n+s=";
    };
    main = {
-      version = "6.15.5";
-      hash = "sha256-jw5l0nd7ClDwMLI6n3LmJ+0MprcgTlsHQKpsdX6hFZs=";
+      version = "6.15.6";
+      hash = "sha256-ArhRHMHvScV1Xa0lgBbM0hYtCAXujSCHA3aKEZnZSwU=";
    };
  };

--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -314,6 +314,7 @@ mapAliases {
  ats = throw "'ats' has been removed as it is unmaintained for 10 years and broken"; # Added 2025-05-17
  audaciousQt5 = throw "'audaciousQt5' has been removed, since audacious is built with Qt 6 now"; # Added 2024-07-06
  auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02
+  autoReconfHook = throw "You meant 'autoreconfHook', with a lowercase 'r'."; # preserve
  aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14
  authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-19
  autoadb = throw "'autoadb' has been removed due to lack of maintenance upstream"; # Added 2025-01-25
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9391,10 +9391,7 @@ with pkgs;

  reposilitePlugins = recurseIntoAttrs (callPackage ../by-name/re/reposilite/plugins.nix { });

-  rhino = callPackage ../development/libraries/java/rhino {
-    javac = jdk8;
-    jvm = jre8;
-  };
+  rhino = callPackage ../development/libraries/java/rhino { };

  rocksdb_9_10 = rocksdb.overrideAttrs rec {
    pname = "rocksdb";
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4424,6 +4424,8 @@ self: super: with self; {

  dyn = callPackage ../development/python-modules/dyn { };

+  dynaconf = callPackage ../development/python-modules/dynaconf { };
+
  dynalite-devices = callPackage ../development/python-modules/dynalite-devices { };

  dynalite-panel = callPackage ../development/python-modules/dynalite-panel { };
@@ -13168,6 +13170,8 @@ self: super: with self; {

  pymetar = callPackage ../development/python-modules/pymetar { };

+  pymetasploit3 = callPackage ../development/python-modules/pymetasploit3 { };
+
  pymeteireann = callPackage ../development/python-modules/pymeteireann { };

  pymeteoclimatic = callPackage ../development/python-modules/pymeteoclimatic { };