Merge master into staging-next

pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix

@@ -6,11 +6,11 @@
 
 melpaBuild (finalAttrs: {
   pname = "ebuild-mode";
-  version = "1.83";
+  version = "1.84";
 
   src = fetchzip {
     url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-xZA3Vkh8frgXzyGZs5UELdBh0vrcsXJN/2aJX56QH0Y=";
+    hash = "sha256-+WbKgOR0eCIvBgQrXzVOk8k2mV7INObY59vc46KvMYo=";
   };
 
   meta = {

pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix

@@ -6,6 +6,7 @@
   stdenv,
   zig_0_15,
   emacs,
+  xcbuild,
 }:
 
 let
@@ -31,7 +32,7 @@ let
       hash = "sha256-CTsG3dXu3DECDbklBAtr2fYou82WNvQ1Q3JET0TmuyM=";
     };
 
-    nativeBuildInputs = [ zig ];
+    nativeBuildInputs = [ zig ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
 
     env.EMACS_INCLUDE_DIR = "${emacs}/include";
 
@@ -47,6 +48,19 @@ let
 
     zigBuildFlags = finalAttrs.zigCheckFlags;
 
+    postPatch = ''
+      # https://github.com/dakra/ghostel/issues/446
+      substituteInPlace build.zig \
+        --replace-fail 'addInstallFile(version_file, "../ghostel-module.version")' \
+                       'addInstallFile(version_file, "ghostel-module.version")'
+
+      # remove copy_step
+      substituteInPlace build.zig \
+        --replace-fail 'b.getInstallStep().dependOn(&copy_step.step);' ' ' \
+        --replace-fail 'const copy_step = b.addInstallFile' \
+                       '_ = b.addInstallFile'
+    '';
+
     postConfigure = ''
       cp -rLT ${finalAttrs.deps} "$ZIG_GLOBAL_CACHE_DIR/p"
       chmod -R u+w "$ZIG_GLOBAL_CACHE_DIR/p"
@@ -59,11 +73,12 @@ melpaBuild {
   inherit pname version src;
 
   files = ''
-    (:defaults "etc" "ghostel-module${libExt}")
+    (:defaults "etc" "ghostel-module${libExt}" "ghostel-module.version")
   '';
 
   preBuild = ''
     install ${module}/lib/libghostel-module${libExt} ghostel-module${libExt}
+    install --mode=444 ${module}/ghostel-module.version ghostel-module.version
   '';
 
   passthru = {

pkgs/by-name/am/amnezia-vpn-bin/package.nix

@@ -29,13 +29,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "amnezia-vpn-bin";
-  version = "4.8.18.0";
+  version = "4.8.19.0";
 
   __structuredAttrs = true;
 
   src = fetchzip {
     url = "https://github.com/amnezia-vpn/amnezia-client/releases/download/${finalAttrs.version}/AmneziaVPN_${finalAttrs.version}_linux_x64.tar";
-    hash = "sha256-Mypzq/Lm+JI0HljRJ6/0ZDFlwOeVbZB+Lmuy33xE06M=";
+    hash = "sha256-2bCP5yeaH0yQcjgwnrCgSnF1vafhrf+AlGyVPPgbK0k=";
   };
 
   strictDeps = true;

pkgs/by-name/an/ankama-launcher/package.nix

@@ -5,15 +5,15 @@
 }:
 let
   pname = "ankama-launcher";
-  version = "3.14.8";
+  version = "3.14.14";
 
   # The original URL for the launcher is:
   # https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage
   # As it does not encode the version, we use the wayback machine (web.archive.org) to get a fixed URL.
   # To update the client, head to web.archive.org and create a new snapshot of the download page.
   src = fetchurl {
-    url = "https://web.archive.org/web/20260413125512/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage";
-    hash = "sha256-wHLzF30ZeTgBG1TFlkSt0Tsm82cNb/C/eTUZjjYsgVE=";
+    url = "https://web.archive.org/web/20260605015300/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage";
+    hash = "sha256-9w1ho9DZvDHXQbXjpMY1wnWDwYlMKO1igrJcCahQkVQ=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };

pkgs/by-name/aw/aws-vault/package.nix

@@ -10,17 +10,17 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "aws-vault";
-  version = "7.11.1";
+  version = "7.12.3";
 
   src = fetchFromGitHub {
     owner = "ByteNess";
     repo = "aws-vault";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-GsE8UtER5KDIlVA36uFVoKPsX2pJNwotKtaizZH33t0=";
+    hash = "sha256-wuQx++t2660Z8Vu63nCgxemMi3h5QwTQNLMSoQsSYP0=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-spGYYxSeAfbOy+ze854IBBxxv07jnmE9rNGGqenkkCw=";
+  vendorHash = "sha256-pqD3j1I0zENctgM2lBaYiU3DRCqeq9XIX3jWB2p139I=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/cl/cloudflared/package.nix

@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "cloudflared";
-  version = "2026.6.0";
+  version = "2026.6.1";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cloudflared";
     tag = finalAttrs.version;
-    hash = "sha256-V3fHxDNkxF7MwChZpyHZ7pn8bBgBe/ugNql2QzqSLFA=";
+    hash = "sha256-TQW0XnYS96sX/+dTGocKzz91fJG58cSV3jGZI3TBaeg=";
   };
 
   vendorHash = null;

pkgs/by-name/gh/ghostfolio/package.nix

@@ -12,13 +12,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "ghostfolio";
-  version = "3.10.0";
+  version = "3.13.0";
 
   src = fetchFromGitHub {
     owner = "ghostfolio";
     repo = "ghostfolio";
     tag = finalAttrs.version;
-    hash = "sha256-nVk4KjNOIQQRRRvyPdSodL4s3yarIb1p2t2fBNcMps4=";
+    hash = "sha256-tPVGMAP45x/4NTL8px9jEbW6hQyhiOYiZp0tuDdfYL8=";
     # 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;
@@ -28,7 +28,7 @@ buildNpmPackage (finalAttrs: {
     '';
   };
 
-  npmDepsHash = "sha256-IMUbBYFiSS0AfsenPvxoC5HHHW7Lhxfd5DaysgV+vBU=";
+  npmDepsHash = "sha256-0/tHzfJrotlCxhiiVC6yddlj62Ef6IAeaZf/xufFiWU=";
 
   postPatch = ''
     substituteInPlace replace.build.mjs \

pkgs/by-name/in/inputplumber/package.nix

@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "inputplumber";
-  version = "0.77.5";
+  version = "0.77.7";
 
   src = fetchFromGitHub {
     owner = "ShadowBlip";
     repo = "InputPlumber";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-L6Ebyh4K4l+7LlVlgDRym9o+XsQPExC7xH1EBPwyLB4=";
+    hash = "sha256-LECHrL+yopymcdpuEZUFvNX1QI30Z+mOtMYP7fnMpBM=";
   };
 
-  cargoHash = "sha256-avwKy2AvgzT2IfRw/aMwllaYa4RLx7DJPxrgjHwBY1I=";
+  cargoHash = "sha256-1g4nHBu9LUMMr0bPkD4LCEFyyIc+GdhIWu+hlyGH3IM=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/it/itgmania/themes/digital-dance.nix

@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "digital-dance";
-  version = "1.1.3-unstable-2026-06-12";
+  version = "1.1.3-unstable-2026-06-22";
 
   src = fetchFromCodeberg {
     owner = "JNero";
     repo = "Digital-Dance-ITGMania";
-    rev = "d4456108422cb36e12dcc1bc227acc66b85d0395";
-    hash = "sha256-2bcI9Lh5xNfqtRbYxsmi+8LJMyQ6hUOw2OLuGQFBftE=";
+    rev = "14d3d31a4f79f1557e3515de41a7907130d7b163";
+    hash = "sha256-e/lOhwI+Q4sMn0EL5sPMhCaxoN6eOLVLBs7bMOPJUxY=";
   };
 
   postInstall = ''

pkgs/by-name/it/itgmania/themes/itg2-sm5.nix

@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "itg2-sm5";
-  version = "1.1.0-unstable-2025-10-08";
+  version = "1.1.0-unstable-2026-05-07";
 
   src = fetchFromGitHub {
     owner = "JoseVarelaP";
     repo = "In-The-Groove2-SM5";
-    rev = "e25f1a44efa55cd2247891f40633403910b75d21";
-    hash = "sha256-FMyT7ZA/1cqiClXDvD7CmJlOFaaWnPLuOuei6fsbzg8=";
+    rev = "07a71151b7170080902c3bf8118950ee4f410c01";
+    hash = "sha256-SpYR6U/ujQ7toHIgCp+ogF1LdnH41ikshEdEjhMxlj4=";
   };
 
   postInstall = ''

pkgs/by-name/it/itgmania/themes/itg3encore.nix

@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "itg3encore";
-  version = "0-unstable-2026-06-13";
+  version = "0-unstable-2026-06-22";
 
   src = fetchFromGitHub {
     owner = "DarkBahamut162";
     repo = "itg3encore";
-    rev = "409dc62c7c7a6c3ce3a713e84c81d95995eb20a6";
-    hash = "sha256-sJLkHRngmA9dPZoQPpUdOAz1nLCHTTOPG4i/SP6rl9A=";
+    rev = "c669a04ce6487a32263a2f617efa26bfd5eaf764";
+    hash = "sha256-CbqIzHcHmxICoi23z032Ti8AZyB5Ur/SPsolr1VjBhY=";
   };
 
   postInstall = ''

pkgs/by-name/la/lavacli/package.nix

@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "lavacli";
-  version = "2.8";
+  version = "2.9.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "lava";
     repo = "lavacli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oIB5BLLwyaDkV5mQ8vndlQQv4R1lCEATHO9JqJDYv7s=";
+    hash = "sha256-yDcvOuU/SxrQz8VN1ellf9Do7Sjw4/RwXpzOe0+5oAo=";
   };
 
   build-system = with python3.pkgs; [

pkgs/by-name/lo/lockbook-desktop/package.nix

@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lockbook-desktop";
-  version = "26.6.1";
+  version = "26.6.16";
 
   src = fetchFromGitHub {
     owner = "lockbook";
     repo = "lockbook";
     tag = finalAttrs.version;
-    hash = "sha256-+r5WsaqQr6NlQNWDTQf/tvCh6P5LpFFyyLMTIZw9yis=";
+    hash = "sha256-HtmuFN7iNNwuQ0CXzqnEJN4PNh0D7weHniegtF4EuqQ=";
   };
 
-  cargoHash = "sha256-ybAcG7sCEwZC6FxWx2KhHd1HkhK8wwkGeeLoI/KOXKU=";
+  cargoHash = "sha256-PUfXwtxuaheoyZA2fAyoc9CyD/oBAjkUsVrP6U7qvA0=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/lo/lookup-license/package.nix

@@ -0,0 +1,3 @@
+{ python3Packages }:
+
+python3Packages.toPythonApplication python3Packages.lookup-license

pkgs/by-name/mo/movim/package.nix

@@ -1,7 +1,6 @@
 {
   lib,
   fetchFromGitHub,
-  fetchpatch2,
   writeShellScript,
   dash,
   php,
@@ -45,23 +44,15 @@ let
 in
 php.buildComposerProject2 (finalAttrs: {
   pname = "movim";
-  version = "0.33.1";
+  version = "0.34";
 
   src = fetchFromGitHub {
     owner = "movim";
     repo = "movim";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TQ8PLmz9hn+OFfIF5cckv5gGhID7vuA5O1xVJ6PSPVA=";
+    hash = "sha256-E2n0YxNCaNEseGjLLhFDBdvrGg/XfzxU+T/rw/6Y/qY=";
   };
 
-  patches = [
-    # Removes debug var_dump that was accidentally left in
-    (fetchpatch2 {
-      url = "https://github.com/movim/movim/commit/239bd099711d196df574106155374f301f2c9531.patch";
-      hash = "sha256-tLWUOKTJDFE9obrnghG/S8FHJY0rcWlueWncHVdi0Jk=";
-    })
-  ];
-
   php = php.buildEnv (
     {
       extensions = (
@@ -97,7 +88,7 @@ php.buildComposerProject2 (finalAttrs: {
     ++ lib.optional minify.style.enable lightningcss
     ++ lib.optional minify.svg.enable scour;
 
-  vendorHash = "sha256-iy869AKgn/ZL1jYFvqvYkfr4lv5J4l2W6glGqZvJLhE=";
+  vendorHash = "sha256-Vs98gZAthDuYCdZiKSwmh+en4admfXSbDeoZXdbt8hQ=";
 
   postPatch = ''
     # Our modules are already wrapped, removes missing *.so warnings;

pkgs/by-name/ne/nebula-de-esser/package.nix

@@ -19,16 +19,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nebula-de-esser";
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "subhankardas15071992-cloud";
     repo = "Nebula-De-Esser";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-N+tVlhGTBRXZDKGRYo2WUamiekTe1FXvpqm34lwu2Z8=";
+    hash = "sha256-vV7Qc5WxGvb6h3o1CXTLYZzpWSc3ASt8cq3opI3qjEg=";
   };
 
-  cargoHash = "sha256-+z6oFjmPr2bLf81F4Q3dJC+x+RWeZnnnMHrWLphTsq0=";
+  cargoHash = "sha256-swhj9JQsDCFYzB/+qKffcdcIOAZ1HXmrgZ/Iy/rxG1M=";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -65,16 +65,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    clapDir="${
-      if stdenv.hostPlatform.isDarwin then "$out/Library/Audio/Plug-Ins/CLAP" else "$out/lib/clap"
-    }"
     vst3Dir="${
       if stdenv.hostPlatform.isDarwin then "$out/Library/Audio/Plug-Ins/VST3" else "$out/lib/vst3"
     }"
 
-    mkdir -p "$clapDir" "$vst3Dir"
+    mkdir -p "$vst3Dir"
 
-    cp -r "target/bundled/Nebula De-Esser.clap" "$clapDir/"
     cp -r "target/bundled/Nebula De-Esser.vst3" "$vst3Dir/"
 
     runHook postInstall

pkgs/by-name/ne/newsboat/package.nix

@@ -17,30 +17,22 @@
   libiconv,
   makeWrapper,
   nix-update-script,
-  fetchpatch,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "newsboat";
-  version = "2.43";
+  version = "2.44";
 
   src = fetchFromGitHub {
     owner = "newsboat";
     repo = "newsboat";
     tag = "r${finalAttrs.version}";
-    hash = "sha256-XnA20uylHoly1P5qpM2JmkkV6C5//Xu5M+CjWwCiI7c=";
+    hash = "sha256-OV7WpM0NBfqOtFv9Co728UwHut4HhT2u5qgvamy/FAg=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/newsboat/newsboat/commit/f7936d13013d33946b28b2ac51f1266423d66b23.patch";
-      hash = "sha256-MnL/ylTIJJV1+3I1OxzNWedLUEZ4viuzxXNM63qk1aM=";
-    })
-  ];
-
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-+QyN0YDQmSGVZ2ckLd5SDYRw/wZYFY6GNteeTRrNDcU=";
+    hash = "sha256-HJZnbQ7TDJ9zg0Rav1PCMEymaYy/mSxnrr2gkv4pTX0=";
   };
 
   # allow other ncurses versions on Darwin

pkgs/by-name/pi/picocrypt-ng/package.nix

@@ -16,18 +16,19 @@
 
 buildGoModule (finalAttrs: {
   pname = "picocrypt-ng";
-  version = "2.10";
+  version = "2.17";
 
   src = fetchFromGitHub {
     owner = "Picocrypt-NG";
     repo = "Picocrypt-NG";
-    tag = finalAttrs.version;
-    hash = "sha256-Rp7BgtJnV3fPed/QlWSxH8nL7cCTgMDpRGcgX5VI2l0=";
+    # Rewritten git history many times
+    rev = "424db6105588e9fe6b929b6731ace4556a12f172";
+    hash = "sha256-Bj0LK6si1ocGriRJf5GHZ/Z2xVhtyCIiv7H5+h8Dong=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";
 
-  vendorHash = "sha256-yAM1jzebUlNkVWiY8lPtlelfqpFQonNcAqNmmghCdPU=";
+  vendorHash = "sha256-KaTatNjSUnQC44UsV3LFOlkad8WqLfTPFFff8Dn13DA=";
 
   ldflags = [
     "-s"
@@ -51,7 +52,14 @@ buildGoModule (finalAttrs: {
   ];
 
   # git ls-files doesn't work as source is not a git repo
-  checkFlags = [ "-skip=^TestOldVersionLiteralsAreAllowlisted$" ];
+  checkFlags =
+    let
+      skippedTests = [
+        "TestOldVersionLiteralsAreAllowlisted"
+        "TestLinuxAppIdentityContract"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
   env.CGO_ENABLED = 1;
 

pkgs/by-name/sb/sbom-compliance-tool/package.nix

@@ -0,0 +1,61 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitea,
+  cyclonedx-python,
+}:
+
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "sbom-compliance-tool";
+  version = "0.0.11";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "software-compliance-org";
+    repo = "sbom-compliance-tool";
+    tag = finalAttrs.version;
+    hash = "sha256-6ZaHY1EKjJ78PrCov0wenj5doc93Ot9/yN4hEaagSmE=";
+  };
+
+  postPatch = ''
+    # https://setuptools.pypa.io/en/latest/userguide/package_discovery.html#finding-namespace-packages
+    substituteInPlace setup.py \
+      --replace-fail \
+        "packages=['sbom_compliance_tool']" \
+        "packages=setuptools.find_namespace_packages(include=['sbom_compliance_tool*'])"
+  '';
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    cyclonedx-python
+    foss-flame
+    licomp
+    licomp-toolkit
+    lookup-license
+  ];
+
+  # upstream has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "sbom_compliance_tool"
+    "sbom_compliance_tool.reader"
+  ];
+
+  meta = {
+    description = "Tool to assist your compliance work with SBoM";
+    homepage = "https://codeberg.org/software-compliance-org/sbom-compliance-tool";
+    mainProgram = "sbom_compliance_tool";
+    license = with lib.licenses; [
+      gpl3Only
+      gpl3Plus
+    ];
+    maintainers = with lib.maintainers; [ eljamm ];
+    teams = with lib.teams; [ ngi ];
+  };
+})

pkgs/by-name/sh/shiru/0001-Remove-Windows-specific-dep.patch

@@ -1,4 +1,4 @@
-From 12b0c98a4e844ab18545c8ba521ac1ef71301938 Mon Sep 17 00:00:00 2001
+From a8011a8d2610bc86224965a9ab9a935510af36f1 Mon Sep 17 00:00:00 2001
 From: Naomi Roberts <mia@naomieow.xyz>
 Date: Thu, 4 Dec 2025 19:59:48 +0000
 Subject: [PATCH] Remove Windows-specific dep
@@ -9,23 +9,23 @@ Signed-off-by: Naomi Roberts <mia@naomieow.xyz>
  electron/src/main/app.js    | 17 +----------------
  electron/webpack.config.cjs |  4 +---
  package.json                |  1 -
- pnpm-lock.yaml              | 11 -----------
- 5 files changed, 2 insertions(+), 32 deletions(-)
+ pnpm-lock.yaml              | 16 ----------------
+ 5 files changed, 2 insertions(+), 37 deletions(-)
 
 diff --git a/electron/package.json b/electron/package.json
-index a7b2bd3e..ce55d877 100644
+index 13d40060..d7154097 100644
 --- a/electron/package.json
 +++ b/electron/package.json
-@@ -26,7 +26,6 @@
-     "electron-updater": "^6.8.4"
+@@ -27,7 +27,6 @@
+     "electron-updater": "^6.8.9"
    },
    "dependencies": {
--    "@paymoapp/electron-shutdown-handler": "^1.1.2",
+-    "@paymoapp/electron-shutdown-handler": "^1.1.3",
      "@xhayper/discord-rpc": "^1.3.4",
-     "concurrently": "^9.2.1",
+     "concurrently": "^10.0.3",
      "jimp": "0.22.12",
 diff --git a/electron/src/main/app.js b/electron/src/main/app.js
-index 5875d276..682d3bb1 100644
+index 68aeb491..7237ad09 100644
 --- a/electron/src/main/app.js
 +++ b/electron/src/main/app.js
 @@ -7,7 +7,6 @@ import Jimp from 'jimp'
@@ -75,42 +75,42 @@ index 716dfcf7..3c9e4d1f 100644
        aliasFields: [],
        alias: {
 diff --git a/package.json b/package.json
-index 52de5f3a..470faf9d 100644
+index b02fcb7d..4fddc6ea 100644
 --- a/package.json
 +++ b/package.json
-@@ -48,7 +48,6 @@
-       "svelte-keybinds": "patches/svelte-keybinds.patch"
+@@ -47,7 +47,6 @@
+       "cordova-plugin-apkupdater": "patches/cordova-plugin-apkupdater.patch"
      },
      "onlyBuiltDependencies": [
 -      "@paymoapp/electron-shutdown-handler",
        "bufferutil",
        "electron",
-       "fs-native-extensions",
+       "electron-winstaller",
 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-index c373d877..e774678a 100644
+index 102a5cd1..5dcb8798 100644
 --- a/pnpm-lock.yaml
 +++ b/pnpm-lock.yaml
-@@ -257,9 +257,6 @@ importers:
+@@ -267,9 +267,6 @@ importers:
  
    electron:
      dependencies:
 -      '@paymoapp/electron-shutdown-handler':
--        specifier: ^1.1.2
--        version: 1.1.2
+-        specifier: ^1.1.3
+-        version: 1.1.3
        '@xhayper/discord-rpc':
          specifier: ^1.3.4
-         version: 1.3.4(bufferutil@4.0.8)(utf-8-validate@6.0.4)
-@@ -848,9 +845,6 @@ packages:
-   '@paralleldrive/cuid2@2.3.1':
-     resolution: {integrity: sha512-XO7cAxhnTZl0Yggq6jOgjiOHhbgcO4NqFqwSmQpjK3b6TEE6Uj/jfSk6wzYyemh3+I0sHirKSetjQwn5cZktFw==}
+         version: 1.3.4(bufferutil@4.1.0)(utf-8-validate@6.0.6)
+@@ -930,9 +927,6 @@ packages:
+   '@obsidize/rx-console@6.2.1':
+     resolution: {integrity: sha512-UXa8S8pNoDmyZ9x2UjU/GJmqEhJ/LGmAI/2V/3njNBQRIxmDFCIPJIavsRv6x+JueNZ4mU1wHE0gU7paT5iWrA==}
  
--  '@paymoapp/electron-shutdown-handler@1.1.2':
--    resolution: {integrity: sha512-/MIC+wdRlVw1Sm56qJcT17O/KBpQARP2tOcAgg1OKB4W83B9IyBBtIoLXkRlpCOEJnGEleuv5HiSBryUgwbFvQ==}
+-  '@paymoapp/electron-shutdown-handler@1.1.3':
+-    resolution: {integrity: sha512-DfsuC7d1F07oNzzCcarSi0oNRd6NI9elCa3Ge1iWwqttJRJC/kuBbbYEalf6tSeCEK8D6Q+5reabkkexBKjB/w==}
 -
-   '@peculiar/asn1-cms@2.6.1':
-     resolution: {integrity: sha512-vdG4fBF6Lkirkcl53q6eOdn3XYKt+kJTG59edgRZORlg/3atWWEReRCx5rYE1ZzTTX6vLK5zDMjHh7vbrcXGtw==}
+   '@peculiar/asn1-cms@2.7.0':
+     resolution: {integrity: sha512-hew63shtzzvBcSHbhm+cyAmKe6AIfinT9hzEqSPjDC6opTTMKmTkQ0gHuN2KsWlvqiKw1S/fS94fhag/FJkioQ==}
  
-@@ -4112,9 +4106,6 @@ packages:
+@@ -3961,9 +3955,6 @@ packages:
    node-addon-api@4.3.0:
      resolution: {integrity: sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==}
  
@@ -120,7 +120,19 @@ index c373d877..e774678a 100644
    node-addon-api@6.1.0:
      resolution: {integrity: sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==}
  
-@@ -10823,8 +10814,6 @@ snapshots:
+@@ -6812,11 +6803,6 @@ snapshots:
+ 
+   '@obsidize/rx-console@6.2.1': {}
+ 
+-  '@paymoapp/electron-shutdown-handler@1.1.3':
+-    dependencies:
+-      node-addon-api: 5.1.0
+-      prebuild-install: 7.1.3
+-
+   '@peculiar/asn1-cms@2.7.0':
+     dependencies:
+       '@peculiar/asn1-schema': 2.7.0
+@@ -10388,8 +10374,6 @@ snapshots:
  
    node-addon-api@4.3.0: {}
  
@@ -130,5 +142,5 @@ index c373d877..e774678a 100644
  
    node-api-version@0.2.1:
 -- 
-2.53.0
+2.54.0
 

pkgs/by-name/sh/shiru/package.nix

@@ -5,7 +5,7 @@
   nodejs,
   fetchFromGitHub,
   python3,
-  electron_39,
+  electron_42,
   makeDesktopItem,
   makeBinaryWrapper,
   copyDesktopItems,
@@ -15,17 +15,17 @@
 }:
 let
   pnpm = pnpm_10;
-  electron = electron_39;
+  electron = electron_42;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "shiru";
-  version = "6.6.0";
+  version = "6.7.0";
 
   src = fetchFromGitHub {
     owner = "RockinChaos";
     repo = "shiru";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LccI6Z4hhkmzWHt0CKum9giJMVGm3qM0ZKNvChUCYQ4=";
+    hash = "sha256-+qXbtRucviNvdZYqIh/CjYX0AGIIxAmw8V5j41BocGE=";
   };
 
   patches = [
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
       cd electron
     '';
     fetcherVersion = 3;
-    hash = "sha256-bTo6sEQuUghwm2I99WB7+akL4AOZ1ZN2ovaLWrd5MMg=";
+    hash = "sha256-y+CWr/YLmDjB9GDTFlsMni7uGAME3XOG3GB43KzZxOQ=";
   };
 
   buildPhase = ''

pkgs/by-name/sn/snmalloc/package.nix

@@ -9,12 +9,12 @@
 
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "snmalloc";
-  version = "0.7.4";
+  version = "0.7.5";
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "snmalloc";
     tag = finalAttrs.version;
-    hash = "sha256-+UCqUrfvhnB4leiYCnGJ8ORfVkTaGimaErP56XCJ5PM=";
+    hash = "sha256-1wgQilYHYjmKqhUhxA0wXF+OBPRH+hDPgVGMgVxqj4Y=";
   };
 
   outputs = [

pkgs/by-name/sq/sqlit-tui/package.nix

@@ -28,7 +28,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     duckdb
     keyring
     mariadb
-    mysql-connector
+    mysql-connector-python
     oracledb
     paramiko
     psycopg2

pkgs/by-name/sq/sqlite3-to-mysql/package.nix

@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   dependencies = with python3Packages; [
     click
-    mysql-connector
+    mysql-connector-python
     pytimeparse2
     pymysql
     pymysqlsa

pkgs/by-name/st/statix/package.nix

@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "statix";
-  version = "0.5.8-unstable-2026-06-13";
+  version = "0.5.8-unstable-2026-06-22";
 
   src = fetchFromGitHub {
     owner = "molybdenumsoftware";
     repo = "statix";
-    rev = "127a42f761909e5caa79f616a353e9b6e1a0587f";
-    hash = "sha256-epwk3oW5A0ttTKSO2zgC50PkD9mTFjLtDlofTIeOdf8=";
+    rev = "5d23643fcb0aea7372f7b598b3edb3e2bd8adf83";
+    hash = "sha256-woMMDcjiFgcbRt3Ywb5cOPv2P8S4+NqC6W6i8q1j4rU=";
   };
 
-  cargoHash = "sha256-bsy8p8zbfQ7EjXCDwFbVaq4qN8aEsp27Jcn9zfW2eXw=";
+  cargoHash = "sha256-p3A88MMt3GkcC1shCNC8DmiXQCMXrWd+hA36D7VRZOE=";
 
   buildFeatures = lib.optional withJson "json";
 

pkgs/by-name/su/super-productivity/package.nix

@@ -20,7 +20,7 @@ let
 in
 buildNpmPackage rec {
   pname = "super-productivity";
-  version = "18.12.0";
+  version = "18.12.1";
 
   inherit nodejs;
 
@@ -28,7 +28,7 @@ buildNpmPackage rec {
     owner = "johannesjo";
     repo = "super-productivity";
     tag = "v${version}";
-    hash = "sha256-v4/fPfgiUMOWAcmWdr13oCmu7NTZI3ki6uWJPWTcWzM=";
+    hash = "sha256-19wMmVKHnnSUsu2xOplNY3HeDhoOdFgX05I5XKTwRhM=";
   };
 
   # Use custom fetcher for deps because super-productivity uses multiple
@@ -74,7 +74,7 @@ buildNpmPackage rec {
       dontInstall = true;
 
       outputHashMode = "recursive";
-      hash = "sha256-inutOgoQ+xvdVizK2ff6Ro4F/5n4l6dAYjfXJTHWfpo=";
+      hash = "sha256-MBlILswZWTpfjHxazTyH72vYUrJ/9ZD3Kdcix/yFNJ0=";
     }
   );
 

pkgs/by-name/vi/viddy/package.nix

@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -11,26 +12,39 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "sachaos";
     repo = "viddy";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-RyPG8OAg3i9N2Fq5Hij48wMvfQuTNmJFpatvB3HbXKg=";
   };
 
   cargoHash = "sha256-P+TtxV2kuHeBHr8GQeJ0VWPkjimfcAtBUFt0z79ML6A=";
 
-  env.VERGEN_BUILD_DATE = "2024-11-28"; # managed via the update script
-  env.VERGEN_GIT_DESCRIBE = "Nixpkgs";
+  __structuredAttrs = true;
 
-  passthru.updateScript.command = [ ./update.sh ];
+  env = {
+    VERGEN_BUILD_DATE = "2026-06-14"; # managed via the update script
+    VERGEN_GIT_DESCRIBE = "Nixpkgs";
+  };
+
+  doInstallCheck = true;
+  versionCheckProgramArg = "-V";
+  versionCheckKeepEnvironment = [ "VIDDY_DATA" ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  preInstallCheck = ''
+    export VIDDY_DATA="$PWD";
+  '';
+
+  passthru.updateScript = ./update.sh;
 
   meta = {
+    changelog = "https://github.com/sachaos/viddy/releases/tag/${finalAttrs.src.rev}";
     description = "Modern `watch` command";
-    changelog = "https://github.com/sachaos/viddy/releases";
     homepage = "https://github.com/sachaos/viddy";
     license = lib.licenses.mit;
+    mainProgram = "viddy";
     maintainers = with lib.maintainers; [
       j-hui
       phanirithvij
     ];
-    mainProgram = "viddy";
   };
 })

pkgs/development/python-modules/logfire/default.nix

@@ -42,7 +42,7 @@
   inline-snapshot,
   logfire-api,
   loguru,
-  mysql-connector,
+  mysql-connector-python,
   openai-agents,
   pandas,
   psycopg,
@@ -138,7 +138,7 @@ buildPythonPackage (finalAttrs: {
     inline-snapshot
     logfire-api
     loguru
-    mysql-connector
+    mysql-connector-python
     openai-agents
     pandas
     psycopg

pkgs/development/python-modules/lookup-license/default.nix

@@ -0,0 +1,89 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  appdirs,
+  cachetools,
+  diskcache,
+  foss-flame,
+  license-expression,
+  packageurl-python,
+  python-magic,
+  requests,
+  scancode-toolkit,
+  xmltodict,
+
+  # tests
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "lookup-license";
+  version = "0.1.30";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "hesa";
+    repo = "lookup-license";
+    tag = finalAttrs.version;
+    hash = "sha256-zFDqh62bjYkO3Duze3suS8LlrlzuqQes7ZaH+9G+yQ4=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    appdirs
+    cachetools
+    diskcache
+    foss-flame
+    license-expression
+    packageurl-python
+    python-magic
+    requests
+    scancode-toolkit
+    xmltodict
+  ];
+
+  pythonRelaxDeps = [
+    "requests"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  disabledTests = [
+    # UnboundLocalError: cannot access local variable 'ret' where it is not associated with a value
+    "test_lookup_license_url_bad"
+    "test_lookup_license_url_good"
+  ];
+
+  pythonImportsCheck = [
+    "lookup_license"
+  ];
+
+  meta = {
+    description = "Python tool to identify license from license text";
+    homepage = "https://github.com/hesa/lookup-license";
+    changelog = "https://github.com/hesa/lookup-license/releases/tag/${finalAttrs.src.tag}";
+    mainProgram = "lookup-license";
+    license = with lib.licenses; [
+      gpl3Only
+      asl20
+      cc-by-40
+      gpl3Plus
+    ];
+    maintainers = with lib.maintainers; [ eljamm ];
+    teams = with lib.teams; [ ngi ];
+  };
+})

pkgs/development/python-modules/mysql-connector-python/default.nix

@@ -10,7 +10,7 @@
 }:
 
 buildPythonPackage rec {
-  pname = "mysql-connector";
+  pname = "mysql-connector-python";
   version = "9.7.0";
   format = "setuptools";
 

pkgs/development/python-modules/peewee/default.nix

@@ -8,7 +8,7 @@
   python,
   sqlite,
   withMysql ? false,
-  mysql-connector,
+  mysql-connector-python,
   withPostgres ? false,
   psycopg2,
   setuptools,
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     apsw
   ]
   ++ lib.optionals withPostgres [ psycopg2 ]
-  ++ lib.optionals withMysql [ mysql-connector ];
+  ++ lib.optionals withMysql [ mysql-connector-python ];
 
   nativeCheckInputs = [ flask ];
 

pkgs/development/python-modules/pyotb/default.nix

@@ -37,14 +37,14 @@ let
 in
 buildPythonPackage rec {
   pname = "pyotb";
-  version = "2.1.0";
+  version = "2.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "orfeotoolbox";
     repo = "pyotb";
     tag = version;
-    hash = "sha256-KomIMVx4jfsTSbGtoml9ON/82sHanOkp/mp1TiUaa2E=";
+    hash = "sha256-TDBhMCdO3kGjbysYZN9un7Y8YY+dGlHw5Vj/ZJVPXdk=";
   };
 
   postPatch = ''
@@ -72,6 +72,8 @@ buildPythonPackage rec {
 
   dependencies = [ otbWithPy ];
 
+  pythonRelaxDeps = [ "numpy" ];
+
   pythonImportsCheck = [ "pyotb" ];
 
   nativeCheckInputs = [

pkgs/development/python-modules/sqlalchemy/1_4.nix

@@ -17,7 +17,7 @@
   cx-oracle,
   mariadb,
   mypy,
-  mysql-connector,
+  mysql-connector-python,
   mysqlclient,
   pg8000,
   psycopg2,
@@ -63,7 +63,7 @@ buildPythonPackage rec {
     ];
     mssql_pyodbc = [ pyodbc ];
     mysql = [ mysqlclient ];
-    mysql_connector = [ mysql-connector ];
+    mysql_connector = [ mysql-connector-python ];
     mariadb_connector = [ mariadb ];
     oracle = [ cx-oracle ];
     postgresql = [ psycopg2 ];

pkgs/development/python-modules/sqlalchemy/default.nix

@@ -22,7 +22,7 @@
   cx-oracle,
   mariadb,
   mypy,
-  mysql-connector,
+  mysql-connector-python,
   mysqlclient,
   oracledb,
   pg8000,
@@ -74,7 +74,7 @@ buildPythonPackage (finalAttrs: {
     mssql_pymysql = [ pymssql ];
     mssql_pyodbc = [ pyodbc ];
     mysql = [ mysqlclient ];
-    mysql_connector = [ mysql-connector ];
+    mysql_connector = [ mysql-connector-python ];
     mariadb_connector = [ mariadb ];
     oracle = [ cx-oracle ];
     oracle_oracledb = [ oracledb ];

pkgs/development/python-modules/web/default.nix

@@ -8,7 +8,7 @@
   dbutils,
   mysqlclient,
   pymysql,
-  mysql-connector,
+  mysql-connector-python,
   psycopg2,
 }:
 
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     dbutils
     mysqlclient
     pymysql
-    mysql-connector
+    mysql-connector-python
     psycopg2
   ];
 

pkgs/servers/kanidm/1_10.nix

@@ -1,5 +1,5 @@
 import ./generic.nix {
-  version = "1.10.3";
-  hash = "sha256-xf8/fHMkGGApPpKoOgpUJtttorOjf51E/S5KKguwiTM=";
-  cargoHash = "sha256-zu2uKtJnMi8En5btKQWgACs3mLkHnbrxA5XUkwLP+yc=";
+  version = "1.10.4";
+  hash = "sha256-+PutvVt7mqnZN+/vr0FwstB8JPuO3kJ4TSmX2Sx8WvA=";
+  cargoHash = "sha256-rfANfheiQnHEcbBODRW0nrPrlPdWQx3S7NmSQ50q010=";
 }

pkgs/top-level/python-aliases.nix

@@ -371,6 +371,7 @@ mapAliases {
   mullvad-closest = throw "'mullvad-closest' has been removed as it was unmaintained. Consider using 'mullvad-compass' instead."; # Added 2026-01-13
   multi_key_dict = throw "'multi_key_dict' has been renamed to/replaced by 'multi-key-dict'"; # Converted to throw 2025-10-29
   mutag = throw "mutag has been removed because it is unmaintained since 2018"; # added 2025-05-25
+  mysql-connector = mysql-connector-python; # added 2026-06-21
   net2grid = throw "'net2grid' has been renamed to/replaced by 'gridnet'"; # Converted to throw 2025-10-29
   ninja-python = throw "'ninja-python' has been renamed to/replaced by 'ninja'"; # Converted to throw 2025-10-29
   nitpick = throw "'nitpick' has been removed because it was unmaintained upstream since 2017 and using python2"; # added 2025-08-25

pkgs/top-level/python-packages.nix

@@ -9514,6 +9514,8 @@ self: super: with self; {
 
   london-tube-status = callPackage ../development/python-modules/london-tube-status { };
 
+  lookup-license = callPackage ../development/python-modules/lookup-license { };
+
   lookyloo-models = callPackage ../development/python-modules/lookyloo-models { };
 
   loompy = callPackage ../development/python-modules/loompy { };
@@ -11010,7 +11012,7 @@ self: super: with self; {
 
   mypyllant = callPackage ../development/python-modules/mypyllant { };
 
-  mysql-connector = callPackage ../development/python-modules/mysql-connector { };
+  mysql-connector-python = callPackage ../development/python-modules/mysql-connector-python { };
 
   mysqlclient = callPackage ../development/python-modules/mysqlclient { };