From 6376bf0d11c135f0c65222d4269e22d9b5d4e51e Mon Sep 17 00:00:00 2001
From: Trent Baldwin <trent.baldwin@proton.me>
Date: Wed, 20 May 2026 22:23:06 -0400
Subject: [PATCH 01/58] ghidra: 12.0.4 -> 12.1

- Bump Ghidra version
- Remove gradle_8 since Ghidra can now be build with gradle 9 (mainline in nixpkgs)
---
 pkgs/tools/security/ghidra/build.nix |  10 +-
 pkgs/tools/security/ghidra/deps.json | 211 ++++++++++++++++-----------
 2 files changed, 129 insertions(+), 92 deletions(-)

diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix
index a47a2b3f7c36..6a402b3a110f 100644
--- a/pkgs/tools/security/ghidra/build.nix
+++ b/pkgs/tools/security/ghidra/build.nix
@@ -3,7 +3,7 @@
   fetchFromGitHub,
   lib,
   callPackage,
-  gradle_8,
+  gradle,
   makeBinaryWrapper,
   openjdk21,
   unzip,
@@ -20,7 +20,7 @@
 let
   pkg_path = "$out/lib/ghidra";
   pname = "ghidra";
-  version = "12.0.4";
+  version = "12.1";
 
   isMacArm64 = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
 
@@ -30,7 +30,7 @@ let
     owner = "NationalSecurityAgency";
     repo = "Ghidra";
     rev = "Ghidra_${version}_build";
-    hash = "sha256-ETRsLbnE4RU+MdmSxMHNIbevYsZhgrzqQDQmBojchLk=";
+    hash = "sha256-eAzmIqSE8cSGiEXYw9VPQ5iRGHZ0qfdwVnizVqoGa+Y=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -75,9 +75,6 @@ let
     HERE
   '';
 
-  # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
-  gradle = gradle_8;
-
 in
 stdenv.mkDerivation (finalAttrs: {
   inherit
@@ -216,6 +213,7 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
+      tbaldwin
       roblabla
       vringar
     ];
diff --git a/pkgs/tools/security/ghidra/deps.json b/pkgs/tools/security/ghidra/deps.json
index cc91df1b2b8b..50ed94b356be 100644
--- a/pkgs/tools/security/ghidra/deps.json
+++ b/pkgs/tools/security/ghidra/deps.json
@@ -34,8 +34,23 @@
   "35/a0/638186a75026a02286041e4a0449b1dff799a3914dc1c0716ef9b9367b73/jpype1-1.5.2-cp311-cp311-macosx_10_9_universal2": {
    "whl": "sha256-yfarjdKEwW4mF6aX1Uw9AwSwgCCjc4btlhA6EpORotk="
   },
-  "50/8f/518a37381e55a8857a638afa86143efa5508434613541402d20611a1b322/comtypes-1.4.1-py3-none-any": {
-   "whl": "sha256-ogig48ocClNic12g/2YYIoAdzocxK4lNfXUq3QEKIbA="
+  "51/8f/9bb81dd5bb77d22243d33c8397f09377056d5c687aa6d4042bea7fbf8364/pywin32-311-cp311-cp311-win_amd64": {
+   "whl": "sha256-POgLNLIrF8y9k3pueOciXYDFL1q5lA/gUGoaFvPatQM="
+  },
+  "56/d7/0bb36964811a23f262cdddb1e5b91fdbd2f494990d48e657f15108f04855/win32more_microsoft_windows_sdk_contracts-0.7.10.0.26100.6901-py2.py3-none-any": {
+   "whl": "sha256-OSpipux7ACXx5db1Xb+1UZHwCI249qL8dpQTqzayu88="
+  },
+  "5e/a2/52084698c0a3c7e7a94ddfff26f83df09a50781b8436f6f203f5de0a457c/pybag-2.2.16-py3-none-any": {
+   "whl": "sha256-zvYx6H0LsSFjyMsRynVt36iSSm6s29dGaD7ViUiiv98="
+  },
+  "5e/bf/360243b1e953bd254a82f12653974be395ba880e7ec23e3731d9f73921cc/pywin32-311-cp310-cp310-win_amd64": {
+   "whl": "sha256-eXwncgF4UZhLlxgLC+vktiC7hjKOiohLtiYVYpWmOzs="
+  },
+  "66/95/f30c80615fda0d3c0ee6493ac9db61183313b43499b62dec136773b0e870/comtypes-1.4.13-py3-none-any": {
+   "whl": "sha256-IVRiEHSLpS6DnlIRISSxb/q31/toCWSTFl+8JJ6QI60="
+  },
+  "6c/8e/fdfc9f796aad6b622ff197b3e58c9689db95482dbf7817cd99d351b54719/win32more_microsoft_web_webview2-0.7.1.0.3650.58-py2.py3-none-any": {
+   "whl": "sha256-wR0vBKClCmTQ7mDRWc7RpeFqc55DxXjiy5CfFpo5RYs="
   },
   "6d/d0/191db2e9ab6ae7029368a488c9d88235966843b185aba7925e54aa0c0013/jpype1-1.5.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64": {
    "whl": "sha256-Qv6NtmrU5cZvY39cTegvyogLppYQTh9KfldYhZI96tg="
@@ -55,21 +70,33 @@
   "77/91/f08a719461a390b48d9096b50f1f4a49ee281007ec192e51073090d3d8b7/jpype1-1.5.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64": {
    "whl": "sha256-VHRCZe82Zl0RDROaS4HRBTJpTGB3sj72DzYJ/q3CLTA="
   },
-  "83/1c/25b79fc3ec99b19b0a0730cc47356f7e2959863bf9f3cd314332bddb4f68/pywin32-306-cp312-cp312-win_amd64": {
-   "whl": "sha256-NyV3lMGtOe6b5lLaBGLcLjlMgVnf2ROopOjrb9NG2g4="
+  "81/bc/7c1c5609f835d3e719c944714638a7a70bbfef6b990c251c32c1cd82d67a/win32more_core-0.7.0-py2.py3-none-any": {
+   "whl": "sha256-pQFma0S9Ns7rvP92VufsdfkoE9I3YdD0nxTHmzpAa9k="
   },
   "8d/e4/0c27352e8222dcc0e3ce44b298015072d2057d08dd353541c980a31d26c9/jpype1-1.5.2-cp312-cp312-macosx_10_9_universal2": {
    "whl": "sha256-Hh25rJCa0q4OQLBMKqiMsUJQ1SRdaXFVYVB2gfKwiy8="
   },
+  "90/4b/07c77d8ba0e01349358082713400435347df8426208171ce297da32c313d/pywin32-311-cp314-cp314-win_amd64": {
+   "whl": "sha256-OspEwEa9LtjJDenLhCf1gcR55ZTpm1wLsZspwQ/Wy4c="
+  },
   "90/c7/6dc0a455d111f68ee43f27793971cf03fe29b6ef972042549db29eec39a2/psutil-5.9.8": {
    "tar.gz": "sha256-a+Em4yJUht/yhqj7mgYkalJT9MfFO0depfWsk05kGUw="
   },
+  "92/3a/658eb3ba88f067662be280f8f1aec07a70c96bac77e9edc48b1be38e446b/win32more-0.7.0-py3-none-any": {
+   "whl": "sha256-ulhrilmX0UEN5dk040rv3OjRXvjXZtamsc2odi1GsF4="
+  },
   "97/0a/cbe03759331c640aa5862f974028122a862b08935a0b11b8fa6f6e46c26b/jpype1-1.5.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64": {
    "whl": "sha256-zcqTzHT42x9gTS6mrbdk3sTexoUo8e5oMI+j1SQJVzk="
   },
+  "9f/8a/1403d0353f8c5a2f0829d2b1c4becbf9da2f0a4d040886404fc4a5431e4d/pywin32-311-cp39-cp39-win_amd64": {
+   "whl": "sha256-4MTPsGISgf5AOH31ggl/15boBDBZfLmUTwrnBEe6zZE="
+  },
   "a3/dc/17031897dae0efacfea57dfd3a82fdd2a2aeb58e0ff71b77b87e44edc772/setuptools-80.9.0-py3-none-any": {
    "whl": "sha256-Bi00IirRPgzDEqTALXPwWehqSsv73qj492soyZ8waSI="
   },
+  "b5/6d/d58b223be7cff571527d91a3626089cb4da614dcba461811dcf18449f0f9/win32more_microsoft_graphics_win2d-0.7.1.3.2-py2.py3-none-any": {
+   "whl": "sha256-VI9l/OvnLBmunHl92TUcDQvSABCFakko91X21OwBsWo="
+  },
   "bd/68/47fa634cbd0418cbca86355e9421425f5892ee994f7338106327e49f9117/jpype1-1.5.2": {
    "tar.gz": "sha256-dKQuzPIdMDlMGDKuw5haFJZfpTINoIe2UCnRcsDOxDs="
   },
@@ -79,21 +106,33 @@
   "c7/f2/b2efcad1ea5a541f125218e4eb1529ebb8ca18941264c879f3e89a36dc35/jpype1-1.5.2-cp310-cp310-macosx_10_9_universal2": {
    "whl": "sha256-ey2pjBQoEspAoYpzWzPkfGURsD3r8el5Yw9M9HO2ioc="
   },
-  "ce/78/91db67e7fe1546dc8b02c38591b7732980373d2d252372f7358054031dd4/Pybag-2.2.12-py3-none-any": {
-   "whl": "sha256-7aXubE6HOQKYG39SW0KgJCi4fHNo3yxb3+He0OaIQSY="
+  "d1/a8/a0e8d07d4d051ec7502cd58b291ec98dcc0c3fff027caad0470b72cfcc2f/pywin32-311-cp312-cp312-win_amd64": {
+   "whl": "sha256-uMCV7a1cIR/zHAUiNljnG/cRbaoOzzrYXzIB6jGQ0Gc="
   },
-  "d0/dd/b28df50316ca193dd1275a4c47115a720796d9e1501c1888c4bfa5dc2260/capstone-5.0.1-py3-none-win_amd64": {
-   "whl": "sha256-G/pcgeaIDK9BoxlGzW0tBpwEi8wi7fEhJUtQGgSN5nU="
+  "da/72/ff7894c2fb5716d9a3ce9c27ba34b29d991a11d8442d2ef0fcdc5564ba7e/capstone-5.0.6-py3-none-win_amd64": {
+   "whl": "sha256-dhw96uALIqxpcIHNrhODu5BlndDXk4egnPW9uyKxcGQ="
+  },
+  "e3/28/e0a1909523c6890208295a29e05c2adb2126364e289826c0a8bc7297bd5c/pywin32-311-cp313-cp313-win_amd64": {
+   "whl": "sha256-cYo49+WwWOdq7hxW3dBpCBFtNRR+EzQn5Zo5g/cDog0="
   },
   "e3/b7/e1787633b41d609320b41d0dd87fe3118598210609e4e3f6cef93cfcef40/jpype1-1.5.2-cp313-cp313-win_amd64": {
    "whl": "sha256-K5Y2XxMC3y+zxq1zEX1v5FClW3VQ/X/sraw87FvHEXw="
   },
+  "e5/37/8706eb126fc52e59526304aa89ee30771a894e489aa0ea835f101e499b17/win32more_microsoft_windows_sdk_win32metadata-0.7.68.0.4-py2.py3-none-any": {
+   "whl": "sha256-2eirOnxO+x2rsY0bmIwyZI8xdGjajom7ZJ/bbhqXqj8="
+  },
   "e5/cf/344e1f81f1e8c651ec23dfa9fe4b91f6e1d699b36f610a547ba85ee7fb16/jpype1-1.5.2-cp39-cp39-win_amd64": {
    "whl": "sha256-aOHRGCAPxG9OpL8gkACBWH7ATeSEA3yZewo7fF63H+M="
   },
   "ee/01/1ed1d482960a5718fd99c82f6d79120181947cfd4667ec3944d448ed44a3/protobuf-6.31.0-py3-none-any": {
    "whl": "sha256-asLoJVboIsF6jSOqEZC7wdBu+5wmGYHalcccnaCeniM="
   },
+  "ef/7c/9630708dd252e0c5c7c9975d52ba0deea996e9b0cf29784d521ac30f3a48/win32more_microsoft_windowsappsdk-0.7.1.8.251106002-py2.py3-none-any": {
+   "whl": "sha256-03xC0Oash/caShIJr4pq2t3hnUtt9EqzN1GV9fQcRiw="
+  },
+  "f6/49/cff21fc3adcac1fe19f9f2e50278553fe13b9ac702be569c97f85292481d/win32more_appsdk-0.7.3-py2.py3-none-any": {
+   "whl": "sha256-cHzdLbPwff19IrWqKt/9E9vTFqXu13nKJy/qpuvCL4g="
+  },
   "fa/4c/e0200a6e3fed5cda79e926c2a8a610676f04948f89d7e38d93c7d4b21be9/jpype1-1.5.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64": {
    "whl": "sha256-mU+3sxm0U/d61Lav8B4N1BgOp0pv5aAx5OnbktvpU3Y="
   }
@@ -104,40 +143,40 @@
   }
  },
  "https://github.com": {
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/Debugger/dbgmodel": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/Debugger/dbgmodel": {
    "tlb": "sha256-jPXzouuBFgqjSQVqXKTCxyaxtumL8wl81BNRRxYzQ8c="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2012_x64": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vs2012_x64": {
    "fidb": "sha256-1OmKs/eQuDF5MhhDC7oNiySl+/TaZbDB/6jLDPvrDNw="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2012_x86": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vs2012_x86": {
    "fidb": "sha256-pJDtfi7SHlh0Wf6urOcDa37eTOhOcuEN/YxXQ0ppGLY="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2015_x64": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vs2015_x64": {
    "fidb": "sha256-4E6eQPnstgHIX02E7Zv2a0U2O+HR6CwWLkyZArjLUI8="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2015_x86": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vs2015_x86": {
    "fidb": "sha256-tm7mlmU+LtNlkZ3qrviFEDEgx5LiLnmvcNEgnX4dhkQ="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2017_x64": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vs2017_x64": {
    "fidb": "sha256-1fpfaXKYF0+lPSR9NZnmoSiEYFrRgce5VOI4DsHwvYk="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2017_x86": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vs2017_x86": {
    "fidb": "sha256-04nLjXb/SlnKNfiRuFIccq1fDfluJTlzotIahhSkzIE="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2019_x64": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vs2019_x64": {
    "fidb": "sha256-FQAHeW/DakBpZgrWJEmq2q890Rs4ZKXvIeeYMcnOkRg="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vs2019_x86": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vs2019_x86": {
    "fidb": "sha256-62MKNvqlhqNx63NNwLvY0TzK72l/PbWHJZY1jz3SQyo="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vsOlder_x64": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vsOlder_x64": {
    "fidb": "sha256-jDtR9GYM0n4aDWEKnz8tX7yDOmasnuQ5PuLySB6FWGY="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/FunctionID/vsOlder_x86": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vsOlder_x86": {
    "fidb": "sha256-mGBca2uSFKlF2ETkHIWGDVRkmkW8p4c+9pkcDpNyB4c="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.0.4/lib/java-sarif-2.1-modified": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/lib/java-sarif-2.1-modified": {
    "jar": "sha256-f3NlZklHVtJxql5LGvbIncUNB0qxxjdKR9+CImQiawE="
   },
   "Z3Prover/z3/releases/download/z3-4.13.0/z3-4.13.0-arm64-osx-11.0": {
@@ -203,25 +242,27 @@
    "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
    "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
   },
-  "com/google/code/gson#gson-parent/2.9.0": {
-   "pom": "sha256-r3gcmldm/+oxGg3wU2V2pk3sxmGqEQxN5cc6yL9DRCQ="
+  "com/google/code/gson#gson-parent/2.13.2": {
+   "pom": "sha256-g6tSip1Q/XauuK1vcns+6ct2ZYYlV3TtFsqMTHbZ2s0="
   },
-  "com/google/code/gson#gson/2.9.0": {
-   "jar": "sha256-yW1gVRMxoZbaxUt0WqZCzQeO+JtvJnFGtwXywsvvBS0=",
-   "pom": "sha256-cZDQsH8njp9MYD9E5UOUD4HPGiVZ+FHG8pjJuyvil4w="
+  "com/google/code/gson#gson/2.13.2": {
+   "jar": "sha256-3QzhtVo+0ggMtw+cZVhQzahsIGhiMQAJ3LXlyVJlpeA=",
+   "pom": "sha256-OqBqp8D5rwkpYaQtCVeOQyS+FGNIoO5u1HhX98Jne3Y="
   },
   "com/google/errorprone#error_prone_annotations/2.2.0": {
    "jar": "sha256-br0iyhudjsBtQd6NZOBZaYHZYHtCA1+e03T53icaSBo=",
    "pom": "sha256-XgJY6huk5RoTN0JoC8IkSPerIUvkBz6GGfZF7xvkLdU="
   },
   "com/google/errorprone#error_prone_annotations/2.21.1": {
-   "jar": "sha256-0fPGaqkaxSVJ4Arjsgi6S5r31y1o8jBkNVO+s45hGKw=",
    "pom": "sha256-9ZiID+766p1nTcQdsTqzcAS/A3drW7IcBN7ejpIMHxI="
   },
   "com/google/errorprone#error_prone_annotations/2.38.0": {
-   "jar": "sha256-ZmHVM1CQpfxh3YadIJW8bB4hVuOqR6bkq6vfZMmaeIk=",
    "pom": "sha256-MAe++K/zro6hLYHD/qy08Vl5ss9cPjj8kYmpjeoUEWc="
   },
+  "com/google/errorprone#error_prone_annotations/2.41.0": {
+   "jar": "sha256-pW54K1tQgRrCBAc6NVoh2RWiEH/OE+xxEzGtA29mD8w=",
+   "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4="
+  },
   "com/google/errorprone#error_prone_parent/2.2.0": {
    "pom": "sha256-xGCQLd9ezmiDLGsnHOUqCSiwXPOmrIGo9UjHPL1UETg="
   },
@@ -231,6 +272,9 @@
   "com/google/errorprone#error_prone_parent/2.38.0": {
    "pom": "sha256-5iRYpqPmMIG8fFezwPrJ8E92zjL2BlMttp/is9R7k0w="
   },
+  "com/google/errorprone#error_prone_parent/2.41.0": {
+   "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI="
+  },
   "com/google/gradle#osdetector-gradle-plugin/1.7.0": {
    "jar": "sha256-29oheMFO1rk6GEsay/ONchBwAiUmaMERz0EeyjfkHKY=",
    "pom": "sha256-6BYywu6apI5+zwVHUSwcOGVgwNRqlY7lBVD3693xNRc="
@@ -615,33 +659,33 @@
    "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=",
    "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs="
   },
-  "org/apache/logging/log4j#log4j-api/2.25.3": {
-   "jar": "sha256-6IZoKSD6D7nW62OV3LTeCIRD+GRsicXlhG4WjjJ/QG8=",
-   "module": "sha256-W+T3N0jWz53pXLci63n8rVvCQnk6l4p+cmbyNZGBHAw=",
-   "pom": "sha256-MoS+ZXOuuDNGz/a3RvoyXSPq3Z0JyOKG7R11kEoS3W4="
+  "org/apache/logging/log4j#log4j-api/2.25.4": {
+   "jar": "sha256-xLZCp/BHJ1IV3hF+DjhH6yx3EdhKCqdDPns8CW2vNB0=",
+   "module": "sha256-vtG2eRoxTiT5fbBjv2vQXTp/12wUUNbHtF/bvXpPWP8=",
+   "pom": "sha256-lDpD2hQw2+tQGr0Ily8oPqifOx2/xCUuwwWVQ7Tga1U="
   },
-  "org/apache/logging/log4j#log4j-bom/2.25.3": {
-   "pom": "sha256-ZleICHEo/mw6+dAlJEhTKvl4cRdmSB20k5a/AyWibK0="
+  "org/apache/logging/log4j#log4j-bom/2.25.4": {
+   "pom": "sha256-cxPTOftjKoYQ4RQLMpD8JNY3Q7mqYl4qC9Wd7UCjrlQ="
   },
-  "org/apache/logging/log4j#log4j-core/2.25.3": {
-   "jar": "sha256-Nit/y2W3OqRsxLxTq/TrIW9ESoO10aA3y2/f/wrp8Pk=",
-   "module": "sha256-ChRnoKtPxLJSc7VVHGCL15UguZ/SgRGgM9M4jwJVYwA=",
-   "pom": "sha256-ysGDRqDJErAmrVF/SE78POgyZ/LPambKhGmRL/GYaw0="
+  "org/apache/logging/log4j#log4j-core/2.25.4": {
+   "jar": "sha256-EP7iwEhdVPpE7nXTFPYpVQj3uTIoGHPbYakbiAcyAOY=",
+   "module": "sha256-McWBtzkL0vhIHod3dcIYkk6nMPERwdgS1bWA2W+ceU8=",
+   "pom": "sha256-NMBz/HSWba+kTMW/123l42aOokDyhLq4R45BfuA6Vqo="
   },
-  "org/apache/logging/log4j#log4j/2.25.3": {
-   "pom": "sha256-pbdIJFris5b1vKlHpJbtwI29vfeWmuLMsattS0lznn8="
+  "org/apache/logging/log4j#log4j/2.25.4": {
+   "pom": "sha256-+K6JBKKONPoEw103QGGdroNjJAG6HjE7r9fM9aMADew="
   },
-  "org/bouncycastle#bcpkix-jdk18on/1.80": {
-   "jar": "sha256-T0umqSYX6hncGD8PpdtJLu5Cb93ioKLWyUd3/9GvZBM=",
-   "pom": "sha256-pKEiETRntyjhjyb7DP1X8LGg18SlO4Zxis5wv4uG7Uc="
+  "org/bouncycastle#bcpkix-jdk18on/1.84": {
+   "jar": "sha256-yH8W7Z5exhvJQVHp82RqxE5QzUSBIc6ENn+kt+x+wbs=",
+   "pom": "sha256-wSge1er48+QFVX56UgXLbzzfdT+E3psagVx16965mSo="
   },
-  "org/bouncycastle#bcprov-jdk18on/1.80": {
-   "jar": "sha256-6K0gn4xY0pGjfKl1Dp6frGBZaVbJg+Sd2Cgjgd2LMkk=",
-   "pom": "sha256-oKdcdtkcQh7qVtD2Bi+49j7ff6x+xyT9QgzNytcYHUM="
+  "org/bouncycastle#bcprov-jdk18on/1.84": {
+   "jar": "sha256-ZNbFphIfzZJxUt0YLL7Tmv4P2mQalw2bzAycsYWLJzE=",
+   "pom": "sha256-znq7SpG6XSpz/fF6PfR2LjYFoDksx5g+8vGuFs04TMM="
   },
-  "org/bouncycastle#bcutil-jdk18on/1.80": {
-   "jar": "sha256-Iuymh/eVVBH0Vq8z5uqOaPxzzYDLizKqX3qLGCfXxng=",
-   "pom": "sha256-Qhp95L/rnFs4sfxHxCagh9kIeJVdQQf1t6gusde3R7Y="
+  "org/bouncycastle#bcutil-jdk18on/1.84": {
+   "jar": "sha256-s3ThaWNCH7nPsBzCDXrY/S+LgYjj7vDsColl4kX3YZo=",
+   "pom": "sha256-Cwy4GmXuFzfVEoY1Cp5WSJM2uPmQgZj+vQSUJD7qKXg="
   },
   "org/checkerframework#checker-compat-qual/2.5.2": {
    "pom": "sha256-da9ztewybj29yUayH9RoAtXafGEsO/Hlh1N0yY1+pP0="
@@ -655,11 +699,6 @@
    "module": "sha256-clinadyqJrmBVNIp2FzHLls2ZrC8tjfS2vFuxJiVZjg=",
    "pom": "sha256-AjkvvUziGQH5RWFUcrHU1NNZGzqr3wExBfXJLsMstPA="
   },
-  "org/checkerframework#checker-qual/3.52.0": {
-   "jar": "sha256-C1uxpL3E5LEhdIL+WY78qrTh+6ezf5QSY5F4/IEW/AU=",
-   "module": "sha256-jf8ytk0eoRGkV9QR4CxKvHJGH9q6rIzll2bb1+fSpsg=",
-   "pom": "sha256-CWX2sKmMP6+NvCpu9x2GAWyeJKGQVwp3Gb2kq2CHkmU="
-  },
   "org/codehaus#codehaus-parent/3": {
    "pom": "sha256-UOslOs0LbuBI9DLZ/Do7NiZO+z2h/6f7B/bE1LeoyjE="
   },
@@ -723,28 +762,28 @@
    "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=",
    "pom": "sha256-s2E3N2xLP8923DN+KhvFtpGirBqpZqtdJiCak4EvpX0="
   },
-  "org/jacoco#org.jacoco.agent/0.8.11": {
-   "jar": "sha256-0+2F3qeKntVYRqdzjjoMoVxwLGYe5LyMv+Aqi59KmcA=",
-   "pom": "sha256-FuBen0liG4fFPmk1AUDzxG1C2WbGepM730sGOiscj8U="
+  "org/jacoco#org.jacoco.agent/0.8.14": {
+   "jar": "sha256-IL6YUzhb38ZaWSlkNBLQkkPRRRQwS4m6I6JlFYzIeSs=",
+   "pom": "sha256-lD537VzLma7rP+VkP+paY29vgo45WPhgX0Jt3Jr6uMk="
   },
-  "org/jacoco#org.jacoco.ant/0.8.11": {
-   "jar": "sha256-gdfriJDZvjCpOWEsKVYDVBBjUpzdA6UyZaunRHS3C3w=",
-   "pom": "sha256-ftED2VnQzue6v7Ewf6bkUbFpb/01JwYVU7VQ3lUgHYU="
+  "org/jacoco#org.jacoco.ant/0.8.14": {
+   "jar": "sha256-n/9olU1d46rSv4OOr4hu1n0sIqLWxvCVVIut6MRcrq4=",
+   "pom": "sha256-L8jktUIWP+7zRetZ6Ji8697hb2XfQDAwMtkgYkJ7FaU="
   },
-  "org/jacoco#org.jacoco.build/0.8.11": {
-   "pom": "sha256-W4SxXPLu8+WeuRvCJ4SDMQCwnfmRHjMZAww7xki9iws="
+  "org/jacoco#org.jacoco.build/0.8.14": {
+   "pom": "sha256-h9BZs1hJ35d3kUj9flL2Px/NA6Tn5kwqYabJzOYajec="
   },
-  "org/jacoco#org.jacoco.core/0.8.11": {
-   "jar": "sha256-/NGIxohHP8jcwMbKrzVeeziVAiQ1J8M7lZej7Ch5H0c=",
-   "pom": "sha256-u2E18Qo2NJy4SlYA/Yz3P8EpahNbLxStzYPejPJMq7E="
+  "org/jacoco#org.jacoco.core/0.8.14": {
+   "jar": "sha256-KKu/DupaCOTyQJfy+6xmPKF8NBwlw6BNkNbNMllDyZU=",
+   "pom": "sha256-e3W64sF3mvVENpgzr+HWj1o5VekdFmyxnf+IZTSxrWw="
   },
-  "org/jacoco#org.jacoco.report/0.8.11": {
-   "jar": "sha256-g5MpWuJGgO0QytgzOQcED5KLhxMySRWBylvHhOLLT74=",
-   "pom": "sha256-jjtzR3nV4/1oPsAVQT1S+WGYTFDLkEX9orI7/160I4E="
+  "org/jacoco#org.jacoco.report/0.8.14": {
+   "jar": "sha256-o+ICYGCri41cZQcGQGI0u0wDPf1Tdq/rixZm6O0nxFM=",
+   "pom": "sha256-4uvyxYD4avp/dfQ6KBCd2JTEJGOSi8mRF3fjUnUQjlg="
   },
-  "org/jdom#jdom-legacy/1.1.3": {
-   "jar": "sha256-Ar1hpyXor5sBdrQ78pgW0MdIuKuVE4W9EnvjdIkyWgo=",
-   "pom": "sha256-bWWTi3CxFyMBy0LY5l7gVzpXHtOfOvEBOp5ukp/flow="
+  "org/jdom#jdom2/2.0.6.1": {
+   "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=",
+   "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M="
   },
   "org/jgrapht#jgrapht-core/1.5.1": {
    "jar": "sha256-pNgQy2Pgp3p1PRRwlP6p3ULoLPxXqiifn4UinyYEO7Q=",
@@ -851,40 +890,40 @@
    "jar": "sha256-hbKTcYhLoxu3bt8iMjwsJOFywyZ6ZxUuuj0czC4EHvI=",
    "pom": "sha256-JcI3nyv8Kh5k5iw54rk8+w5IlweFKwjW/EcLHGpSue4="
   },
-  "org/ow2/asm#asm-bom/9.6": {
-   "pom": "sha256-ig5fYk/ikwt6jWmVb0OORe9TKZa01kQJthbErvSxrE4="
-  },
-  "org/ow2/asm#asm-commons/9.6": {
-   "jar": "sha256-eu/Q1cCQFwHGn3UT/tp2X7a+M68s56oXxXgfyHZXxRE=",
-   "pom": "sha256-qYrkiVM0uvj/hr1mUWIQ29mgPxpuFeR92oKvz2tT13w="
+  "org/ow2/asm#asm-bom/9.9": {
+   "pom": "sha256-D6JzNvp7YpI8qb3GlSbr5xKjv7H37ov3bEoLP4XxnWI="
   },
   "org/ow2/asm#asm-commons/9.7.1": {
    "jar": "sha256-mlebVNKSrZvhcdQxP9RznGNVksK1rDpFm70QSc3exqA=",
    "pom": "sha256-C/HTHaDJ+djtwvJ9u/279z8acVtyzS+ijz8ZWZTXStE="
   },
-  "org/ow2/asm#asm-tree/9.6": {
-   "jar": "sha256-xD7PF7U5x3fhXae1uGVTs3fi05poPeYoVWfVKDiI5+8=",
-   "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM="
+  "org/ow2/asm#asm-commons/9.9": {
+   "jar": "sha256-2y9vJhULvnwSZga0oRUYNrzCKh4FpCOzWFaYvs6ZX/g=",
+   "pom": "sha256-GKXT7xN351RLPKMhDyYTlrmH9gEO9ZHThyra5jEZ7kM="
   },
   "org/ow2/asm#asm-tree/9.7.1": {
    "jar": "sha256-mSmIH1nra4QOhtVFcMd7Wc5yHRBObf16QJeJkcLTtB8=",
    "pom": "sha256-E7kF9l5/1DynZ09Azao3Z5ukhYxsnZ+48Xp6/ZuqvJ4="
   },
+  "org/ow2/asm#asm-tree/9.9": {
+   "jar": "sha256-QhePN3XJxj+eXhRGdH0ptOyk2RvW515cQ8+jcqR9OMY=",
+   "pom": "sha256-0BeI7Y5ujiSsr2y0p73MJzNBYlL6oAIylZ4+Lp3xv0Q="
+  },
   "org/ow2/asm#asm-util/9.7.1": {
    "jar": "sha256-+IW+cbXJBVb18a0cT5J2spuWBXxJfUZmb+TdvsPLQ8Y=",
    "pom": "sha256-f7XmM2Ky1S133KO3VK661jV1HT/FIBkelQDs6eI0W3E="
   },
-  "org/ow2/asm#asm/9.6": {
-   "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=",
-   "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A="
-  },
   "org/ow2/asm#asm/9.7.1": {
    "jar": "sha256-jK3UOsXrbQneBfrsyji5F6BAu5E5x+3rTMgcdAtxMoE=",
    "pom": "sha256-cimwOzCnPukQCActnkVppR2FR/roxQ9SeEGu9MGwuqg="
   },
-  "org/postgresql#postgresql/42.7.9": {
-   "jar": "sha256-iPH8OZLoDsOwSPeYAw6aAUqkeDxAr7VtPnqH7grfFm8=",
-   "pom": "sha256-UYbVaAzMRJZ49CxRC6Le7caVimN9rU8CyA/c6VpCKKY="
+  "org/ow2/asm#asm/9.9": {
+   "jar": "sha256-A9madK0e5ccTNO9nQ39O9P40iMqnyW2GRavHPI4gF9Q=",
+   "pom": "sha256-z4Ye8edF1XFUr3muFN80DtU0Hl3NAVfO/NLrfxqgXFc="
+  },
+  "org/postgresql#postgresql/42.7.11": {
+   "jar": "sha256-GYGzHTmTxYcCeDwc3fEKNOSMH0E9cP8ctt7woUNIRkc=",
+   "pom": "sha256-RDynyNg1qdOWYwhwZmhFpwx6io1Or1xS4hB2/KjYNZ4="
   },
   "org/python#jython-standalone/2.7.4": {
    "jar": "sha256-H7oXae/8yLGfXhBDa8gnShWM6YhVnyV5J8JMc7sTfzw=",

From ec981cc156e7ae43109bf3bfe5b3cf725c316430 Mon Sep 17 00:00:00 2001
From: Trent Baldwin <trent.baldwin@proton.me>
Date: Thu, 21 May 2026 00:27:39 -0400
Subject: [PATCH 02/58] ghidra-bin: 12.0.4 -> 12.1

---
 pkgs/tools/security/ghidra/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix
index 3902de8c3c67..ddef181fd7ef 100644
--- a/pkgs/tools/security/ghidra/default.nix
+++ b/pkgs/tools/security/ghidra/default.nix
@@ -28,11 +28,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "ghidra";
-  version = "12.0.4";
-  versiondate = "20260303";
+  version = "12.1";
+  versiondate = "20260513";
   src = fetchzip {
     url = "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${version}_build/ghidra_${version}_PUBLIC_${versiondate}.zip";
-    hash = "sha256-O+Y1k1fRVTZVJMBA62gyqWw0KZOwrBqqRC3dlhQHbhY=";
+    hash = "sha256-LmesjJ+IcmhFHqLOfTkUP0BGFHaQAlpxU/CcLAD5vDU=";
   };
 
   nativeBuildInputs = [
@@ -87,6 +87,7 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [
       ck3d
       govanify
+      tbaldwin
       mic92
     ];
   };

From 26f07a99c48d721d44678ef964579b72ab31ece9 Mon Sep 17 00:00:00 2001
From: Shogo Takata <shogo-takata@st.go.tuat.ac.jp>
Date: Mon, 8 Jun 2026 17:56:02 +0900
Subject: [PATCH 03/58] gitify: 6.17.0 -> 6.20.0

This PR updates gitify and the following:
- Migrates electron-builder config path from config/ to root.
- Patch isDevMode() to false: it was causing the app to render a blank
window.
- Disable auto updater.
- Enables strictDeps and structuredAttrs.

Assisted-by: opencode with DeepSeek V4 Flash Free
---
 pkgs/by-name/gi/gitify/package.nix | 34 +++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix
index a29faeeb9c2f..b78302dcb6d7 100644
--- a/pkgs/by-name/gi/gitify/package.nix
+++ b/pkgs/by-name/gi/gitify/package.nix
@@ -13,39 +13,57 @@
   makeWrapper,
   nix-update-script,
 }:
+let
+  pnpm = pnpm_10_29_2;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gitify";
-  version = "6.17.0";
+  version = "6.20.0";
 
   src = fetchFromGitHub {
     owner = "gitify-app";
     repo = "gitify";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-A9LeitceqDGictQbB7OYOI/pggrW9u8A7TUMblK/LHM=";
+    hash = "sha256-zKvI9uwKiKKbHTzM/LIhCzUCcM104UNReRJb51iQonc=";
   };
 
   nativeBuildInputs = [
     nodejs
     pnpmConfigHook
-    pnpm_10_29_2
+    pnpm
     copyDesktopItems
     imagemagick
     makeWrapper
   ];
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
-    pnpm = pnpm_10_29_2;
-    fetcherVersion = 3;
-    hash = "sha256-0iTvrIe5PVj99ePWt8rn+laikdJ5TaNQ8GZGHyUTTQI=";
+    inherit pnpm;
+    fetcherVersion = 4;
+    hash = "sha256-KjRcUVeByCXetX7skJoxt6LU6EZcOG+5U2y3sr3XP7A=";
   };
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
 
   postPatch = ''
-    substituteInPlace config/electron-builder.js \
+    substituteInPlace electron-builder.js \
       --replace-fail "'Adam Setch (5KD23H9729)'" "null" \
       --replace-fail "'scripts/afterSign.js'" "null"
+
+    # With a nixpkgs electron wrapper, app.isPackaged always returns false,
+    # so isDevMode() is always true. This causes the config.ts getter for
+    # indexHtml to return VITE_DEV_SERVER_URL (which is empty) instead of the
+    # packaged file:// URL, resulting in a blank white window.
+    # Patch isDevMode() to false so the file:// path is always used.
+    substituteInPlace src/main/config.ts \
+      --replace-fail "isDevMode()" "false"
+
+    # Disable auto-updater; updates are handled via nixpkgs.
+    substituteInPlace src/main/updater.ts \
+      --replace-fail "if (!this.menubar.app.isPackaged)" "if (true)"
   '';
 
   buildPhase = ''
@@ -57,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     pnpm build
     pnpm exec electron-builder \
-        --config config/electron-builder.js \
+        --config electron-builder.js \
         --dir \
         -c.electronDist=electron-dist \
         -c.electronVersion="${electron.version}" \

From 988d9da4bd222188d4cc593e5036b8a42d2aa54b Mon Sep 17 00:00:00 2001
From: Trent Baldwin <trent.baldwin@proton.me>
Date: Wed, 10 Jun 2026 23:51:00 -0400
Subject: [PATCH 04/58] ghidra-bin: 12.1 -> 12.1.2

---
 pkgs/tools/security/ghidra/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix
index ddef181fd7ef..3a403dd48358 100644
--- a/pkgs/tools/security/ghidra/default.nix
+++ b/pkgs/tools/security/ghidra/default.nix
@@ -28,11 +28,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "ghidra";
-  version = "12.1";
-  versiondate = "20260513";
+  version = "12.1.2";
+  versiondate = "20260605";
   src = fetchzip {
     url = "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${version}_build/ghidra_${version}_PUBLIC_${versiondate}.zip";
-    hash = "sha256-LmesjJ+IcmhFHqLOfTkUP0BGFHaQAlpxU/CcLAD5vDU=";
+    hash = "sha256-ulIBecjWAnrM8iJmqQZAZRerUCKpIBcXyv6KIB7I/ZA=";
   };
 
   nativeBuildInputs = [

From 4c193ae1e6b84b743a43b688d26f8bf9e9f92ec1 Mon Sep 17 00:00:00 2001
From: Trent Baldwin <trent.baldwin@proton.me>
Date: Wed, 10 Jun 2026 23:51:18 -0400
Subject: [PATCH 05/58] ghidra: 12.1 -> 12.1.2

---
 pkgs/tools/security/ghidra/build.nix |   4 +-
 pkgs/tools/security/ghidra/deps.json | 205 +++++++++++++++------------
 2 files changed, 117 insertions(+), 92 deletions(-)

diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix
index 6a402b3a110f..15bdcea84f1b 100644
--- a/pkgs/tools/security/ghidra/build.nix
+++ b/pkgs/tools/security/ghidra/build.nix
@@ -20,7 +20,7 @@
 let
   pkg_path = "$out/lib/ghidra";
   pname = "ghidra";
-  version = "12.1";
+  version = "12.1.2";
 
   isMacArm64 = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
 
@@ -30,7 +30,7 @@ let
     owner = "NationalSecurityAgency";
     repo = "Ghidra";
     rev = "Ghidra_${version}_build";
-    hash = "sha256-eAzmIqSE8cSGiEXYw9VPQ5iRGHZ0qfdwVnizVqoGa+Y=";
+    hash = "sha256-7/5TR273Sqqr03lE7qpOJUnwTzdr3BzKk+6GhhdOfo8=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
diff --git a/pkgs/tools/security/ghidra/deps.json b/pkgs/tools/security/ghidra/deps.json
index 50ed94b356be..4d56666f204e 100644
--- a/pkgs/tools/security/ghidra/deps.json
+++ b/pkgs/tools/security/ghidra/deps.json
@@ -143,40 +143,40 @@
   }
  },
  "https://github.com": {
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/Debugger/dbgmodel": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/Debugger/dbgmodel": {
    "tlb": "sha256-jPXzouuBFgqjSQVqXKTCxyaxtumL8wl81BNRRxYzQ8c="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vs2012_x64": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vs2012_x64": {
    "fidb": "sha256-1OmKs/eQuDF5MhhDC7oNiySl+/TaZbDB/6jLDPvrDNw="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vs2012_x86": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vs2012_x86": {
    "fidb": "sha256-pJDtfi7SHlh0Wf6urOcDa37eTOhOcuEN/YxXQ0ppGLY="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vs2015_x64": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vs2015_x64": {
    "fidb": "sha256-4E6eQPnstgHIX02E7Zv2a0U2O+HR6CwWLkyZArjLUI8="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vs2015_x86": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vs2015_x86": {
    "fidb": "sha256-tm7mlmU+LtNlkZ3qrviFEDEgx5LiLnmvcNEgnX4dhkQ="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vs2017_x64": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vs2017_x64": {
    "fidb": "sha256-1fpfaXKYF0+lPSR9NZnmoSiEYFrRgce5VOI4DsHwvYk="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vs2017_x86": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vs2017_x86": {
    "fidb": "sha256-04nLjXb/SlnKNfiRuFIccq1fDfluJTlzotIahhSkzIE="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vs2019_x64": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vs2019_x64": {
    "fidb": "sha256-FQAHeW/DakBpZgrWJEmq2q890Rs4ZKXvIeeYMcnOkRg="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vs2019_x86": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vs2019_x86": {
    "fidb": "sha256-62MKNvqlhqNx63NNwLvY0TzK72l/PbWHJZY1jz3SQyo="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vsOlder_x64": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vsOlder_x64": {
    "fidb": "sha256-jDtR9GYM0n4aDWEKnz8tX7yDOmasnuQ5PuLySB6FWGY="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/FunctionID/vsOlder_x86": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/FunctionID/vsOlder_x86": {
    "fidb": "sha256-mGBca2uSFKlF2ETkHIWGDVRkmkW8p4c+9pkcDpNyB4c="
   },
-  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1/lib/java-sarif-2.1-modified": {
+  "NationalSecurityAgency/ghidra-data/raw/Ghidra_12.1.2/lib/java-sarif-2.1-modified": {
    "jar": "sha256-f3NlZklHVtJxql5LGvbIncUNB0qxxjdKR9+CImQiawE="
   },
   "Z3Prover/z3/releases/download/z3-4.13.0/z3-4.13.0-arm64-osx-11.0": {
@@ -325,8 +325,11 @@
    "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=",
    "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg="
   },
-  "com/google/protobuf#protobuf-bom/3.17.3": {
-   "pom": "sha256-bf431vImF9VqQUzNrf+NmFhaH3kXEr6HbCYWZxDR2N0="
+  "com/google/protobuf#protobuf-bom/3.25.5": {
+   "pom": "sha256-CA4phBcyOLUOBkwiav/7sbAjNSApXHkKf9PWrkWT8GM="
+  },
+  "com/google/protobuf#protobuf-bom/3.25.6": {
+   "pom": "sha256-wzlwNU3UMImhrKSurFD8j/nTbM7iJfUhJXpC7tACSKY="
   },
   "com/google/protobuf#protobuf-bom/4.31.0": {
    "pom": "sha256-Y9iGmhie8C2+3XxnN+FsGYa0aYOufQyNG+8s92sz2Ac="
@@ -335,16 +338,22 @@
    "jar": "sha256-RP2JrzepsvHdQcCUqbtzPAe/f8eg4jhooQuvbjUfpeA=",
    "pom": "sha256-Gwqekab09LYqWmB4wibudwqo3FdnueRzwvwY8KOImAQ="
   },
-  "com/google/protobuf#protobuf-java/3.17.3": {
-   "jar": "sha256-SsVJsZJpQUGVgEnwYKHIJqMzQvYZ4QjO2MF9mHf14+0=",
-   "pom": "sha256-Km8izVJli4uxTBANs+F5NT+MNR0ENzo79voKOzlGStw="
+  "com/google/protobuf#protobuf-java/3.25.5": {
+   "pom": "sha256-51IDIVeno5vpvjeGaEB1RSpGzVhrKGWr0z5wdWikyK8="
+  },
+  "com/google/protobuf#protobuf-java/3.25.6": {
+   "jar": "sha256-VJQ5F6859YMDyrfQX2zfYNk3yDBPSVYLWWvBSR7IPos=",
+   "pom": "sha256-soXBHKdm81Mi3VYI+nNuYaaFr5L4NWpMdVH5ySXYYY8="
   },
   "com/google/protobuf#protobuf-java/4.31.0": {
    "jar": "sha256-aHc9zNbMWDWvenSHWc7PXqIP8IMTbjhH++lFcrjg7Wo=",
    "pom": "sha256-aElbKMVNzVwyTQxRb7igjQoaJWvNrIFIN+ciYfEqCdM="
   },
-  "com/google/protobuf#protobuf-parent/3.17.3": {
-   "pom": "sha256-T09Q5moqvM/o7SCbU/q3C4k+NfQ77FqB98GESbY+hrE="
+  "com/google/protobuf#protobuf-parent/3.25.5": {
+   "pom": "sha256-ZMwOOtboX1rsj53Pk0HRN56VJTZP9T4j4W2NWCRnPvc="
+  },
+  "com/google/protobuf#protobuf-parent/3.25.6": {
+   "pom": "sha256-AmCbfzuiZaQxcmjS6RfY03eOtrVE50GpugKp9JFm12E="
   },
   "com/google/protobuf#protobuf-parent/4.31.0": {
    "pom": "sha256-H1mhQuar05Jar9Fo25tU0QhP7MhPW4DU3jVPrJ4I/Lg="
@@ -353,20 +362,20 @@
    "jar": "sha256-l4q4YwGNP5ZeOIgFccNik+qLEKgIYZQVnE1dILUPClc=",
    "pom": "sha256-tbp8XBcINbyupnWMWfo8EOvNepx5LiWzm4a559X72Mo="
   },
-  "com/opencsv#opencsv/5.4": {
-   "jar": "sha256-n94e8+VEQE406u4V5L97p0uANV15gJOwUk1jpZk2JCs=",
-   "pom": "sha256-uGQpmn0KIQIKgxaZQ499P4VAirJKNOkR+qmf9oTrdv0="
+  "com/opencsv#opencsv/5.9": {
+   "jar": "sha256-ICOWm4bOlorYrlSWSKxYfRQcGa5oSppcZ8kQXzerDRw=",
+   "pom": "sha256-l+UC78Xmwt0VZiGynKy8D0dEIowAmPaxafV/eukwMGA="
   },
-  "com/oracle/labs/olcut#olcut-config-protobuf/5.2.0": {
-   "jar": "sha256-xmqG5GT9gi9xzu6JuSU3l8Pc/fZWxNsr+W2kceuXs8o=",
-   "pom": "sha256-JCBA8xgQ+I6pnGF7RUBrhmdtOvJa7jzZIoysQpd0zmk="
+  "com/oracle/labs/olcut#olcut-config-protobuf/5.3.1": {
+   "jar": "sha256-FIGMw6lK51IUFNSEVmarghBEJ47sGZucjwi3EYt0WvU=",
+   "pom": "sha256-aS58zbcGib1KYiaS4x1IXsdlMXmYnoYNYoUs9gl/FC0="
   },
-  "com/oracle/labs/olcut#olcut-core/5.2.0": {
-   "jar": "sha256-5T6OCQrUJo0iqlPgaCu76rHIHiyoRBP6Q2AqQWP2vhk=",
-   "pom": "sha256-G912ta/r+7rg+FHQjJ46WmgwP40cMHY4rxuChHVvCgM="
+  "com/oracle/labs/olcut#olcut-core/5.3.1": {
+   "jar": "sha256-QK2b7QJ9ZVh3aJPCoFkTTuf3RNOM3qZ49ZMSQXZOv4c=",
+   "pom": "sha256-KRNCc4ZA0LpfqQ6BoDfRl06uEx1g0hg3xD/F/YkYnE0="
   },
-  "com/oracle/labs/olcut#olcut/5.2.0": {
-   "pom": "sha256-SRIriefVQhUkr5IsQrsnF0x7vhL2oKKWwiEJgIUW/B4="
+  "com/oracle/labs/olcut#olcut/5.3.1": {
+   "pom": "sha256-FozfcdoCOr6j5szCfuIaY4wzGJs1yTvYllDpSm1goao="
   },
   "commons-beanutils#commons-beanutils/1.9.4": {
    "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=",
@@ -557,6 +566,9 @@
   "org/apache#apache/27": {
    "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk="
   },
+  "org/apache#apache/30": {
+   "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg="
+  },
   "org/apache#apache/33": {
    "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU="
   },
@@ -582,8 +594,8 @@
    "jar": "sha256-iHcgkSxcu83/bg4h1QNJN1Vfj/xZc4Hv+Pp38zzm1k4=",
    "pom": "sha256-XtPwH1ee+0xru81m9VnpwV6ZwUCVeeAZG7pUHF/meYY="
   },
-  "org/apache/commons#commons-lang3/3.11": {
-   "pom": "sha256-mA1mXYP+0EZlE08FeOUHRCoOdQaRBzeEORsKeYhySnU="
+  "org/apache/commons#commons-lang3/3.12.0": {
+   "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo="
   },
   "org/apache/commons#commons-lang3/3.20.0": {
    "jar": "sha256-aeXJ+jXaelGl/SCZ3+VqLY0yzyM+L213DnlhRkQCY/Q=",
@@ -610,15 +622,15 @@
   "org/apache/commons#commons-parent/48": {
    "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ="
   },
-  "org/apache/commons#commons-parent/51": {
-   "pom": "sha256-m3edGLItjeVZYFVY57sKCjGz8Awqu5yHgRfDmKrKvso="
-  },
   "org/apache/commons#commons-parent/52": {
    "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
   },
   "org/apache/commons#commons-parent/54": {
    "pom": "sha256-AA2Bh5UrIjcC/eKW33mVY/Nd6CznKttOe/FXNCN4++M="
   },
+  "org/apache/commons#commons-parent/64": {
+   "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds="
+  },
   "org/apache/commons#commons-parent/72": {
    "pom": "sha256-Q0Xev8dnsa6saKvdcvxn0YtSHUs5A3KhG2P/DFhrIyA="
   },
@@ -642,12 +654,13 @@
    "jar": "sha256-dwzZA/p7YE0ffve6F/hBCGZylLK0eL6O0a87/7SuABg=",
    "pom": "sha256-OI3VI0i6GEKqOK64l8kdJwsUZh64daIP2YAxU1qydWc="
   },
+  "org/apache/commons#commons-text/1.11.0": {
+   "jar": "sha256-Ks8woHCxkWPVpIDq5BGigTQehwAg41NMbV1MhHJznjA=",
+   "pom": "sha256-O0AZecBkEoXYUM8Ri04Y8EmsIj3Hherk0LNXKPxTTRE="
+  },
   "org/apache/commons#commons-text/1.8": {
    "pom": "sha256-9s/bqlnHCtfj/r5xTgkRmQFWrAkFKV2PKjt1HgXlmhI="
   },
-  "org/apache/commons#commons-text/1.9": {
-   "pom": "sha256-n5IWz8lE3KeC5jEdYnV/13Fk/mfaKbWPAVaH+gn0QFA="
-  },
   "org/apache/felix#felix-parent/6": {
    "pom": "sha256-Ngi2sgD2yPSIx3zBWYR9UV5pZugzO4XY4E45Sgk7VZU="
   },
@@ -747,9 +760,9 @@
   "org/fusesource#fusesource-pom/1.12": {
    "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE="
   },
-  "org/fusesource/jansi#jansi/2.3.2": {
-   "jar": "sha256-+dWXnFx7oxN8d/QYR16wIYn4/Ip1+nP/w/8dEv6UVWc=",
-   "pom": "sha256-ywU3vsxjUsFUcz22+v0JAPlYRgOgsLnPjyJFVjEs2+E="
+  "org/fusesource/jansi#jansi/2.4.1": {
+   "jar": "sha256-Ll53Wp3Fj/prvWqm8JnWL4ti3N60w8O7vlzyMBvC3ME=",
+   "pom": "sha256-P5jZeaTTVZ+HefuwBLNK51Fq+t9RDhHffMPNBz6xuzs="
   },
   "org/hamcrest#hamcrest-core/1.3": {
    "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
@@ -800,34 +813,42 @@
    "jar": "sha256-Y0FCkMNJf4rA8QIgkgcIjexG/UdH4PVqJsaTCOhcZBU=",
    "pom": "sha256-SH2xJbFxCY4/qDOFNaxZR2kirCxFK1ehTTz2YfIohDA="
   },
-  "org/jline#jline-builtins/3.20.0": {
-   "jar": "sha256-prFPiYOXb7Sd67PZ6KFb+V9yTXFp8TFaYu+lin+omeI=",
-   "pom": "sha256-9T2EkbSNrQfnIR8M5BIhS5un25YmYZAxsqhvgMgrZrE="
+  "org/jline#jline-builtins/3.27.1": {
+   "jar": "sha256-LVpkkgHcgCr+XrYGwYMNe/6lULQmbbk2cqTXtUyNjYc=",
+   "pom": "sha256-d3HzvwShWSuwQg0igPp3GMVyWRvUzus89EPLg8aBcq4="
   },
-  "org/jline#jline-parent/3.20.0": {
-   "pom": "sha256-cXjGACAsS8Jux6S2IlXu829wVsrSpeYjnFdL7qXCEMo="
+  "org/jline#jline-native/3.27.1": {
+   "jar": "sha256-Y2ZG2kBBPnSWOz9LQMnF3PtC89Ds8bk9bd9ciV7/5CI=",
+   "pom": "sha256-n/4orsyfVG7JaV8tUh9nRZtLNpFxSMCNFvRVazg9Mo8="
   },
-  "org/jline#jline-reader/3.20.0": {
-   "jar": "sha256-rNHJTR4iiqe3li9psh7Tqf2CjrOmPkuvkIaVTmJq8fA=",
-   "pom": "sha256-2fF+3XIcAqExcgN21sB4eHgutrb6/rX/QkBKtXFD4TY="
+  "org/jline#jline-parent/3.27.1": {
+   "pom": "sha256-6WT9B2wgziTdtI3XN6CNYFA0cAXj5u7IL/XrBD1WFYE="
   },
-  "org/jline#jline-style/3.20.0": {
-   "jar": "sha256-C7ERYF4BAM6E05YfMLQNqgiOnC7FxnHn75D0L2rdBrY=",
-   "pom": "sha256-48nFXt7Ob0ru5jplYjiaS++NA1j6iq3GdKPeZR4w4ao="
+  "org/jline#jline-reader/3.27.1": {
+   "jar": "sha256-/t2xgKq9Bb+gTgEzefaTjPj5+vHlo0KZF2K4/NMzRXg=",
+   "pom": "sha256-GuNUfW3zBFrpM5y9olcYaCY74bc8dnPRcFelBcrPHwg="
   },
-  "org/jline#jline-terminal-jansi/3.20.0": {
-   "jar": "sha256-wX/++o8GDa79OPJXRAcOQI9LrFPD6BOuoZKMxgcmD+Q=",
-   "pom": "sha256-Q3JhhBr0j5oZT9WygHJSCKds+jzKFgBAx6QoDrAn2+s="
+  "org/jline#jline-style/3.27.1": {
+   "jar": "sha256-P7GYcbJZhNaYMHQgXHpKE5v6wuYJm3sa6KSJWLKCMTo=",
+   "pom": "sha256-L9kzNG0hqyqy0EujYO0z8bODID00dMsk00pkl9Z0ExE="
   },
-  "org/jline#jline-terminal/3.20.0": {
-   "jar": "sha256-EhJRcOeVUZum3IAQwHC1PHaq6StIXB43Uw5Uq13QjUM=",
-   "pom": "sha256-EMo7z1F48YUH8hCmOtljeJaFM0OtHBKRoBmhFvIWpUg="
+  "org/jline#jline-terminal-jansi/3.27.1": {
+   "jar": "sha256-mWvM6OpUHXH3Du3/+dEHpIJ39lVzReIdHzDGDmZIRnQ=",
+   "pom": "sha256-XWrgbTzxQG2C+kk2K8yZxImpu4l3c9baUiJnTT+K/+g="
+  },
+  "org/jline#jline-terminal/3.27.1": {
+   "jar": "sha256-Qre3VlBrypi1BZOEJqNcmQgveBnDM+0lvUEUv7DjtfI=",
+   "pom": "sha256-hHjnmqIupq95eWRD+O0w//pdxkfrPS0YYLrC4j800pc="
   },
   "org/jspecify#jspecify/1.0.0": {
    "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=",
    "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=",
    "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y="
   },
+  "org/junit#junit-bom/5.10.0": {
+   "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=",
+   "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM="
+  },
   "org/junit#junit-bom/5.11.0-M2": {
    "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=",
    "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg="
@@ -844,6 +865,10 @@
    "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=",
    "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI="
   },
+  "org/junit#junit-bom/5.7.1": {
+   "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=",
+   "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q="
+  },
   "org/junit#junit-bom/5.8.0-M1": {
    "module": "sha256-vgUUcTA6UD9MIkZwdbJ0kEE3fd1tWoywc53tZ9kW2C0=",
    "pom": "sha256-dxREMv/Gi9mKeQqxBpYZ2RAyz8Dk4TwIFjqgPaNv1uI="
@@ -965,49 +990,49 @@
    "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=",
    "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs="
   },
-  "org/tribuo#tribuo-classification-core/4.2.0": {
-   "jar": "sha256-+vv5OnIrmrVC7oeaX09lF5bkyuobZ5gNVWL+jdjbqeY=",
-   "pom": "sha256-gLgGCPTPN93HLmioPGBRyupwvqF+96hTCfWeqdpzBPE="
+  "org/tribuo#tribuo-classification-core/4.3.2": {
+   "jar": "sha256-Q+Vbd5dcXvpZEWciDmjkTeBAWLozDHzAou7YgTQTKbU=",
+   "pom": "sha256-Ij7qSAJBk5pmbuWMpA613pWSylfqAj0q+Nqnx02Gnw4="
   },
-  "org/tribuo#tribuo-classification-tree/4.2.0": {
-   "jar": "sha256-uVozLZJI7RKVgxdkTNQ9cubdit4KJPnKTlLaB72sY6c=",
-   "pom": "sha256-OrTlGe48n3lzd3MirS7EaR5j1kovRxiR4A1BGQdY2jw="
+  "org/tribuo#tribuo-classification-tree/4.3.2": {
+   "jar": "sha256-JEWJvgNo7tIMqL30INP+oGBmVjDCBNUKd0zc5rZWYbc=",
+   "pom": "sha256-4CQVLNADQa1e7hqplRUBU07Eypn3js0pFUxm5DeQH+E="
   },
-  "org/tribuo#tribuo-classification/4.2.0": {
-   "pom": "sha256-SqINxWFbgU86wjq3xB+s+LpCKbPuzSwa/KeL3/kntcU="
+  "org/tribuo#tribuo-classification/4.3.2": {
+   "pom": "sha256-7iJn9Bjqdyw53PqWq8vRFhypLig7tTcl7/4D10oRxN8="
   },
-  "org/tribuo#tribuo-common-tree/4.2.0": {
-   "jar": "sha256-34iqIWT+X60ITLIxl7LgodbBPk7QbuXCGXausNuVfOk=",
-   "pom": "sha256-DbCNldwWEPdn/AehmZqXlhVxALozjH4JA2jMVN5NIHU="
+  "org/tribuo#tribuo-common-tree/4.3.2": {
+   "jar": "sha256-gq3JMkn++IZ1vWmEZahNXN4NIIy53juZRK/tYjGsE9U=",
+   "pom": "sha256-q7JajDLUkTrYKjMO8oObUOyXDSx8k2d4cLkviUnVvHs="
   },
-  "org/tribuo#tribuo-common/4.2.0": {
-   "pom": "sha256-GAZzLdQd51aq3tY2v7qZSD00J72diyAvEEJcr84iykk="
+  "org/tribuo#tribuo-common/4.3.2": {
+   "pom": "sha256-hiltnKeKpv52QCc2IN3rF9+m0FRS+q+jeRa8KaQg78w="
   },
-  "org/tribuo#tribuo-core/4.2.0": {
-   "jar": "sha256-NFwzfcKHjsdQJJgqqwZycZtznnGOc9eisu/ottXQCb8=",
-   "pom": "sha256-XkjLxuPn9x+wYPSWdPTXbCLcKEe9flflVCY7+5gYpZ0="
+  "org/tribuo#tribuo-core/4.3.2": {
+   "jar": "sha256-+O9DqjbzespMNGzR5i4p5J6cE4YLTlbJzQXio1/YXzQ=",
+   "pom": "sha256-aydJMUgOYOMr/rtPdzI8u/f19cAioZYBadX7slj5oH0="
   },
-  "org/tribuo#tribuo-data/4.2.0": {
-   "jar": "sha256-m8EQCFnODOBCDNbfbOdna25DxSKEXUKGz5FIUmgtYz0=",
-   "pom": "sha256-SMm4+bX7Nd5toLwWhuMLStMkS6UWMCNw1fqGd1ixruA="
+  "org/tribuo#tribuo-data/4.3.2": {
+   "jar": "sha256-JVpXdz9erThtkSVoERbm1NH3/AgzjhQebXdGphOQsBM=",
+   "pom": "sha256-vE1xWTQfLGsxGllRvPELe06GcEWCs06N3eOV0c+l3iI="
   },
-  "org/tribuo#tribuo-math/4.2.0": {
-   "jar": "sha256-7NZdhI/2SIAXBLm6D3CmRtQDAgy97SYf1zVIGkeWVRI=",
-   "pom": "sha256-iCAlohj3F9hakTNsztSg+08CsjFcppZy0oqCc3uWhVE="
+  "org/tribuo#tribuo-math/4.3.2": {
+   "jar": "sha256-afXYcsMsFWRJcFG7hZyIgVPKlhxvxFlVVVOgfVw423I=",
+   "pom": "sha256-O/PROvFihfwD+FPNH0jVR+7PZDvpSL2aDrAEB06d/OM="
   },
-  "org/tribuo#tribuo-util-onnx/4.2.0": {
-   "jar": "sha256-ohcAq4nLB1/OT8UkA1n5HMj4t/JCiS1lsD+oda0s3Vs=",
-   "pom": "sha256-Q19d8ELZieF6QHPjcFa++ChKUrw3zIZeF5Xvi7U5KUw="
+  "org/tribuo#tribuo-util-onnx/4.3.2": {
+   "jar": "sha256-hgk9baHLThi3IOw0XAdubvXZpSrRIIU2yE6w5w8HwU8=",
+   "pom": "sha256-JOYWUtcwPJb1d4cGb0nT6xf0+Swj5nRD+UN4pCTP+kw="
   },
-  "org/tribuo#tribuo-util-tokenization/4.2.0": {
-   "jar": "sha256-b0TzDZ0g6amwscMHAbcrPeXtofbXbZXanWkHQmVXdoI=",
-   "pom": "sha256-6GAT6tT7c0apQghWqMAX/g7aAlhmu0w935AK2JLi/Tg="
+  "org/tribuo#tribuo-util-tokenization/4.3.2": {
+   "jar": "sha256-/F1cZ9T6zvGbSNkjEU2WTg8vTV69nn0itSuhBMBItgo=",
+   "pom": "sha256-Os30qk9dYYOphA45ZuzcN1n1UDDWnboeVBwuPXlRnaQ="
   },
-  "org/tribuo#tribuo-util/4.2.0": {
-   "pom": "sha256-saxG0eBU4acgcz0cMeBMaIxxJb+mIN7RpEQ9BdNMma8="
+  "org/tribuo#tribuo-util/4.3.2": {
+   "pom": "sha256-OOmW/aFp4KTTqRC/gAOAEPPbp88xkCGcs4KWDFJ3If0="
   },
-  "org/tribuo#tribuo/4.2.0": {
-   "pom": "sha256-mMQFMwnY7vg2fAbCAmyDHkqwS3nOny0hrGrrKE2dNZQ="
+  "org/tribuo#tribuo/4.3.2": {
+   "pom": "sha256-mGb8n49lef22KoyhH7hb1pXJRCcu/+8ixeQlar8JB04="
   },
   "org/tukaani#xz/1.9": {
    "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=",

From e24cd3d2a17b950e4a686d0cbca4ea2c2151bf48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <git-207b3e3a@moritz.place>
Date: Sat, 13 Jun 2026 11:12:16 +0200
Subject: [PATCH 06/58] konsave: 2.2.0 -> 2.3.0

---
 pkgs/by-name/ko/konsave/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ko/konsave/package.nix b/pkgs/by-name/ko/konsave/package.nix
index bca1a13f07c6..feb4e7f9b7ba 100644
--- a/pkgs/by-name/ko/konsave/package.nix
+++ b/pkgs/by-name/ko/konsave/package.nix
@@ -6,13 +6,13 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "konsave";
-  version = "2.2.0";
+  version = "2.3.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) version;
-    pname = "Konsave";
-    hash = "sha256-tWarqT2jFgCuSsa2NwMHRaR3/wj0khiRHidvRNMwM8M=";
+    pname = "konsave";
+    hash = "sha256-Qe+RZIsgbqvFqWhUkfACbYvHtXQcp6yK+XrvqgXnlTc=";
   };
 
   build-system = with python3Packages; [

From c1e5d44b546dbc0cb71f1eb97cebbb6df0c5e0d8 Mon Sep 17 00:00:00 2001
From: Trent Baldwin <trent.baldwin@proton.me>
Date: Sat, 13 Jun 2026 16:35:50 -0400
Subject: [PATCH 07/58] ghidra-extensions.kaiju: 260309 -> 260608

---
 pkgs/tools/security/ghidra/extensions/kaiju/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix
index 33f00113c5f4..e38375a92083 100644
--- a/pkgs/tools/security/ghidra/extensions/kaiju/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/kaiju/default.nix
@@ -26,13 +26,13 @@ let
 
   self = buildGhidraExtension (finalAttrs: {
     pname = "kaiju";
-    version = "260309";
+    version = "260608";
 
     src = fetchFromGitHub {
       owner = "CERTCC";
       repo = "kaiju";
       rev = finalAttrs.version;
-      hash = "sha256-DjuZJ20w/hhBlHa5ZprS33s5iMtOWboTHdgfCJ62Ttg=";
+      hash = "sha256-T8Ta8lQob7w0iPsVbZix795AjVwdo2U8yuvgCUBi5fw=";
     };
 
     buildInputs = [

From 3c440eedc9f8055bd50117c55180a7b2381b5640 Mon Sep 17 00:00:00 2001
From: Thomas Heijligen <src@posteo.de>
Date: Sun, 14 Jun 2026 17:24:03 +0200
Subject: [PATCH 08/58] librepcb: 2.0.0 -> 2.1.1

Update package and fix compilation problems.
---
 pkgs/by-name/li/librepcb/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/li/librepcb/package.nix b/pkgs/by-name/li/librepcb/package.nix
index 7a371b701c5d..db4e40b178a7 100644
--- a/pkgs/by-name/li/librepcb/package.nix
+++ b/pkgs/by-name/li/librepcb/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "librepcb";
-  version = "2.0.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "librepcb";
     repo = "librepcb";
     rev = version;
-    hash = "sha256-8hMPrpqwGNYXUTJGL/CMSP+Sjv5F6ZTkJHqauuOxwTw=";
+    hash = "sha256-UcX4r2TxinL2S3tPIiYRsPpYmKzdAx3Al0irkbXf5/g=";
     fetchSubmodules = true;
   };
 
@@ -38,13 +38,13 @@ stdenv.mkDerivation rec {
   cargoDeps1 = rustPlatform.fetchCargoVendor {
     inherit src;
     cargoRoot = "libs/librepcb/rust-core";
-    hash = "sha256-1td3WjxbDq2lX7c0trpYRhO82ChNAG/ZABBRsekYtq4=";
+    hash = "sha256-1wHk8ynP3VnkypwY/C7nikfMSF0qU0L+CbBKoVxjlEc=";
   };
 
   cargoDeps2 = rustPlatform.fetchCargoVendor {
     inherit src;
     cargoRoot = "libs/slint";
-    hash = "sha256-DYcKoaOXYFvAi5VyWdhli73s7qrypeXmzGJNhVzcWtY=";
+    hash = "sha256-UX/7a0hzFBmPZKufcDKcICrXEM+rKcvqEq2pg1riBxo=";
   };
 
   postPatch = ''
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     [source.crates-io]
     replace-with = "vendored-sources"
     [source.vendored-sources]
-    directory = "${cargoDeps1}"
+    directory = "${cargoDeps1}/source-registry-0"
     EOF
 
     # Set up cargo config for the second Rust library
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     [source.crates-io]
     replace-with = "vendored-sources"
     [source.vendored-sources]
-    directory = "${cargoDeps2}"
+    directory = "${cargoDeps2}/source-registry-0"
     EOF
   '';
 

From 567aa1a2c41962f0d1117740b426e33687d95f85 Mon Sep 17 00:00:00 2001
From: teto <886074+teto@users.noreply.github.com>
Date: Sat, 13 Jun 2026 23:28:26 +0200
Subject: [PATCH 09/58] memento: 1.7.0 -> 2.0.0

       > -- Could NOT find Qt6LinguistTools (missing: Qt6LinguistTools_DIR)
       > CMake Error at CMakeLists.txt:169 (find_package):
       >   Found package configuration file:
---
 pkgs/by-name/me/memento/package.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/me/memento/package.nix b/pkgs/by-name/me/memento/package.nix
index d36c21ac3bca..04f409ab7555 100644
--- a/pkgs/by-name/me/memento/package.nix
+++ b/pkgs/by-name/me/memento/package.nix
@@ -42,31 +42,38 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "memento";
-  version = "1.7.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "ripose-jp";
     repo = "Memento";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6ipzorykt9GoGTHTTLCyDf7vXx9mT5AITKA9pyQ3GwI=";
+    hash = "sha256-Mg6Gxy8FwqNjE9m4uOQnEY95PZJSQllDBU2KnS8UOHE=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail $'\tQml\n' $'\tQml\n\tQmlPrivate\n'
+  '';
+
   cmakeFlags = [
-    (lib.cmakeBool "SYSTEM_QCORO" true)
-    (lib.cmakeBool "SYSTEM_MOCR" true)
+    (lib.cmakeBool "MEMENTO_SYSTEM_QCORO" true)
+    (lib.cmakeBool "MEMENTO_SYSTEM_MOCR" true)
   ]
   ++ lib.optionals withOcr [
-    (lib.cmakeBool "OCR_SUPPORT" true)
+    (lib.cmakeBool "MEMENTO_OCR_SUPPORT" true)
   ];
 
   nativeBuildInputs = [
     cmake
     makeWrapper
+    qt6Packages.qttools
     qt6Packages.wrapQtAppsHook
   ];
 
   buildInputs = [
     qt6Packages.qtbase
+    qt6Packages.qtdeclarative
     qt6Packages.qtsvg
     qt6Packages.qtwayland
     sqlite

From 5a69ae2e6c31767045f5a0c08a573cfbf88ac372 Mon Sep 17 00:00:00 2001
From: Trent Baldwin <trent.baldwin@proton.me>
Date: Sat, 13 Jun 2026 16:55:34 -0400
Subject: [PATCH 10/58] ghidra-extensions.lightkeeper: 1.2.4 -> 1.4.0

---
 pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix b/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix
index b75fb25b2620..f13efc089f66 100644
--- a/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix
@@ -5,13 +5,13 @@
 }:
 buildGhidraExtension (finalAttrs: {
   pname = "lightkeeper";
-  version = "1.2.4";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "WorksButNotTested";
     repo = "lightkeeper";
     rev = finalAttrs.version;
-    hash = "sha256-aGMWg6VQleKH/txlxpSw19QOotWZSqeW5Ve2SpWGhgA=";
+    hash = "sha256-LfRrduGLdt5NDzNGBUCBYcZChamzjtY8tMBvXitoH58=";
   };
   preConfigure = ''
     cd lightkeeper

From a8702babde9cf0642b30dec8ebd98a34e3a84feb Mon Sep 17 00:00:00 2001
From: Trent Baldwin <trent.baldwin@proton.me>
Date: Mon, 15 Jun 2026 14:20:55 -0400
Subject: [PATCH 11/58] ghidra-extensions.wasm: mark as broken until it support
 12.1.2

---
 pkgs/tools/security/ghidra/extensions/wasm/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/ghidra/extensions/wasm/default.nix b/pkgs/tools/security/ghidra/extensions/wasm/default.nix
index ad9f2904c342..37a7b7a899cb 100644
--- a/pkgs/tools/security/ghidra/extensions/wasm/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/wasm/default.nix
@@ -36,5 +36,6 @@ buildGhidraExtension (finalAttrs: {
     changelog = "https://github.com/nneonneo/ghidra-wasm-plugin/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.BonusPlay ];
+    broken = true; # Until updated to support 12.1.2
   };
 })

From 4edd0777b5d16c1c4e782d0cbdbc40c23764a552 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Jun 2026 20:36:00 +0000
Subject: [PATCH 12/58] starlark: 0-unstable-2026-05-22 ->
 0-unstable-2026-06-13

---
 pkgs/by-name/st/starlark/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/starlark/package.nix b/pkgs/by-name/st/starlark/package.nix
index 57ca8a24f0a1..7887c9b2aea9 100644
--- a/pkgs/by-name/st/starlark/package.nix
+++ b/pkgs/by-name/st/starlark/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule {
   pname = "starlark";
-  version = "0-unstable-2026-05-22";
+  version = "0-unstable-2026-06-13";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "starlark-go";
-    rev = "ec58d4b459e2866ed51124596d888ed7aa4f90b8";
-    hash = "sha256-9H0TIp2CIGo5Rqld9Xvsg/uQmfswiUzSsu7vwazjcho=";
+    rev = "8ba36ccb83fb02b223182e27808a6d5d0636afb9";
+    hash = "sha256-TH97v0LZt2W/0P9jPuKBmBCa079o3FIcX2hHBidhC3Y=";
   };
 
   vendorHash = "sha256-Ejw5f5ulEcLHm4WYKatwA7FZ9lfdqZTOE3SdkaK6jYE=";

From 83b36e2fe04c2ce3c8c9c1251e293a3b7b09cb8a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Jun 2026 22:18:14 +0000
Subject: [PATCH 13/58] mirrord: 3.216.0 -> 3.219.0

---
 pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index 588347bfa29e..2cf2b2e58b33 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,21 +1,21 @@
 {
-  "version": "3.216.0",
+  "version": "3.219.0",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.216.0/mirrord_linux_x86_64",
-      "hash": "sha256-w4x1G12uifLTQzf9KWUgUYeu+4SQTI51HToI/cgB4ew="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.219.0/mirrord_linux_x86_64",
+      "hash": "sha256-zqVPuAsgsYAFuB+5lfUOl8MaiAVc3iLbhnmiPVCQ9po="
     },
     "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.216.0/mirrord_linux_aarch64",
-      "hash": "sha256-GLwDMlCV7izckP5roJGsVROK3+PSkwDH/Vbu4j9X1sk="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.219.0/mirrord_linux_aarch64",
+      "hash": "sha256-xeiPf9hEKU75VgPeS2fiIx8WEC0DQwadMaA8Yp/shpU="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.216.0/mirrord_mac_universal",
-      "hash": "sha256-LCHPpdVWyBtmrcP+2bFqwaqhtH+nsXf2R3SeXJMFtVg="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.219.0/mirrord_mac_universal",
+      "hash": "sha256-v0idU5+NmFcSxdwGKUT+09BsNuzJKv0tuj4uaqMzqU4="
     },
     "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.216.0/mirrord_mac_universal",
-      "hash": "sha256-LCHPpdVWyBtmrcP+2bFqwaqhtH+nsXf2R3SeXJMFtVg="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.219.0/mirrord_mac_universal",
+      "hash": "sha256-v0idU5+NmFcSxdwGKUT+09BsNuzJKv0tuj4uaqMzqU4="
     }
   }
 }

From f89bc589bd40ba840466b521444720d190b39660 Mon Sep 17 00:00:00 2001
From: PassiveLemon <lemonl3mn@protonmail.com>
Date: Wed, 10 Jun 2026 16:03:16 -0400
Subject: [PATCH 14/58] wivrn: 26.2.3 -> 26.6.1

---
 pkgs/by-name/wi/wivrn/package.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix
index 6f67b7f4f269..95af21005f5c 100644
--- a/pkgs/by-name/wi/wivrn/package.nix
+++ b/pkgs/by-name/wi/wivrn/package.nix
@@ -21,6 +21,7 @@
   glm,
   glslang,
   harfbuzz,
+  hexdump,
   kdePackages,
   libarchive,
   libdrm,
@@ -55,13 +56,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wivrn";
-  version = "26.2.3";
+  version = "26.6.1";
 
   src = fetchFromGitHub {
     owner = "wivrn";
     repo = "wivrn";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-pU7FYPp5wa0MK0ut/BfFlnUai8yMcylpWC0CoAExAio=";
+    hash = "sha256-eXU7hYLYchAb6AbCyINfTmOp0NdxK35Kg9tcid2ucg4=";
   };
 
   monado = applyPatches {
@@ -69,8 +70,8 @@ stdenv.mkDerivation (finalAttrs: {
       domain = "gitlab.freedesktop.org";
       owner = "monado";
       repo = "monado";
-      rev = "723652b545a79609f9f04cb89fcbf807d9d6451a";
-      hash = "sha256-wGqvTI/X22apc8XCN3GCGQClHfBW5xk73mZnwWvHtyI=";
+      rev = "1b526bb3a0ff326ecd05af4c2c541407f53c6d4b";
+      hash = "sha256-SzuCQ1uX15vFGwGt3gswlVF2Su8sIND4R3tsTJ4T1LY=";
     };
 
     postPatch = ''
@@ -97,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     git
     glib
     glslang
+    hexdump
     librsvg
     pkg-config
     python3
@@ -133,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: {
     kdePackages.ki18n
     kdePackages.kiconthemes
     kdePackages.kirigami
+    kdePackages.kirigami-addons
     kdePackages.qcoro
     kdePackages.qqc2-desktop-style
     libarchive
@@ -162,6 +165,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "WIVRN_OPENXR_MANIFEST_TYPE" "absolute")
     (lib.cmakeBool "WIVRN_OPENXR_MANIFEST_ABI" clientLibOnly)
     (lib.cmakeFeature "GIT_DESC" "v${finalAttrs.version}")
+    (lib.cmakeFeature "GIT_COMMIT" "v${finalAttrs.version}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MONADO" "${finalAttrs.monado}")
   ]
   ++ lib.optionals (!clientLibOnly) [

From 3020c190840b9a2b7754314d48f77195a62ec114 Mon Sep 17 00:00:00 2001
From: PassiveLemon <lemonl3mn@protonmail.com>
Date: Fri, 19 Jun 2026 11:07:47 -0400
Subject: [PATCH 15/58] wivrn: remove cudatoolkit

---
 pkgs/by-name/wi/wivrn/package.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix
index 95af21005f5c..dc157a42d4ff 100644
--- a/pkgs/by-name/wi/wivrn/package.nix
+++ b/pkgs/by-name/wi/wivrn/package.nix
@@ -11,8 +11,6 @@
   boost,
   cli11,
   cmake,
-  cudaPackages ? { },
-  cudaSupport ? config.cudaSupport,
   eigen,
   ffmpeg,
   freetype,
@@ -37,7 +35,6 @@
   nlohmann_json,
   opencomposite,
   openxr-loader,
-  ovrCompatSearchPaths ? "${xrizer}/lib/xrizer:${opencomposite}/lib/opencomposite",
   pipewire,
   pkg-config,
   python3,
@@ -50,6 +47,9 @@
   vulkan-loader,
   x264,
   xrizer,
+  cudaSupport ? config.cudaSupport,
+  # WiVRn defaults to the first path but the others can be manually selected
+  ovrCompatSearchPaths ? "${xrizer}/lib/xrizer:${opencomposite}/lib/opencomposite",
   # Only build the OpenXR client library. Useful for building the client library for a different architecture,
   # e.g. 32-bit library while running 64-bit service on host, so 32-bit apps can connect to the runtime
   clientLibOnly ? false,
@@ -150,9 +150,6 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qtsvg
     qt6.qttools
     x264
-  ]
-  ++ lib.optionals (cudaSupport && !clientLibOnly) [
-    cudaPackages.cudatoolkit
   ];
 
   cmakeFlags = [
@@ -177,9 +174,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "WIVRN_USE_PULSEAUDIO" true)
     (lib.cmakeBool "WIVRN_FEATURE_STEAMVR_LIGHTHOUSE" true)
     (lib.cmakeFeature "OVR_COMPAT_SEARCH_PATH" ovrCompatSearchPaths)
-  ]
-  ++ lib.optionals (cudaSupport && !clientLibOnly) [
-    (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}")
   ];
 
   dontWrapQtApps = true;

From 3958be0c3ade70b4c8577771e3a689641bb933f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jun 2026 23:04:26 +0000
Subject: [PATCH 16/58] wxmaxima: 26.06.1 -> 26.06.2

---
 pkgs/by-name/wx/wxmaxima/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wx/wxmaxima/package.nix b/pkgs/by-name/wx/wxmaxima/package.nix
index fefbde1d3e20..f26b0512c6d2 100644
--- a/pkgs/by-name/wx/wxmaxima/package.nix
+++ b/pkgs/by-name/wx/wxmaxima/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wxmaxima";
-  version = "26.06.1";
+  version = "26.06.2";
 
   src = fetchFromGitHub {
     owner = "wxMaxima-developers";
     repo = "wxmaxima";
     rev = "Version-${finalAttrs.version}";
-    hash = "sha256-A20uF1cRm9hjTyqJDCMEuAwhG8hagHu0tKdQK5Lnz94=";
+    hash = "sha256-BehuFRofeU3k7hmdAM6b1gRuxQBhvonvPtTyW3gauV0=";
   };
 
   buildInputs = [

From 2eeb3f9290e898a6f224d134d5d21e5c94246bdf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jun 2026 03:04:20 +0000
Subject: [PATCH 17/58] ddccontrol-db: 20260610 -> 20260611

---
 pkgs/by-name/dd/ddccontrol-db/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix
index 127aa8371c6f..f963703bcafc 100644
--- a/pkgs/by-name/dd/ddccontrol-db/package.nix
+++ b/pkgs/by-name/dd/ddccontrol-db/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ddccontrol-db";
-  version = "20260610";
+  version = "20260611";
 
   src = fetchFromGitHub {
     owner = "ddccontrol";
     repo = "ddccontrol-db";
     tag = finalAttrs.version;
-    sha256 = "sha256-/3TWnBHPP3SyrsVcxiVkHxPITZDqQPF7HaMIaVnCT4M=";
+    sha256 = "sha256-wK6PuUy+2qeh935Oz26MMjlfB+PmRSPQMIYCnBGfThE=";
   };
 
   nativeBuildInputs = [

From e4c209e20d2852971de6537ebcecb075d79bd185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 19 Jun 2026 21:57:12 -0700
Subject: [PATCH 18/58] coturn: 4.9.0 -> 4.13.1

Diff: https://github.com/coturn/coturn/compare/4.9.0...4.13.1

Changelog: https://github.com/coturn/coturn/blob/4.13.1/ChangeLog
---
 pkgs/by-name/co/coturn/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/coturn/package.nix b/pkgs/by-name/co/coturn/package.nix
index 70befe6306cb..142647a7f086 100644
--- a/pkgs/by-name/co/coturn/package.nix
+++ b/pkgs/by-name/co/coturn/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "coturn";
-  version = "4.9.0";
+  version = "4.13.1";
 
   src = fetchFromGitHub {
     owner = "coturn";
     repo = "coturn";
     tag = finalAttrs.version;
-    hash = "sha256-NSdmz5ZkzgP+kP6iutYX8+l1b4ErgB+kicskTn6OlRE=";
+    hash = "sha256-66bPrw/jUleEOKBBdNDa8qyxxQCiLk5saTnUQfDdTak=";
   };
 
   nativeBuildInputs = [

From 592f3897011bb10d0cf950e047c42528c47c5fad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jun 2026 07:15:16 +0000
Subject: [PATCH 19/58] glaze: 7.8.0 -> 7.8.2

---
 pkgs/by-name/gl/glaze/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix
index 2bbad5c6b5fa..e82a36ba528f 100644
--- a/pkgs/by-name/gl/glaze/package.nix
+++ b/pkgs/by-name/gl/glaze/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glaze";
-  version = "7.8.0";
+  version = "7.8.2";
 
   src = fetchFromGitHub {
     owner = "stephenberry";
     repo = "glaze";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-E906rvJh6URPvtsLmOjvNKZQtI52ItkoXQvISIQlNXE=";
+    hash = "sha256-T0oYGqmF+0gXT4VESN4h1P/rUfV9BGmpvLWp+6BKiFI=";
   };
 
   nativeBuildInputs = [ cmake ];

From 440b9ec49ba4bf540bc06ce1767b2ad687cc4022 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Fri, 19 Jun 2026 21:27:49 +0530
Subject: [PATCH 20/58] reaction: 2.4.1 -> 2.5.1

https://framagit.org/ppom/reaction/-/releases/v2.4.2
https://framagit.org/ppom/reaction/-/releases/v2.5.0
https://framagit.org/ppom/reaction/-/releases/v2.5.1

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/re/reaction/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/reaction/package.nix b/pkgs/by-name/re/reaction/package.nix
index 63a9af69be40..2ac26aeb3a47 100644
--- a/pkgs/by-name/re/reaction/package.nix
+++ b/pkgs/by-name/re/reaction/package.nix
@@ -13,17 +13,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "reaction";
-  version = "2.4.1";
+  version = "2.5.1";
 
   src = fetchFromGitLab {
     domain = "framagit.org";
     owner = "ppom";
     repo = "reaction";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1+kliU3TfXhAz/vRh/UamTdcv8UIXrcF1q+Qy1jsjD4=";
+    hash = "sha256-a1ioQ+1CvC22tUeyVG8A7hciP+bXvX/UcRi0++To5Ik=";
   };
 
-  cargoHash = "sha256-FQCYCSKk8SLO2ddM6hklUuTvSK7+4dElaNQ3ZNnci3M=";
+  cargoHash = "sha256-qbhNswQW6ExkMQ+KiAr50EOLiDScwm9hILiiN9GxGWU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 61728b04c77c40cfa607ca539988eec40ff10997 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jun 2026 09:21:27 +0000
Subject: [PATCH 21/58] ayatana-webmail: 24.5.17 -> 26.6.13

---
 pkgs/by-name/ay/ayatana-webmail/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ay/ayatana-webmail/package.nix b/pkgs/by-name/ay/ayatana-webmail/package.nix
index 23ba69a03fc0..72a55038f7fa 100644
--- a/pkgs/by-name/ay/ayatana-webmail/package.nix
+++ b/pkgs/by-name/ay/ayatana-webmail/package.nix
@@ -19,14 +19,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "ayatana-webmail";
-  version = "24.5.17";
+  version = "26.6.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "ayatana-webmail";
     tag = finalAttrs.version;
-    hash = "sha256-k557FWKGq2MXODVxVzOetC5kkwTNYOoLO8msCOabais=";
+    hash = "sha256-AVH4SQ2yoC2SXuKt8MJVGAgB32cTOD7mCVxcBZn/PPM=";
   };
   postConfigure = ''
     # Fix fhs paths

From 1d50b3e67d53f71a2e30f62b38209be867baab21 Mon Sep 17 00:00:00 2001
From: Holiu <165534185+Holiu618@users.noreply.github.com>
Date: Sat, 20 Jun 2026 17:18:58 +0800
Subject: [PATCH 22/58] lmstudio: 0.4.15-2 -> 0.4.16-2

---
 pkgs/by-name/lm/lmstudio/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix
index aa5b2964ea8a..afcdf8524f33 100644
--- a/pkgs/by-name/lm/lmstudio/package.nix
+++ b/pkgs/by-name/lm/lmstudio/package.nix
@@ -7,12 +7,12 @@
 let
   pname = "lmstudio";
 
-  version_aarch64-linux = "0.4.15-2";
-  hash_aarch64-linux = "sha256-HnxdikjdUPoQkHMGLHC7TJylj5ad5UWnFMkyjj/8haU=";
-  version_aarch64-darwin = "0.4.15-2";
-  hash_aarch64-darwin = "sha256-Spe/d34X4V8LAheaLFQ68NvDo09FrshDrV0RLO+24sU=";
-  version_x86_64-linux = "0.4.15-2";
-  hash_x86_64-linux = "sha256-M7doFWVEyzcDJF4M+h4WKR+Q45yn3FZc2vZbzjYWBPE=";
+  version_aarch64-linux = "0.4.16-2";
+  hash_aarch64-linux = "sha256-shn3W+il66OX8VDj7+hYFgL/N8GZ1APB2MH84uoCHOM=";
+  version_aarch64-darwin = "0.4.16-2";
+  hash_aarch64-darwin = "sha256-Gj8mMrNNDXNDyFj2p3emic2xms4tWSoVS2XXLsEeEC4=";
+  version_x86_64-linux = "0.4.16-2";
+  hash_x86_64-linux = "sha256-faLtj/9M59KRdEMHHgTCPLG4Gl5C7hkdAgmaS/O5rOk=";
 
   meta = {
     description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";

From 1152a503044067297b5d65f08d0d65ee703b20ed Mon Sep 17 00:00:00 2001
From: skelettor <skelettor@skcloud.fr>
Date: Sat, 20 Jun 2026 14:59:35 +0200
Subject: [PATCH 23/58] openlinkhub: 0.8.4 -> 0.8.8

---
 pkgs/by-name/op/openlinkhub/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openlinkhub/package.nix b/pkgs/by-name/op/openlinkhub/package.nix
index be17e1b1a847..7d15eadd40a4 100644
--- a/pkgs/by-name/op/openlinkhub/package.nix
+++ b/pkgs/by-name/op/openlinkhub/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "openlinkhub";
-  version = "0.8.4";
+  version = "0.8.8";
 
   src = fetchFromGitHub {
     owner = "jurkovic-nikola";
     repo = "OpenLinkHub";
     tag = finalAttrs.version;
-    hash = "sha256-yxLRwYsBvwpPVeQWx8R9bfbtdkGu2qUsDiyoijcTD2g=";
+    hash = "sha256-uYuhmvdHNVs19egakwDOvIJ2IEAeZEAV6qgMYEl+Ie4=";
   };
 
   proxyVendor = true;

From 962d8bd7d2b81719f39009794ac48694e8142585 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 20 Jun 2026 15:57:53 +0000
Subject: [PATCH 24/58] nezha-agent: 2.2.2 -> 2.2.3

---
 pkgs/by-name/ne/nezha-agent/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix
index 2b27bf85d0c6..58537283a5d5 100644
--- a/pkgs/by-name/ne/nezha-agent/package.nix
+++ b/pkgs/by-name/ne/nezha-agent/package.nix
@@ -8,16 +8,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "nezha-agent";
-  version = "2.2.2";
+  version = "2.2.3";
 
   src = fetchFromGitHub {
     owner = "nezhahq";
     repo = "agent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KaONvjQY204VUppt2h78IE92LP+YJQ128BCuHGgMsBk=";
+    hash = "sha256-DDmxeWEIEJweqDbCDDTzK99cP28tz5bQpotyDMCTVuk=";
   };
 
-  vendorHash = "sha256-/pygqSThb3YQ188Ro0vjP4yDN/yfPNRJQWP5FQ7sJ8c=";
+  vendorHash = "sha256-kYw1XgtlzRSQ0k8XK0lCJ0s2UaevVdmPunb9e7hoc70=";
 
   ldflags = [
     "-s"

From ee4379efb74ebb9d874bc9b53fd923e36b400d89 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jun 2026 12:28:19 +0000
Subject: [PATCH 25/58] cinnamon-session: 6.6.3 -> 6.6.4

https://github.com/linuxmint/cinnamon-session/compare/6.6.3...6.6.4
---
 pkgs/by-name/ci/cinnamon-session/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ci/cinnamon-session/package.nix b/pkgs/by-name/ci/cinnamon-session/package.nix
index d64794db4bd6..1628fa160e20 100644
--- a/pkgs/by-name/ci/cinnamon-session/package.nix
+++ b/pkgs/by-name/ci/cinnamon-session/package.nix
@@ -39,13 +39,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cinnamon-session";
-  version = "6.6.3";
+  version = "6.6.4";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon-session";
     tag = finalAttrs.version;
-    hash = "sha256-fmeLywpM4QhgyiX68E+4vosUK2WKGVJ1Cx8pYdOnb+k=";
+    hash = "sha256-rx7+tBXQ9kvnRYNxgF1QXyhk9NamUIjti/6GGrACYU0=";
   };
 
   buildInputs = [

From 8a5e4d237325f23d467e223728f02b33e6e18939 Mon Sep 17 00:00:00 2001
From: 74k1 <git.t@betsumei.com>
Date: Sat, 20 Jun 2026 18:56:01 +0200
Subject: [PATCH 26/58] shortwave: fix missing glib-networking buildInput

---
 pkgs/by-name/sh/shortwave/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/sh/shortwave/package.nix b/pkgs/by-name/sh/shortwave/package.nix
index 95df5b9cac5f..7731d1444f5b 100644
--- a/pkgs/by-name/sh/shortwave/package.nix
+++ b/pkgs/by-name/sh/shortwave/package.nix
@@ -9,6 +9,7 @@
   gettext,
   gitMinimal,
   glib,
+  glib-networking,
   gst_all_1,
   gtk4,
   libadwaita,
@@ -63,6 +64,7 @@ stdenv.mkDerivation rec {
     dbus
     gdk-pixbuf
     glib
+    glib-networking
     gtk4
     libadwaita
     libglycin-gtk4

From ce344b0da589e16ce88af8114aaf108860636153 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jun 2026 18:28:11 +0000
Subject: [PATCH 27/58] monkeys-audio: 13.03 -> 13.06

---
 pkgs/by-name/mo/monkeys-audio/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/monkeys-audio/package.nix b/pkgs/by-name/mo/monkeys-audio/package.nix
index 2d7bf79c6796..16bf1b087ea5 100644
--- a/pkgs/by-name/mo/monkeys-audio/package.nix
+++ b/pkgs/by-name/mo/monkeys-audio/package.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "13.03";
+  version = "13.06";
   pname = "monkeys-audio";
 
   src = fetchzip {
     url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
-    hash = "sha256-cZc6UtoZVEL3aWXPzLjfKshsr78V7y8X0Dw6qvJcVco=";
+    hash = "sha256-znR820+/ySNBqh7aRXA3WCiWe13r2SFhJqJ0TzVde7Q=";
     stripRoot = false;
   };
 

From 8e49d1002e5e739825e7402831f06ae53a1e58aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jun 2026 19:04:49 +0000
Subject: [PATCH 28/58] podman-tui: 1.11.1 -> 1.11.2

---
 pkgs/by-name/po/podman-tui/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix
index 7c421ec7bb64..f08cfa98c485 100644
--- a/pkgs/by-name/po/podman-tui/package.nix
+++ b/pkgs/by-name/po/podman-tui/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "podman-tui";
-  version = "1.11.1";
+  version = "1.11.2";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podman-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tOwiRzRxf8KSGSjEeMLN3DcDbOFwss4BvfwegDnOdLg=";
+    hash = "sha256-+yi9t+NHieYvNKgmIgExotESFk8qvnYV11uuHMuV/No=";
   };
 
   vendorHash = null;

From 4760cdbdf909cdd586303c18326c213e89e3aa50 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jun 2026 21:17:26 +0000
Subject: [PATCH 29/58] filebrowser: 2.63.14 -> 2.63.15

---
 pkgs/by-name/fi/filebrowser/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix
index 33f3d71541f9..a96b6f9c3803 100644
--- a/pkgs/by-name/fi/filebrowser/package.nix
+++ b/pkgs/by-name/fi/filebrowser/package.nix
@@ -13,13 +13,13 @@
 }:
 
 let
-  version = "2.63.14";
+  version = "2.63.15";
 
   src = fetchFromGitHub {
     owner = "filebrowser";
     repo = "filebrowser";
     tag = "v${version}";
-    hash = "sha256-9CXHoQWr1RpTwFR8JRR72oQZxHrndTrnxYa6/0Z3Mk0=";
+    hash = "sha256-O2USjwP1g+yDZpz0628YTRN2BUUnmjFvS+0qc6JU294=";
   };
 
   frontend = stdenvNoCC.mkDerivation (finalAttrs: {
@@ -62,7 +62,7 @@ buildGoModule {
   pname = "filebrowser";
   inherit version src;
 
-  vendorHash = "sha256-ofeQkbvBfCpu2g1CLAwUZAZISyAOz+0smEZRx/koj/8=";
+  vendorHash = "sha256-WXbXD75acK4woS7UC0G73pY48aGmp1l0spDc3sGYXMg=";
 
   excludedPackages = [ "tools" ];
 

From dcdebc455389a0886d802e9ceae2df257205f24b Mon Sep 17 00:00:00 2001
From: Wekuz <wekuz@duck.com>
Date: Sun, 21 Jun 2026 00:23:30 +0300
Subject: [PATCH 30/58] doc: move unpackerr module announcement to the correct
 release notes

Initially unpackerr module announcement was added to the 26.05 release
notes but as that is already released it should have been added to the
26.11 release notes.
---
 nixos/doc/manual/release-notes/rl-2605.section.md | 2 --
 nixos/doc/manual/release-notes/rl-2611.section.md | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md
index e40a6d774fb9..3d3c85b5d126 100644
--- a/nixos/doc/manual/release-notes/rl-2605.section.md
+++ b/nixos/doc/manual/release-notes/rl-2605.section.md
@@ -174,8 +174,6 @@
 
 - [LogiOps](https://github.com/PixlOne/logiops), an unofficial userspace driver for HID++ Logitech devices. Available as [services.logiops](#opt-services.logiops.enable).
 
-- [Unpackerr](https://unpackerr.zip), extracts downloads for Radarr, Sonarr, Lidarr, Readarr, and/or a Watch folder. Available as [services.unpackerr](#opt-services.unpackerr.enable).
-
 ## Backward Incompatibilities {#sec-release-26.05-incompatibilities}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md
index 0252bcb370ea..aaf1554cf398 100644
--- a/nixos/doc/manual/release-notes/rl-2611.section.md
+++ b/nixos/doc/manual/release-notes/rl-2611.section.md
@@ -20,6 +20,8 @@
 
 - [FlapAlerted](https://github.com/Kioubit/FlapAlerted), detects BGP flapping events and provides statistics based on BGP update messages. Available as [services.flap-alerted](#opt-services.flap-alerted.enable).
 
+- [Unpackerr](https://unpackerr.zip), extracts downloads for Radarr, Sonarr, Lidarr, Readarr, and/or a Watch folder. Available as [services.unpackerr](#opt-services.unpackerr.enable).
+
 ## Backward Incompatibilities {#sec-release-26.11-incompatibilities}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

From a7ccb360019fa2559b7b8b276a4cb358d7ccc627 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 00:54:57 +0000
Subject: [PATCH 31/58] models-dev: 0-unstable-2026-06-11 ->
 0-unstable-2026-06-20

---
 pkgs/by-name/mo/models-dev/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index b18b09f1d591..0f81f3245505 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -8,12 +8,12 @@
 }:
 let
   pname = "models-dev";
-  version = "0-unstable-2026-06-11";
+  version = "0-unstable-2026-06-20";
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "models.dev";
-    rev = "765dae9f61827033d62eb8cbd5ac1f8883e09d07";
-    hash = "sha256-L8j0qKKhTTe9YuDB63ZGYwXEG8aXUw0oNDtkBuAALIA=";
+    rev = "363e0e6f3d8da90e04e6ef4a77725c74b87c49ef";
+    hash = "sha256-cs3O5b4jqTmYH0yIVHoSQShA0Y7sqNj3AX9TOt8roYs=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From 13698e39a697bc9269e5447bee1a8284fbd84ed2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 01:08:49 +0000
Subject: [PATCH 32/58] turn-rs: 4.1.2 -> 4.1.3

---
 pkgs/by-name/tu/turn-rs/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix
index 8b3a340e3ac1..515c0237e30c 100644
--- a/pkgs/by-name/tu/turn-rs/package.nix
+++ b/pkgs/by-name/tu/turn-rs/package.nix
@@ -13,13 +13,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "turn-rs";
-  version = "4.1.2";
+  version = "4.1.3";
 
   src = fetchFromGitHub {
     owner = "mycrl";
     repo = "turn-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-YZPKcLePLX+Mdu4J31VNofiX/qCLjcxydc4iVhonhkU=";
+    hash = "sha256-5ukXh0y5EhQpCEL6T5NcZRGx79RDwqrGXnP1zAF6kuc=";
   };
 
   cargoHash = "sha256-vvhj0B/KYdOeddALh38MvAwrg8sIAIlEzTj0yFNEjFk=";

From 5e6cb830299cb9fcbc3db42a5d8e076539b32bb1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 01:11:56 +0000
Subject: [PATCH 33/58] pgdog: 0.1.44 -> 0.1.45

---
 pkgs/by-name/pg/pgdog/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pg/pgdog/package.nix b/pkgs/by-name/pg/pgdog/package.nix
index 3f12af095b81..a434d61df55c 100644
--- a/pkgs/by-name/pg/pgdog/package.nix
+++ b/pkgs/by-name/pg/pgdog/package.nix
@@ -14,16 +14,16 @@ let
 in
 rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: {
   pname = "pgdog";
-  version = "0.1.44";
+  version = "0.1.45";
 
   src = fetchFromGitHub {
     owner = "pgdogdev";
     repo = "pgdog";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-t45oD6b3S7oVZP/of8x2uxumjKxilNYLsqMtv2bTZoA=";
+    hash = "sha256-XMJNnkSV6c/0wWipFg59ZnnvCp4NwPELpVsQKCOViwA=";
   };
 
-  cargoHash = "sha256-VFxogmT4gLHld+MCdYwwEwU9XiIxS6YRuMzif6oAuyE=";
+  cargoHash = "sha256-6Eeon5+KRNFum7AGy8fkdpvtaMLduKzbtuqtJvpB8AY=";
 
   # Hardcoded paths for C compiler and linker
   postPatch = ''

From 39ddf8a32e394602e210df0d5ef9764ad56a54ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 01:25:34 +0000
Subject: [PATCH 34/58] cliamp: 1.57.0 -> 1.57.1

---
 pkgs/by-name/cl/cliamp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/cliamp/package.nix b/pkgs/by-name/cl/cliamp/package.nix
index fe6bf8539723..0c28952a16a3 100644
--- a/pkgs/by-name/cl/cliamp/package.nix
+++ b/pkgs/by-name/cl/cliamp/package.nix
@@ -16,13 +16,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "cliamp";
-  version = "1.57.0";
+  version = "1.57.1";
 
   src = fetchFromGitHub {
     owner = "bjarneo";
     repo = "cliamp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tfPtc+YgtmuzdWod6EM0MJSoYLxLnQskuNRQbLRp4g8=";
+    hash = "sha256-wRXF2bnl3xFJtuESJX2UVSsPwl4xo6E+k7nIdtzCULo=";
   };
 
   vendorHash = "sha256-A2Ygc1a9e2flZzaNAEXvr8Ui1cE89TxBfUNALmDzIo0=";

From 9dac53b0da3417785ca4bf08c1045eb63372dd2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 02:02:21 +0000
Subject: [PATCH 35/58] evtx: 0.12.1 -> 0.12.2

---
 pkgs/by-name/ev/evtx/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ev/evtx/package.nix b/pkgs/by-name/ev/evtx/package.nix
index 1e72731fa69c..8234adfdacbe 100644
--- a/pkgs/by-name/ev/evtx/package.nix
+++ b/pkgs/by-name/ev/evtx/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "evtx";
-  version = "0.12.1";
+  version = "0.12.2";
 
   src = fetchFromGitHub {
     owner = "omerbenamram";
     repo = "evtx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zmXRUA2+x697AptONn5VUVySp4zz+VHwt8dqd6pJBGI=";
+    hash = "sha256-RNJIYTSV1czMNAs8Aqu9nDt/mvaC6uLRv9ra8vCShNA=";
   };
 
-  cargoHash = "sha256-5Jw+zem0XLLvn3tELXk8vTnH2zvUr82qFx9QUYUwXyY=";
+  cargoHash = "sha256-kJkMk4bfmijo7IX1XopibFnouahK8sn1SDQtX9ha898=";
 
   postPatch = ''
     # CLI tests will fail in the sandbox

From 29de3352afe6db944d1833badee633777f97afec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 02:17:19 +0000
Subject: [PATCH 36/58] terraform-providers.ibm-cloud_ibm: 2.2.2 -> 2.3.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 8350fe22dd90..81fc51f6e86a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -733,13 +733,13 @@
     "vendorHash": null
   },
   "ibm-cloud_ibm": {
-    "hash": "sha256-bLbm+wbC+2bMor9fYmB6J+iclSOsdP3dIkJiy3Jk6Xg=",
+    "hash": "sha256-b498lI4JF5DktGXS5SqCBlDB0rsqDWTE/5GHmgHX3Y4=",
     "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
     "owner": "IBM-Cloud",
     "repo": "terraform-provider-ibm",
-    "rev": "v2.2.2",
+    "rev": "v2.3.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-FFQEmg2hui1KyzP1WWR6Lx9tKi2aEDAHKztubHMaTAQ="
+    "vendorHash": "sha256-0eKD6fIrpOQzD/ILd+6y4GR2EX4UNOioMdSCfu+F5OU="
   },
   "icinga_icinga2": {
     "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",

From 257e5bc2338d68e18b7915ae2282114fbb0c5c78 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 02:39:55 +0000
Subject: [PATCH 37/58] python3Packages.plugwise: 1.11.4 -> 1.12.0

---
 pkgs/development/python-modules/plugwise/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index cec7cf027562..7babb433980c 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "plugwise";
-  version = "1.11.4";
+  version = "1.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "plugwise";
     repo = "python-plugwise";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-V1oPSRO+Adacszy8Wh5u4sHzVvfwiKvdKMzFi58pC2E=";
+    hash = "sha256-gvTvKhs54jWvBCHBbNN2UiMMpJ+bEwAsRJsN/EzE72Y=";
   };
 
   postPatch = ''

From 098ed9206036366fb77dd2204a2efc5a8f952408 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 02:51:56 +0000
Subject: [PATCH 38/58] sqlpage: 0.44.0 -> 0.44.1

---
 pkgs/by-name/sq/sqlpage/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sq/sqlpage/package.nix b/pkgs/by-name/sq/sqlpage/package.nix
index fdbd7b080e6f..24b4016197ee 100644
--- a/pkgs/by-name/sq/sqlpage/package.nix
+++ b/pkgs/by-name/sq/sqlpage/package.nix
@@ -42,13 +42,13 @@ in
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sqlpage";
-  version = "0.44.0";
+  version = "0.44.1";
 
   src = fetchFromGitHub {
     owner = "sqlpage";
     repo = "SQLpage";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qhfJHzPUBQZ6GKGet/6IZfU5zjKXqDxftJX3ylVwOQE=";
+    hash = "sha256-QpengTtKBLJga/LXcN3oPuXDru1zr9Ti/Qpb0tfiEYc=";
   };
 
   postPatch = ''
@@ -76,7 +76,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "copy_url_to_opened_file(&client, sprite_url, &mut sprite_content).await;" "sprite_content = std::fs::read(sprite_url).unwrap();"
   '';
 
-  cargoHash = "sha256-VNKRXzy9TQdNlk/kEfFKBEWALP/r+hBcd32n6bwK/J0=";
+  cargoHash = "sha256-w4GfkC+sAJRQgo9GEYm4buv+Q8id84wgRSV1WczZUBI=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 8971561fb3f7e0346f597e7c7bf7c183899d40e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 03:04:29 +0000
Subject: [PATCH 39/58] cantus: 0.6.7 -> 0.6.8

---
 pkgs/by-name/ca/cantus/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cantus/package.nix b/pkgs/by-name/ca/cantus/package.nix
index aa04acf08257..104def316ece 100644
--- a/pkgs/by-name/ca/cantus/package.nix
+++ b/pkgs/by-name/ca/cantus/package.nix
@@ -12,16 +12,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cantus";
-  version = "0.6.7";
+  version = "0.6.8";
 
   src = fetchFromGitHub {
     owner = "CodedNil";
     repo = "cantus";
     tag = finalAttrs.version;
-    hash = "sha256-JoxGn3AaILLW2vWwPZ06Dr+JF0Cc1P0X7BeJBNGJBuI=";
+    hash = "sha256-TRqWhoRlinNzLdxODs4bR5IgJR6ELKs4SOOpvtoFNFA=";
   };
 
-  cargoHash = "sha256-GIB/QWBjlpkyxeTz15Hf4mr660R++mSf1J+K4JZ+YXY=";
+  cargoHash = "sha256-YUXEgeZn0UXh34RnCaqLhhK0QSPz3Y8XJuR2oMa4rIU=";
 
   nativeBuildInputs = [
     pkg-config

From 0dad36bce6500662e7ac1c14608cc035381c3d3d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 03:31:24 +0000
Subject: [PATCH 40/58] dotenvx: 1.71.2 -> 1.75.1

---
 pkgs/by-name/do/dotenvx/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix
index 2ca9efcf88e7..efbc3f010da2 100644
--- a/pkgs/by-name/do/dotenvx/package.nix
+++ b/pkgs/by-name/do/dotenvx/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "dotenvx";
-  version = "1.71.2";
+  version = "1.75.1";
 
   src = fetchFromGitHub {
     owner = "dotenvx";
     repo = "dotenvx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-51mmOF03j+JpyE4fyoqmZdgHtAOPhdEQiUTTATPFujM=";
+    hash = "sha256-pcn4YyFMba8oX0gFrlHHuKucMy+F0FMtM/FaSb6ZWDE=";
   };
 
-  npmDepsHash = "sha256-3+Dn4XE5BH3QfeHVILLP/3ZESmhbYuzfT6IAIOLCJkQ=";
+  npmDepsHash = "sha256-RucWpXNW1whEyqRtqtaq6NiGz9/Jh5N9N4GUP92/k44=";
 
   dontNpmBuild = true;
 

From d3e970b6a81a908ee56e096cff6085f1c7a87aa5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 04:50:08 +0000
Subject: [PATCH 41/58] pkgsite: 0.1.0-unstable-2026-06-05 ->
 0.2.0-unstable-2026-06-18

---
 pkgs/by-name/pk/pkgsite/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix
index c6cc48c9381f..5d36dc85b1cd 100644
--- a/pkgs/by-name/pk/pkgsite/package.nix
+++ b/pkgs/by-name/pk/pkgsite/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule {
   pname = "pkgsite";
-  version = "0.1.0-unstable-2026-06-05";
+  version = "0.2.0-unstable-2026-06-18";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "deb78785c3ce936751c393f7eb5079a9ad63d841";
-    hash = "sha256-3K4O59BtJfDyiUKQ/OA20FLb/9LGyiutn6ULeiDFQ6g=";
+    rev = "78ee7d155e76c298e91b46983873b8dff09e8bb6";
+    hash = "sha256-0cPo7MrRNT8W0E6hyLy6WzB0hfv7OqDhz92UtJPLY34=";
   };
 
-  vendorHash = "sha256-jMHGQrGQjNsWNj7BnhRYDn17W+6VI3A940AkR4Rmvok=";
+  vendorHash = "sha256-pamVUaMpkNVGY9tWPHsIiqflthzwELFOxgn90ncor/U=";
 
   subPackages = [ "cmd/pkgsite" ];
 

From 24e52d98f619c76d203eba2768a2d1166bedbe84 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 05:44:44 +0000
Subject: [PATCH 42/58] python3Packages.fastcore: 1.13.3 -> 1.13.6

---
 pkgs/development/python-modules/fastcore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix
index 2b3beaaf0149..7b1d5993682c 100644
--- a/pkgs/development/python-modules/fastcore/default.nix
+++ b/pkgs/development/python-modules/fastcore/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "fastcore";
-  version = "1.13.3";
+  version = "1.13.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fastai";
     repo = "fastcore";
     tag = finalAttrs.version;
-    hash = "sha256-ZwiqTGgvu/OdnaJHq+oWZat33BvhF52X48d6ipcexRU=";
+    hash = "sha256-mc83cOGVVRYa3ed8/8i31Ipbxr8stOnwSdnlOtJ5TGM=";
   };
 
   build-system = [ setuptools ];

From c952462051776e3cd8f72a91057029474a74b65a Mon Sep 17 00:00:00 2001
From: chillcicada <2210227279@qq.com>
Date: Sun, 21 Jun 2026 14:06:36 +0800
Subject: [PATCH 43/58] wpsoffice-cn: 12.1.2.25882 -> 12.1.2.26885 for linux;
 12.1.125867 -> 12.1.26016 for darwin

---
 pkgs/by-name/wp/wpsoffice-cn/package.nix |  5 -----
 pkgs/by-name/wp/wpsoffice-cn/sources.nix | 18 +++++++++---------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/wp/wpsoffice-cn/package.nix b/pkgs/by-name/wp/wpsoffice-cn/package.nix
index 1310cca0300f..e88bedf6c021 100644
--- a/pkgs/by-name/wp/wpsoffice-cn/package.nix
+++ b/pkgs/by-name/wp/wpsoffice-cn/package.nix
@@ -200,10 +200,5 @@ else
       # libmysqlclient dependency
       patchelf --replace-needed libmysqlclient.so.18 libmysqlclient.so $out/opt/kingsoft/wps-office/office6/libFontWatermark.so
       patchelf --add-rpath ${libmysqlclient}/lib/mariadb $out/opt/kingsoft/wps-office/office6/libFontWatermark.so
-      # fix et/wpp/wpspdf failure to launch with no mode configured
-      for i in $out/bin/*; do
-        substituteInPlace $i \
-          --replace-fail '[ $haveConf -eq 1 ] &&' '[ ! $currentMode ] ||'
-      done
     '';
   }
diff --git a/pkgs/by-name/wp/wpsoffice-cn/sources.nix b/pkgs/by-name/wp/wpsoffice-cn/sources.nix
index 1a137519da9e..5f86b3053a11 100644
--- a/pkgs/by-name/wp/wpsoffice-cn/sources.nix
+++ b/pkgs/by-name/wp/wpsoffice-cn/sources.nix
@@ -1,18 +1,18 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2026-04-20
+# Last updated: 2026-06-21
 {
-  linux-version = "12.1.2.25882";
-  darwin-version = "12.1.25867";
+  linux-version = "12.1.2.26885";
+  darwin-version = "12.1.26016";
   x86_64-linux = {
-    url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2023/25882/wps-office_12.1.2.25882.AK.preread.sw.Personal_662820_amd64.deb";
-    hash = "sha256-ZdYtB83mGbnbjh7wHRAt37QfZ1F/5eoFUcZYTNhGGUc=";
+    url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2023/26885/wps-office_12.1.2.26885.AK.preread.sw.Personal_715971_amd64.deb";
+    hash = "sha256-VdpRSUZ6FYS0ttEoDLWrBMBhRTl0gQ+slnmzO9hmTlE=";
   };
   x86_64-darwin = {
-    url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.25867/WPS_Office_12.1.25867(25867)_x64.dmg";
-    hash = "sha256-9yWAxFFi6qmbVoQ8FCy81cL7sO6vDocKW8CU74jxEOM=";
+    url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.26016/WPS_Office_12.1.26016(26016)_x64.dmg";
+    hash = "sha256-pyjW1cUKX7RRFDQo2ik2L57fIwixLj0XqHMYTe4aE3g=";
   };
   aarch64-darwin = {
-    url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.25867/WPS_Office_12.1.25867(25867)_arm64.dmg";
-    hash = "sha256-rbHy/Fp6y7YF1eYLBYm6jW2d47jayZ+CPVG3k+LC1fU=";
+    url = "https://package.mac.wpscdn.cn/mac_wps_pkg/12.1.26016/WPS_Office_12.1.26016(26016)_arm64.dmg";
+    hash = "sha256-vlT96ROqB/6Jt/x60Zeh6B4MtN2NGyn5PWv9pNafF/8=";
   };
 }

From ea1c0a6ff5ce08eca20a8526e47af346d6ed042f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 06:09:30 +0000
Subject: [PATCH 44/58] mcp-server-fetch: 2026.6.3 -> 2026.6.16

---
 pkgs/by-name/mc/mcp-server-fetch/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/mc/mcp-server-fetch/package.nix b/pkgs/by-name/mc/mcp-server-fetch/package.nix
index 5ef4c68b2bbe..bb6b29766de1 100644
--- a/pkgs/by-name/mc/mcp-server-fetch/package.nix
+++ b/pkgs/by-name/mc/mcp-server-fetch/package.nix
@@ -6,7 +6,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "mcp-server-fetch";
-  version = "2026.6.3";
+  version = "2026.6.16";
   pyproject = true;
 
   src = fetchFromGitHub {

From 8c28392eb51fc7e54d8efe94d62d2b25994d92a3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 06:20:38 +0000
Subject: [PATCH 45/58] androidStudioPackages.canary: 2026.1.2.7 -> 2026.1.3.1

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index f3cecb980d19..57b50a6c1f30 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -26,9 +26,9 @@ let
     url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.7/android-studio-quail1-rc2-linux.tar.gz";
   };
   latestVersion = {
-    version = "2026.1.2.7"; # "Android Studio Quail 2 | 2026.1.2 Canary 7"
-    sha256Hash = "sha256-LHszfAtM5ZLNbTZG0isb+aUW3uwp+zav/igHT4HDeEM=";
-    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.7/android-studio-quail2-canary7-linux.tar.gz";
+    version = "2026.1.3.1"; # "Android Studio Quail 3 | 2026.1.3 Canary 1"
+    sha256Hash = "sha256-D7aSLkauEVB05/vhWxn7sfK2CoAzsvaxnkFViAuVIsc=";
+    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.3.1/android-studio-quail3-canary1-linux.tar.gz";
   };
 in
 {

From 0d89b70caef2d6cd22eeb290e4837a47da1e8fd3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 06:34:18 +0000
Subject: [PATCH 46/58] tailwindcss_4: 4.3.0 -> 4.3.1

---
 pkgs/by-name/ta/tailwindcss_4/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix
index 1023938f1168..e5e0c48bedf8 100644
--- a/pkgs/by-name/ta/tailwindcss_4/package.nix
+++ b/pkgs/by-name/ta/tailwindcss_4/package.nix
@@ -7,7 +7,7 @@
   makeWrapper,
 }:
 let
-  version = "4.3.0";
+  version = "4.3.1";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "tailwindcss has not been packaged for ${system} yet.";
 
@@ -22,10 +22,10 @@ let
 
   hash =
     {
-      aarch64-darwin = "sha256-VrS7xi29xGFKeJMNnGmGQjouxj5OZAFEpZpdlckUMi4=";
-      aarch64-linux = "sha256-j0jctyvjs1HBBWPFMptGOLqFFoINw7OhYJYloWbofL0=";
-      x86_64-darwin = "sha256-K6JS93CBcJHm0NEqhODdUxvMKarRv9nZdqOv8aBxtno=";
-      x86_64-linux = "sha256-c/DlRZBU5c+qirbzuUDz++DxPMf9g7wk58ZVAzwgNAA=";
+      aarch64-darwin = "sha256-onxDYmGFlT7hm9rOGTnHYB5V2mVOCy/ERh4+KZV6pzk=";
+      aarch64-linux = "sha256-PWYjd6htccQ7VJ3Aa5DbRYa0rNQSv4J6MmjpUWYeWt8=";
+      x86_64-darwin = "sha256-6egwzrPnC34HdaPdee7o7ILGsxJw8I8vooV9AHcEWsM=";
+      x86_64-linux = "sha256-JSbQY7oDtx+aPqfVzuFPCuwUfxF/Ii1a3Jex1zbUWZk=";
     }
     .${system} or throwSystem;
 in

From 9a445a792c728cdd7f57b3bc4707f308ca14b27f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 06:47:46 +0000
Subject: [PATCH 47/58] python3Packages.clarifai-grpc: 12.4.5 -> 12.5.0

---
 pkgs/development/python-modules/clarifai-grpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix
index 68427a2c9f12..2a6eb6f5e053 100644
--- a/pkgs/development/python-modules/clarifai-grpc/default.nix
+++ b/pkgs/development/python-modules/clarifai-grpc/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "clarifai-grpc";
-  version = "12.4.5";
+  version = "12.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Clarifai";
     repo = "clarifai-python-grpc";
     tag = version;
-    hash = "sha256-c6YMVKT26ug/ztacSWaraijAwiRJemQGOCgHJm4ROKU=";
+    hash = "sha256-jwIpDtB4nXWCu9xqBnRrLGse+Mk1yiilq0pG6IIVNK0=";
   };
 
   build-system = [ setuptools ];

From 3ed4f05becbc12adcf2341f05d442f80ac190b39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 07:33:42 +0000
Subject: [PATCH 48/58] qownnotes: 26.6.5 -> 26.6.7

---
 pkgs/by-name/qo/qownnotes/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index b5262ca64293..661aa1cc76b9 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -19,11 +19,11 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "26.6.5";
+  version = "26.6.7";
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-M1Yqiyl0aUodvEva4y3fQiTthslDo2/54NNDEdcPsJY=";
+    hash = "sha256-rfLen9yUVrDM/1brnDjLORX3VV3uE8GU4zM/q2h3jdM=";
   };
 
   nativeBuildInputs = [

From b3955a84b09d3139cde0a3b4cf36d4b3129ec9d5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 21 Jun 2026 09:40:11 +0200
Subject: [PATCH 49/58] python3Packages.clarifai-grpc: migrate to finalAttrs

---
 pkgs/development/python-modules/clarifai-grpc/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix
index 2a6eb6f5e053..86ab913570e5 100644
--- a/pkgs/development/python-modules/clarifai-grpc/default.nix
+++ b/pkgs/development/python-modules/clarifai-grpc/default.nix
@@ -9,7 +9,7 @@
   requests,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "clarifai-grpc";
   version = "12.5.0";
   pyproject = true;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Clarifai";
     repo = "clarifai-python-grpc";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-jwIpDtB4nXWCu9xqBnRrLGse+Mk1yiilq0pG6IIVNK0=";
   };
 
@@ -42,8 +42,8 @@ buildPythonPackage rec {
   meta = {
     description = "Clarifai gRPC API Client";
     homepage = "https://github.com/Clarifai/clarifai-python-grpc";
-    changelog = "https://github.com/Clarifai/clarifai-python-grpc/releases/tag/${src.tag}";
+    changelog = "https://github.com/Clarifai/clarifai-python-grpc/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ natsukium ];
   };
-}
+})

From fbc413dbedd3c8593b79c5a63c7cd0d2c0b15653 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 07:54:36 +0000
Subject: [PATCH 50/58] temporal: 1.30.4 -> 1.30.5

---
 pkgs/by-name/te/temporal/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/temporal/package.nix b/pkgs/by-name/te/temporal/package.nix
index 290d970d2809..13f51d2a3278 100644
--- a/pkgs/by-name/te/temporal/package.nix
+++ b/pkgs/by-name/te/temporal/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "temporal";
-  version = "1.30.4";
+  version = "1.30.5";
 
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = "temporal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qC4SMy8ypeSJlqqTtMb27d869bLP1dcGilqU50Fen60=";
+    hash = "sha256-Uw1E1GcLtIo1XZea/tb1TnbIk9O4Mf2NaCpDwUIfSak=";
   };
 
-  vendorHash = "sha256-YJbovD2woypOiYfn9axO8lshIg/6gO9Sa8a3DIt8QFg=";
+  vendorHash = "sha256-5++ETJgWDVveUxb2QZL5AUQG8/8QNVx5iS/NBjoacCY=";
 
   overrideModAttrs = old: {
     # netdb.go allows /etc/protocols and /etc/services to not exist and happily proceeds, but it panic()s if they exist but return permission denied.

From 774c9fd91ae2d188a191315324877db404d10d67 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 21 Jun 2026 00:13:53 +0800
Subject: [PATCH 51/58] nixos/cinnamon: Add miscellaneous packages to
 systemd.packages

ref: https://github.com/linuxmint/cinnamon-session/commit/e01c8c37f6bb5458cc8f38ad73e23d232e7f932a
ref: https://gitlab.freedesktop.org/xdg/xdg-user-dirs/-/commit/2a63d3f0ffb76135790bb1168a3270a599904380

Also add xdg-user-dirs-gtk as done in linuxmint.
---
 .../modules/services/x11/desktop-managers/cinnamon.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index 738aaa000a79..2da09e9cb9bc 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -123,6 +123,15 @@ in
         nemo-with-extensions
         xapp
       ];
+      systemd.packages =
+        with pkgs;
+        [
+          cinnamon-session
+        ]
+        ++ utils.removePackagesByName [
+          xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
+          xdg-user-dirs-gtk
+        ] config.environment.cinnamon.excludePackages;
       services.cinnamon.apps.enable = mkDefault true;
       services.gnome.evolution-data-server.enable = true;
       services.gnome.glib-networking.enable = true;
@@ -218,6 +227,7 @@ in
             mint-y-icons
             xapp # provides some xapp-* icons
             xapp-symbolic-icons
+            xdg-user-dirs-gtk
           ] config.environment.cinnamon.excludePackages
         );
 

From a8f1842cbbbc8af0e76267a9379f3f2e238c6b92 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 21 Jun 2026 00:05:14 +0800
Subject: [PATCH 52/58] nixos/display-managers: Mark cinnamon systemd aware

ref: https://github.com/linuxmint/cinnamon-session/commit/e01c8c37f6bb5458cc8f38ad73e23d232e7f932a
---
 nixos/modules/services/x11/display-managers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 2f9a8dcb210a..d5c1277a459c 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -48,7 +48,7 @@ let
       IFS=:
       for i in $XDG_CURRENT_DESKTOP; do
         case $i in
-          KDE|GNOME|Pantheon|Hyprland|niri|X-NIXOS-SYSTEMD-AWARE) echo "1"; exit; ;;
+          KDE|GNOME|Pantheon|Hyprland|niri|X-Cinnamon|X-NIXOS-SYSTEMD-AWARE) echo "1"; exit; ;;
           *) ;;
         esac
       done

From 748d1e3f2657a72493c2423ba0af6bb53cbd4087 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 08:25:24 +0000
Subject: [PATCH 53/58] bruijn: 0-unstable-2026-05-02 -> 0-unstable-2026-05-03

---
 pkgs/by-name/br/bruijn/generated.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/br/bruijn/generated.nix b/pkgs/by-name/br/bruijn/generated.nix
index ee0fd9289b90..d25acbae1a6b 100644
--- a/pkgs/by-name/br/bruijn/generated.nix
+++ b/pkgs/by-name/br/bruijn/generated.nix
@@ -22,10 +22,10 @@
 }:
 mkDerivation {
   pname = "bruijn";
-  version = "0-unstable-2026-05-02";
+  version = "0-unstable-2026-05-03";
   src = fetchzip {
-    url = "https://github.com/marvinborner/bruijn/archive/8a88445d1f0d970c88cdb0e1b97a04ba02019a94.tar.gz";
-    sha256 = "12s2sa9zg6sxia36mm0z8fq7f3kd86g96gcwd8xnb8dl49x8qbd5";
+    url = "https://github.com/marvinborner/bruijn/archive/b5cb32a7bb3b44f58f9e909bfd394564be26d50a.tar.gz";
+    sha256 = "1k9sgl4h4da1qr9r1laz72rscxsicr5sjmla8qx7px0g1iajl0dn";
   };
   isLibrary = true;
   isExecutable = true;

From 98817c3776e675c4539533a198e832401ccc22eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 08:28:10 +0000
Subject: [PATCH 54/58] terraform-providers.bpg_proxmox: 0.109.0 -> 0.110.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 8350fe22dd90..222cdfbc2258 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -110,13 +110,13 @@
     "vendorHash": null
   },
   "bpg_proxmox": {
-    "hash": "sha256-10cdMZSGJuhUx432/2NazA8T88zclcnbolcU31wfIEM=",
+    "hash": "sha256-F6aSXitmu3FOVpRoFyAVPCZA7dHgRbBySda+uS1BDTY=",
     "homepage": "https://registry.terraform.io/providers/bpg/proxmox",
     "owner": "bpg",
     "repo": "terraform-provider-proxmox",
-    "rev": "v0.109.0",
+    "rev": "v0.110.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Tx5DjRLZJXm0GjKRaogra7m55Opeu9LVvT25UW5q4D0="
+    "vendorHash": "sha256-X4sWLYi9DKp3ex1XBwv2qiVliytOjs7Asy+rigKF/AE="
   },
   "brightbox_brightbox": {
     "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",

From bb599c3a92b617d9a2f29a909725d5f6ad3e0ad1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Jun 2026 09:39:51 +0000
Subject: [PATCH 55/58] amnezia-vpn: 4.8.18.0 -> 4.8.19.0

---
 pkgs/by-name/am/amnezia-vpn/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix
index 6cad55ecd001..a72a875d43f4 100644
--- a/pkgs/by-name/am/amnezia-vpn/package.nix
+++ b/pkgs/by-name/am/amnezia-vpn/package.nix
@@ -81,7 +81,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "amnezia-vpn";
-  version = "4.8.18.0";
+  version = "4.8.19.0";
 
   __structuredAttrs = true;
 
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "amnezia-vpn";
     repo = "amnezia-client";
     tag = finalAttrs.version;
-    hash = "sha256-/A1juZzNWjdShdg41M1nfO3pMukMFzyBjQaZvZjYaJs=";
+    hash = "sha256-kftLofCyLA6DDfEXRPyy6Zx0JiQUEzpdYpTlvPihPZg=";
     fetchSubmodules = true;
   };
 

From 514e39c3ca49b7d159bd4f1e85b2a609ec237c35 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 21 Jun 2026 15:54:28 +0800
Subject: [PATCH 56/58] nixos/tests/cinnamon: Check for xdg-desktop-portal

xdg-desktop-portal.service is part of graphical-session.target.
---
 nixos/tests/cinnamon-wayland.nix | 9 +++++++--
 nixos/tests/cinnamon.nix         | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/cinnamon-wayland.nix b/nixos/tests/cinnamon-wayland.nix
index 632ab53cc529..d26d50dd9dc6 100644
--- a/nixos/tests/cinnamon-wayland.nix
+++ b/nixos/tests/cinnamon-wayland.nix
@@ -51,8 +51,9 @@
           machine.wait_until_succeeds("${eval "Main.runState"} | grep -q 'true,..2'")
 
       with subtest("Check if Cinnamon components actually start"):
-          for i in ["csd-media-keys", "xapp-sn-watcher", "nemo-desktop"]:
-            machine.wait_until_succeeds(f"pgrep -f {i}")
+          # https://unix.stackexchange.com/a/74186
+          for i in ["[c]sd-media-keys", "[x]app-sn-watcher", "[n]emo-desktop"]:
+            machine.wait_until_succeeds(f"pgrep -f \"{i}\"")
           machine.wait_until_succeeds("journalctl -b --grep 'Loaded applet menu@cinnamon.org'")
           machine.wait_until_succeeds("journalctl -b --grep 'calendar@cinnamon.org: Calendar events supported'")
 
@@ -84,6 +85,10 @@
           machine.wait_until_succeeds("${eval "global.display.focus_window.wm_class"} | grep -i 'gnome-terminal'")
           machine.sleep(2)
 
+      # Only can be tested after opening the above apps.
+      with subtest("Check if x-d-p actually starts"):
+          machine.wait_until_succeeds("pgrep -xf \"${pkgs.xdg-desktop-portal}/libexec/xdg-desktop-portal\"")
+
       with subtest("Check if Cinnamon has ever coredumped"):
           machine.fail("coredumpctl --json=short | grep -E 'cinnamon|nemo'")
     '';
diff --git a/nixos/tests/cinnamon.nix b/nixos/tests/cinnamon.nix
index d8b52c261a42..da8bf8847a4b 100644
--- a/nixos/tests/cinnamon.nix
+++ b/nixos/tests/cinnamon.nix
@@ -62,8 +62,9 @@
           machine.wait_until_succeeds("${eval "Main.runState"} | grep -q 'true,..2'")
 
       with subtest("Check if Cinnamon components actually start"):
-          for i in ["csd-media-keys", "cinnamon-killer-daemon", "xapp-sn-watcher", "nemo-desktop"]:
-            machine.wait_until_succeeds(f"pgrep -f {i}")
+          # https://unix.stackexchange.com/a/74186
+          for i in ["[c]sd-media-keys", "[c]innamon-killer-daemon", "[x]app-sn-watcher", "[n]emo-desktop"]:
+            machine.wait_until_succeeds(f"pgrep -f \"{i}\"")
           machine.wait_until_succeeds("journalctl -b --grep 'Loaded applet menu@cinnamon.org'")
           machine.wait_until_succeeds("journalctl -b --grep 'calendar@cinnamon.org: Calendar events supported'")
 
@@ -104,6 +105,10 @@
           machine.sleep(2)
           machine.screenshot("cinnamon_virtual_keyboard")
 
+      # Only can be tested after opening the above apps.
+      with subtest("Check if x-d-p actually starts"):
+          machine.wait_until_succeeds("pgrep -xf \"${pkgs.xdg-desktop-portal}/libexec/xdg-desktop-portal\"")
+
       with subtest("Check if Cinnamon has ever coredumped"):
           machine.fail("coredumpctl --json=short | grep -E 'cinnamon|nemo'")
     '';

From d7421fdde0cebfb9d2a47194c5ef4d4688e7aea0 Mon Sep 17 00:00:00 2001
From: isakgb <33453353+isakgb@users.noreply.github.com>
Date: Sat, 20 Jun 2026 17:20:51 +0200
Subject: [PATCH 57/58] postgresqlPackages.timescaledb_toolkit: 1.21.0 ->
 1.23.0

---
 .../sql/postgresql/ext/timescaledb_toolkit.nix   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
index 4e81b92c3d14..ab8e756cc50a 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
@@ -1,6 +1,6 @@
 {
   buildPgrxExtension,
-  cargo-pgrx_0_12_6,
+  cargo-pgrx_0_18_0,
   fetchFromGitHub,
   lib,
   nix-update-script,
@@ -9,19 +9,19 @@
 
 buildPgrxExtension (finalAttrs: {
   inherit postgresql;
-  cargo-pgrx = cargo-pgrx_0_12_6;
+  cargo-pgrx = cargo-pgrx_0_18_0;
 
   pname = "timescaledb_toolkit";
-  version = "1.21.0";
+  version = "1.23.0";
 
   src = fetchFromGitHub {
     owner = "timescale";
     repo = "timescaledb-toolkit";
     tag = finalAttrs.version;
-    hash = "sha256-gGGSNvvJprqLkVwPr7cfmGY1qEUTXMdqdvwPYIzXaTA=";
+    hash = "sha256-we2w2rYGRC9Did9oocgCWbIUxb8a/g0BlCHXQUe1f8I=";
   };
 
-  cargoHash = "sha256-kyUpfNEXJ732VO6JDxU+dIoL57uWzG4Ff03/GnvsxLE=";
+  cargoHash = "sha256-R6daWAQssopVps+IqF94dGBcZMC/u1J4eEg6WouAwOo=";
   buildAndTestSubdir = "extension";
 
   postInstall = ''
@@ -46,8 +46,8 @@ buildPgrxExtension (finalAttrs: {
       lib.versionOlder postgresql.version "15"
       ||
         # Check after next package update.
-        lib.warnIf (finalAttrs.version != "1.21.0")
-          "Is postgresql18Packages.timescaledb_toolkit still broken?"
-          (lib.versionAtLeast postgresql.version "18");
+        lib.warnIf (finalAttrs.version != "1.23.0")
+          "Is postgresql19Packages.timescaledb_toolkit still broken?"
+          (lib.versionAtLeast postgresql.version "19");
   };
 })

From 7ad52aa20e1bb608b54532638cf9ccd76665c72c Mon Sep 17 00:00:00 2001
From: isakgb <33453353+isakgb@users.noreply.github.com>
Date: Sun, 21 Jun 2026 13:23:43 +0200
Subject: [PATCH 58/58] cargo-pgrx_0_12_6: drop

---
 pkgs/development/tools/rust/cargo-pgrx/pinned.nix | 6 ------
 pkgs/top-level/all-packages.nix                   | 1 -
 2 files changed, 7 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-pgrx/pinned.nix b/pkgs/development/tools/rust/cargo-pgrx/pinned.nix
index a061dc275c1a..77d623d4902d 100644
--- a/pkgs/development/tools/rust/cargo-pgrx/pinned.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/pinned.nix
@@ -1,11 +1,5 @@
 # nixpkgs-update: no auto update
 {
-  cargo-pgrx_0_12_6 = {
-    version = "0.12.6";
-    hash = "sha256-7aQkrApALZe6EoQGVShGBj0UIATnfOy2DytFj9IWdEA=";
-    cargoHash = "sha256-pnMxWWfvr1/AEp8DvG4awig8zjdHizJHoZ5RJA8CL08=";
-  };
-
   cargo-pgrx_0_16_0 = {
     version = "0.16.0";
     hash = "sha256-emNR7fXNVD9sY/Mdno7mwpH6l/7AD28cBUsFRn9je50=";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d9e5f3d717f..748f61a2ba44 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4197,7 +4197,6 @@ with pkgs;
   defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { };
 
   inherit (callPackages ../development/tools/rust/cargo-pgrx { })
-    cargo-pgrx_0_12_6
     cargo-pgrx_0_16_0
     cargo-pgrx_0_16_1
     cargo-pgrx_0_17_0