Merge remote-tracking branch 'origin/master' into staging-next

2025-06-09 19:13:26 +03:00 · 2025-05-03 17:36:14 +03:00 · 2025-05-03 17:36:14 +03:00 · 328d7e75d7
commit 328d7e75d7
parent f0528df585 bd04914cf9
89 changed files with 4406 additions and 567 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -4213,6 +4213,12 @@
    githubId = 40013212;
    name = "Han Jeongjun";
  };
+  ch4og = {
+    email = "mitanick@ya.ru";
+    github = "ch4og";
+    githubId = 32384814;
+    name = "Nikita Mitasov";
+  };
  chaduffy = {
    email = "charles@dyfis.net";
    github = "charles-dyfis-net";
@ -10322,6 +10328,12 @@
    githubId = 7481521;
    name = "Balázs Lengyel";
  };
+  ik-nz = {
+    email = "me@igk.nz";
+    github = "ik-nz";
+    githubId = 207392575;
+    name = "Isaac Kabel";
+  };
  ilarvne = {
    email = "ilarvne@proton.me";
    github = "ilarvne";
--- a/pkgs/applications/audio/ardour/7.nix
+++ b/pkgs/applications/audio/ardour/7.nix
@ -7,7 +7,7 @@
  fetchpatch2,
  alsa-lib,
  aubio,
-  boost,
+  boost186,
  cairomm,
  cppunit,
  curl,
@ -127,7 +127,7 @@ stdenv.mkDerivation rec {
    [
      alsa-lib
      aubio
-      boost
+      boost186
      cairomm
      cppunit
      curl
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -5593,6 +5593,8 @@ let
        };
      };

+      yy0931.vscode-sqlite3-editor = callPackage ./yy0931.vscode-sqlite3-editor { };
+
      yzane.markdown-pdf = callPackage ./yzane.markdown-pdf { };

      yzhang.dictionary-completion = buildVscodeMarketplaceExtension {
--- a/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix
@ -0,0 +1,20 @@
+{
+  lib,
+  vscode-utils,
+}:
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "vscode-sqlite3-editor";
+    publisher = "yy0931";
+    version = "1.0.207";
+    hash = "sha256-HToO43MnqJlWcKx4O5C0b7RXyeKY5PzxMY5/3cNOtgE=";
+  };
+  meta = {
+    changelog = "https://marketplace.visualstudio.com/items/yy0931.vscode-sqlite3-editor/changelog";
+    description = "SQLite3 Editor for VSCode";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=yy0931.vscode-sqlite3-editor";
+    homepage = "https://github.com/yy0931/sqlite3-editor";
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.ch4og ];
+  };
+}
--- a/pkgs/applications/science/electronics/degate/default.nix
+++ b/pkgs/applications/science/electronics/degate/default.nix
@ -4,7 +4,7 @@
  fetchFromGitHub,
  fetchpatch,
  cmake,
-  boost,
+  boost183,
  qtbase,
  qtimageformats,
  qttools,
@ -12,7 +12,7 @@
 }:

 let
-  boost_static = boost.override { enableStatic = true; };
+  boost_static = boost183.override { enableStatic = true; };

 in
 stdenv.mkDerivation rec {
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@ -48,8 +48,8 @@ mkDerivation rec {
  src = fetchFromGitHub {
    owner = "MythTV";
    repo = "mythtv";
-    rev = "v${version}";
-    hash = "sha256-ZhVlDX5I6SJEntVg30Iy/XxgsorDjFycAt2uksJMJps=";
+    tag = "v${version}";
+    hash = "sha256-4mWtPJi2CBoek8LWEfdFxe1ybomAOCTWBTKExMm7nLU=";
  };

  patches = [
--- a/pkgs/by-name/ac/action-validator/package.nix
+++ b/pkgs/by-name/ac/action-validator/package.nix
@ -2,22 +2,28 @@
  lib,
  rustPlatform,
  fetchFromGitHub,
+  unstableGitUpdater,
 }:

-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
  pname = "action-validator";
-  version = "0.6.0";
+  version = "0.6.0-unstable-2025-02-16";

  src = fetchFromGitHub {
    owner = "mpalmer";
    repo = "action-validator";
-    rev = "v${version}";
-    hash = "sha256-lJHGx/GFddIwVVXRj75Z/l5CH/yuw/uIhr02Qkjruww=";
+    rev = "2f8be1d2066eb3687496a156d00b4f1b3ea7b028";
+    hash = "sha256-QDnikgAfkrvn7/vnmgTQ5J8Ro2HZ6SVkp9cPUYgejqM=";
    fetchSubmodules = true;
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-dy66ZkU9lIYGe9T3oR8m5cGcBQO5MF1KsLjfaHTtvlY=";
+  cargoHash = "sha256-FuJ5NzeZhfN312wK5Q1DgIXUAN6hqxu/1BhGqasbdS8=";
+
+  passthru.updateScript = unstableGitUpdater {
+    tagPrefix = "v";
+    branch = "main";
+  };

  meta = with lib; {
    description = "Tool to validate GitHub Action and Workflow YAML files";
--- a/pkgs/by-name/ag/age-plugin-1p/package.nix
+++ b/pkgs/by-name/ag/age-plugin-1p/package.nix
@ -0,0 +1,33 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "age-plugin-1p";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "Enzime";
+    repo = "age-plugin-1p";
+    tag = "v${version}";
+    hash = "sha256-QYHHD7wOgRxRVkUOjwMz5DV8oxlb9mmb2K4HPoISguU=";
+  };
+
+  vendorHash = "sha256-WrdwhlaqciVEB2L+Dh/LEeSE7I3+PsOTW4c+0yOKzKY=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = with lib; {
+    description = "Use SSH keys from 1Password with age";
+    mainProgram = "age-plugin-1p";
+    homepage = "https://github.com/Enzime/age-plugin-1p";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ Enzime ];
+  };
+}
--- a/pkgs/by-name/ag/age/package.nix
+++ b/pkgs/by-name/ag/age/package.nix
@ -3,12 +3,13 @@
  buildGoModule,
  fetchFromGitHub,
  installShellFiles,
-  age-plugin-tpm,
+  age-plugin-fido2-hmac,
+  age-plugin-ledger,
  age-plugin-se,
  age-plugin-sss,
-  age-plugin-ledger,
+  age-plugin-tpm,
  age-plugin-yubikey,
-  age-plugin-fido2-hmac,
+  age-plugin-1p,
  makeWrapper,
  runCommand,
 }:
@ -59,12 +60,13 @@ buildGoModule (final: {
  # group age plugins together
  passthru.plugins = {
    inherit
-      age-plugin-tpm
+      age-plugin-fido2-hmac
+      age-plugin-ledger
      age-plugin-se
      age-plugin-sss
-      age-plugin-ledger
+      age-plugin-tpm
      age-plugin-yubikey
-      age-plugin-fido2-hmac
+      age-plugin-1p
      ;
  };

--- a/pkgs/by-name/ar/artisan/package.nix
+++ b/pkgs/by-name/ar/artisan/package.nix
@ -2,14 +2,15 @@
  lib,
  appimageTools,
  fetchurl,
+  nix-update-script,
 }:
 let
  pname = "artisan";
-  version = "3.1.2";
+  version = "3.1.4";

  src = fetchurl {
    url = "https://github.com/artisan-roaster-scope/artisan/releases/download/v${version}/${pname}-linux-${version}.AppImage";
-    hash = "sha256-HwzTxuE7aRuXrI7BbySFgYGu74uw3JyBs91iPNGT2Jg=";
+    hash = "sha256-GU9DCAIMioPRUC1IDu8SbhD802pWEH7MlALnQH+Y4oU=";
  };

  appimageContents = appimageTools.extract {
@ -24,6 +25,10 @@ appimageTools.wrapType2 {
    install -m 444 -D ${appimageContents}/artisan.png $out/share/applications/artisan.png
  '';

+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version-regex=v([\\d.]+)" ];
+  };
+
  meta = {
    description = "visual scope for coffee roasters";
    homepage = "https://artisan-scope.org/";
--- a/pkgs/by-name/aw/awsebcli/package.nix
+++ b/pkgs/by-name/aw/awsebcli/package.nix
@ -25,14 +25,14 @@ in

 python.pkgs.buildPythonApplication rec {
  pname = "awsebcli";
-  version = "3.23.2";
+  version = "3.23.3";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "aws";
    repo = "aws-elastic-beanstalk-cli";
    tag = version;
-    hash = "sha256-nZP3eepp3hUT2hCxz75vTP1N2akOZPQhyFRN6ecJvU4=";
+    hash = "sha256-Jaj90NRCwaxRQQlB4s4Us+liYiNohpwRsHuvKM5WmbU=";
  };

  pythonRelaxDeps = [
--- a/pkgs/by-name/ca/cargo-seek/package.nix
+++ b/pkgs/by-name/ca/cargo-seek/package.nix
@ -0,0 +1,51 @@
+{
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+  openssl,
+  pkg-config,
+  rustPlatform,
+  writableTmpDirAsHomeHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "cargo-seek";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "tareqimbasher";
+    repo = "cargo-seek";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-SDVAi4h+/ebGX+8M66Oyd0LfQn+J7/QhDW97ZBdoN14=";
+  };
+
+  cargoHash = "sha256-DyXRbtvCJte7mCQKusipeikr981vMHPEVYcGSwVI5Kg=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+  ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ writableTmpDirAsHomeHook ];
+  # We cannot use `versionCheckHook` here since access to the $HOME directory is required.
+  installCheckPhase = ''
+    runHook preInstallCheck
+    $out/bin/cargo-seek --version | grep "${finalAttrs.version}"
+    runHook postInstallCheck
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Terminal user interface for searching, adding and installing cargo crates";
+    homepage = "https://github.com/tareqimbasher/cargo-seek";
+    changelog = "https://github.com/tareqimbasher/cargo-seek/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ qwqawawow ];
+    mainProgram = "cargo-seek";
+  };
+})
--- a/pkgs/by-name/cl/clusternet/package.nix
+++ b/pkgs/by-name/cl/clusternet/package.nix
@ -1,10 +1,10 @@
 {
  lib,
  fetchFromGitHub,
-  buildGoModule,
+  buildGo123Module,
 }:

-buildGoModule rec {
+buildGo123Module rec {
  pname = "clusternet";
  version = "0.17.3";

--- a/pkgs/by-name/fl/flexget/package.nix
+++ b/pkgs/by-name/fl/flexget/package.nix
@ -7,14 +7,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "flexget";
-  version = "3.15.37";
+  version = "3.15.38";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "Flexget";
    repo = "Flexget";
    tag = "v${version}";
-    hash = "sha256-g/RFU2HT4SjiexbfBFkYp7N3qqvoBxJiIwxZQ3+//5s=";
+    hash = "sha256-quEqpF5oj1FLmQrIS4t3HwS23/m/QH/ZVijlQapt5Mc=";
  };

  pythonRelaxDeps = true;
--- a/pkgs/by-name/fo/folio/package.nix
+++ b/pkgs/by-name/fo/folio/package.nix
@ -16,13 +16,13 @@

 stdenv.mkDerivation rec {
  pname = "folio";
-  version = "25.01";
+  version = "25.02";

  src = fetchFromGitHub {
    owner = "toolstack";
    repo = "Folio";
    tag = version;
-    hash = "sha256-EfZMHoF6xyRaxrLDLkBb07fvUxSQFDFViQJ2y68YhZg=";
+    hash = "sha256-u7HieTsbSohCjpLNyeY/ZZdmpQWulZaCkxOV5a5QyBY=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/fo/forgejo/lts.nix
+++ b/pkgs/by-name/fo/forgejo/lts.nix
@ -1,8 +1,8 @@
 import ./generic.nix {
-  version = "11.0.0";
-  hash = "sha256-j/SmfWFfYDApqGXcH/gRF6c7gUCTkLYFTglgtdq9u/U=";
+  version = "11.0.1";
+  hash = "sha256-hsJfJOJ6mTIGGV+0YwSA9SYsLXxI1VTXzc+SyXJJ69Q=";
  npmDepsHash = "sha256-laHHXq59/7+rJSYTD1Aq/AvFcio6vsnWkeV8enq3yTg=";
-  vendorHash = "sha256-REHrSuvAB5fbJ1WR+rggGZUSMy0FWnAkQQbTIqN2K2E=";
+  vendorHash = "sha256-8fa6l89+6NhVsi6VuTvQs35E3HuiBFxM8NUQ/jzlzV0=";
  lts = true;
  nixUpdateExtraArgs = [
    "--override-filename"
--- a/pkgs/by-name/gd/gdal/package.nix
+++ b/pkgs/by-name/gd/gdal/package.nix
@ -292,6 +292,8 @@ stdenv.mkDerivation (finalAttrs: {
    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      # flaky on macos
      "test_rda_download_queue"
+      # https://github.com/OSGeo/gdal/commit/fa0ac7544af837613e9831d4d2841dd6bf735e1f
+      "test_ogr_gpkg_arrow_stream_huge_array"
    ]
    ++ lib.optionals (lib.versionOlder proj.version "8") [
      "test_ogr_parquet_write_crs_without_id_in_datum_ensemble_members"
--- a/pkgs/by-name/gi/gitleaks/package.nix
+++ b/pkgs/by-name/gi/gitleaks/package.nix
@ -11,13 +11,13 @@

 buildGoModule rec {
  pname = "gitleaks";
-  version = "8.24.3";
+  version = "8.25.1";

  src = fetchFromGitHub {
    owner = "zricethezav";
    repo = "gitleaks";
    tag = "v${version}";
-    hash = "sha256-P5PHugSYkC6GSxbbsuA8nvPn9fLjTJOU3yOecntAVEE=";
+    hash = "sha256-ji13lmGrtJeQuOYi2HsFICs2XUZdmWgsgVrWj/Shh/c=";
  };

  vendorHash = "sha256-MSF9N9kXsIM2WKsjKAVztYypwGPng2EElHx7p6vADqc=";
--- a/pkgs/by-name/gm/gmni/package.nix
+++ b/pkgs/by-name/gm/gmni/package.nix
@ -1,41 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromSourcehut,
-  bearssl,
-  scdoc,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gmni";
-  version = "1.0";
-
-  src = fetchFromSourcehut {
-    owner = "~sircmpwn";
-    repo = "gmni";
-    rev = version;
-    sha256 = "sha256-3MFNAI/SfFigNfitfFs3o9kkz7JeEflMHiH7iJpLfi4=";
-  };
-
-  nativeBuildInputs = [ scdoc ];
-  buildInputs = [ bearssl ];
-
-  # Fix build on `gcc-13`:
-  #       inlined from 'xt_end_chain' at src/tofu.c:82:3,
-  #   ...-glibc-2.38-27-dev/include/bits/stdio2.h:54:10: error: '__builtin___snprintf_chk' specified bound 4 exceeds destination size 3 [-Werror=stringop-overflow]
-  #
-  # The overflow will not happen in practice, but `snprintf()` gets
-  # passed one more byte than available.
-  hardeningDisable = [ "fortify3" ];
-
-  meta = with lib; {
-    description = "Gemini client";
-    homepage = "https://git.sr.ht/~sircmpwn/gmni";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
-      bsima
-      jb55
-    ];
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/by-name/go/gokapi/go-1.24.patch
+++ b/pkgs/by-name/go/gokapi/go-1.24.patch
@ -0,0 +1,13 @@
+diff --git a/build/go-generate/copyStaticFiles.go b/build/go-generate/copyStaticFiles.go
+index 9f8a049..de21bdd 100644
+--- a/build/go-generate/copyStaticFiles.go
+++ b/build/go-generate/copyStaticFiles.go
+@@ -10,7 +10,7 @@ import (
+ )
+ 
+ func main() {
+-	copyFile(build.Default.GOROOT+"/misc/wasm/wasm_exec.js", "../../internal/webserver/web/static/js/wasm_exec.js")
+	copyFile(build.Default.GOROOT+"/lib/wasm/wasm_exec.js", "../../internal/webserver/web/static/js/wasm_exec.js")
+ 	copyFile("../../go.mod", "../../build/go.mod")
+ 	copyFile("../../openapi.json", "../../internal/webserver/web/static/apidocumentation/openapi.json")
+ }
--- a/pkgs/by-name/go/gokapi/package.nix
+++ b/pkgs/by-name/go/gokapi/package.nix
@ -20,6 +20,10 @@ buildGoModule rec {

  vendorHash = "sha256-9GRAlgng+yq7q0VQz374jIOCjeDIIDD631BglM/FsQQ=";

+  patches = [
+    ./go-1.24.patch
+  ];
+
  # This is the go generate is ran in the upstream builder, but we have to run the components separately for things to work.
  preBuild = ''
    cd ./cmd/gokapi/
--- a/pkgs/by-name/gr/grap/package.nix
+++ b/pkgs/by-name/gr/grap/package.nix
@ -2,7 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  boost,
+  boost183,
  libseccomp,
  flex,
  swig,
@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
  ];

  buildInputs = [
-    boost.all
+    boost183.all
    libseccomp
  ];

--- a/pkgs/by-name/ig/ignition/fix-gjs.patch
+++ b/pkgs/by-name/ig/ignition/fix-gjs.patch
@ -0,0 +1,26 @@
+diff --git a/src/io.github.flattool.Ignition.in b/src/io.github.flattool.Ignition.in
+index 5c71c3c..0b2ec00 100644
+--- a/src/io.github.flattool.Ignition.in
+++ b/src/io.github.flattool.Ignition.in
+@@ -1,7 +1,8 @@
+-#!@GJS@ -m
+#!/usr/bin/env gjs -m
+ 
+ import { exit, programArgs, programInvocationName } from "system";
+ 
+imports.package._findEffectiveEntryPointName = () => 'io.github.flattool.Ignition';
+ imports.package.init({
+   name: "@PACKAGE_NAME@",
+   version: "@PACKAGE_VERSION@",
+diff --git a/src/meson.build b/src/meson.build
+index 488fa06..751f8ed 100644
+--- a/src/meson.build
+++ b/src/meson.build
+@@ -23,7 +23,6 @@ data_res = gnome.compile_resources('io.github.flattool.Ignition.data',
+ )
+ 
+ bin_conf = configuration_data()
+-bin_conf.set('GJS', find_program('gjs').full_path())
+ bin_conf.set('PACKAGE_VERSION', meson.project_version())
+ bin_conf.set('PACKAGE_NAME', meson.project_name())
+ bin_conf.set('prefix', get_option('prefix'))
--- a/pkgs/by-name/ig/ignition/package.nix
+++ b/pkgs/by-name/ig/ignition/package.nix
@ -0,0 +1,66 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+
+  appstream,
+  blueprint-compiler,
+  desktop-file-utils,
+  gettext,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook4,
+
+  gjs,
+  gtk4,
+  libadwaita,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ignition";
+  version = "1.1.3";
+
+  src = fetchFromGitHub {
+    owner = "flattool";
+    repo = "ignition";
+    tag = finalAttrs.version;
+    hash = "sha256-XVBlwonMHb78XF6mpPYLJ68E5Tb+dFVFqNSsVCCS0xc=";
+  };
+
+  patches = [
+    # Don't use find_program for detecting gjs. (we don't want to use the build-platform's gjs binary)
+    # We instead rely on the fact that fixupPhase uses patchShebangs on the script.
+    # Also, we manually set the effective entrypoint to make gjs properly find our binary.
+    ./fix-gjs.patch
+  ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    appstream
+    blueprint-compiler
+    desktop-file-utils
+    gettext
+    gtk4
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    gjs
+    gtk4
+    libadwaita
+  ];
+
+  meta = {
+    description = "Manage startup apps and scripts";
+    homepage = "https://github.com/flattool/ignition";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ tomasajt ];
+    mainProgram = "io.github.flattool.Ignition";
+    platforms = lib.platforms.linux;
+  };
+})
--- a/pkgs/by-name/io/iotas/package.nix
+++ b/pkgs/by-name/io/iotas/package.nix
@ -20,15 +20,15 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "iotas";
-  version = "0.9.5";
+  version = "0.11.0";
  pyproject = false;

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    owner = "World";
    repo = "iotas";
-    rev = version;
-    hash = "sha256-SDapnAGPTi7tnzl3zeNJw2CABhVVAXMyn1bllg8fChw=";
+    tag = version;
+    hash = "sha256-9YYKVBjidHBWyUqFvxo3tNx5DQkpililCDLZofESYRw=";
  };

  nativeBuildInputs = [
@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec {
    webkitgtk_6_0
  ];

-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
    pygobject3
    pygtkspellcheck
    requests
--- a/pkgs/by-name/ju/just-lsp/package.nix
+++ b/pkgs/by-name/ju/just-lsp/package.nix
@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "just-lsp";
-  version = "0.2.0";
+  version = "0.2.1";

  src = fetchFromGitHub {
    owner = "terror";
    repo = "just-lsp";
    tag = finalAttrs.version;
-    hash = "sha256-c/fdj4lEmID4u97fGPXnPLULS7Rxe6P8icmsfjGjT+w=";
+    hash = "sha256-MBkuLvMwAH0858X0TRAK1pL/JwsTIY/6Ra+Vd6X0odA=";
  };

-  cargoHash = "sha256-qPMtYaCvSAnLXrLX20QKbgXo9L1HYxJW4uZIzXhpD/A=";
+  cargoHash = "sha256-gVxWy8SGvAaavrdZHK/9aKfPAXUtfs98TyFKFkFa3+U=";

  passthru = {
    updateScript = nix-update-script { };
--- a/pkgs/by-name/la/lazygit/package.nix
+++ b/pkgs/by-name/la/lazygit/package.nix
@ -8,13 +8,13 @@
 }:
 buildGoModule rec {
  pname = "lazygit";
-  version = "0.49.0";
+  version = "0.50.0";

  src = fetchFromGitHub {
    owner = "jesseduffield";
    repo = pname;
    tag = "v${version}";
-    hash = "sha256-hNEznDz+DHalKgmz1fXFivf9T1YJ/jfwcD4baTUO4Cw=";
+    hash = "sha256-LxPKV6Zt4R+gsZAp7FXqWnAXjEoaFTn44qJBOpbh0P8=";
  };

  vendorHash = null;
--- a/pkgs/by-name/li/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch
+++ b/pkgs/by-name/li/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch
@ -1,41 +0,0 @@
-From 86fd3be1d31d2e7c09603aa3a8966537ac01bb07 Mon Sep 17 00:00:00 2001
-From: Maximilian Bosch <maximilian@mbosch.me>
-Date: Tue, 11 Aug 2020 20:30:16 +0200
-Subject: [PATCH] Fix RPC compilation when using libtirpc rather than glibc
-
---
- src/block-server.c        | 3 +++
- utils/chop-block-server.c | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/src/block-server.c b/src/block-server.c
-index 3f97417..29b299e 100644
--- a/src/block-server.c
-+++ b/src/block-server.c
-@@ -18,6 +18,9 @@
- 
- /* Server-side stubs.  */
- 
-+#include <rpc/types.h>
-+#include <rpc/xdr.h>
-+#include <rpc/auth.h>
- #include <rpc/svc.h>
- #include <chop/block-server.h>
- 
-diff --git a/utils/chop-block-server.c b/utils/chop-block-server.c
-index a2076c0..9462f5d 100644
--- a/utils/chop-block-server.c
-+++ b/utils/chop-block-server.c
-@@ -19,6 +19,9 @@
-    store, e.g. a GDBM block store, and serves it remotely.  A lot of code is
-    borrowed from `chop-archiver.c'.  */
- 
-+#include <rpc/types.h>
-+#include <rpc/xdr.h>
-+#include <rpc/auth.h>
- #include <chop/chop-config.h>
- 
- #include <alloca.h>
-- 
-2.25.4
-
--- a/pkgs/by-name/li/libchop/gets-undeclared.patch
+++ b/pkgs/by-name/li/libchop/gets-undeclared.patch
@ -1,71 +0,0 @@
-This patch is needed to allow builds with newer versions of
-the GNU libc (2.16+).
-
-
-commit 66712c23388e93e5c518ebc8515140fa0c807348
-Author: Eric Blake <eblake@redhat.com>
-Date:   Thu Mar 29 13:30:41 2012 -0600
-
-    stdio: don't assume gets any more
-    
-    Gnulib intentionally does not have a gets module, and now that C11
-    and glibc have dropped it, we should be more proactive about warning
-    any user on a platform that still has a declaration of this dangerous
-    interface.
-    
-    * m4/stdio_h.m4 (gl_STDIO_H, gl_STDIO_H_DEFAULTS): Drop gets
-    support.
-    * modules/stdio (Makefile.am): Likewise.
-    * lib/stdio-read.c (gets): Likewise.
-    * tests/test-stdio-c++.cc: Likewise.
-    * m4/warn-on-use.m4 (gl_WARN_ON_USE_PREPARE): Fix comment.
-    * lib/stdio.in.h (gets): Make warning occur in more places.
-    * doc/posix-functions/gets.texi (gets): Update documentation.
-    Reported by Christer Solskogen.
-    
-    Signed-off-by: Eric Blake <eblake@redhat.com>
-
-diff --git a/lib/stdio.in.h b/lib/stdio.in.h
-index aa7b599..c377b6e 100644
--- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -698,22 +698,11 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
- # endif
- #endif
- 
-#if @GNULIB_GETS@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef gets
-#   define gets rpl_gets
-#  endif
-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (gets, char *, (char *s));
-# else
-_GL_CXXALIAS_SYS (gets, char *, (char *s));
-#  undef gets
-# endif
-_GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
-   so any use of gets warrants an unconditional warning.  Assume it is
-   always declared, since it is required by C89.  */
-+   so any use of gets warrants an unconditional warning; besides, C11
-+   removed it.  */
-+#undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
- 
-@@ -1053,9 +1042,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - "
- # endif
- #endif
- 
-/* Some people would argue that sprintf should be handled like gets
-   (for example, OpenBSD issues a link warning for both functions),
-   since both can cause security holes due to buffer overruns.
-+/* Some people would argue that all sprintf uses should be warned about
-+   (for example, OpenBSD issues a link warning for it),
-+   since it can cause security holes due to buffer overruns.
-    However, we believe that sprintf can be used safely, and is more
-    efficient than snprintf in those safe cases; and as proof of our
-    belief, we use sprintf in several gnulib modules.  So this header
--- a/pkgs/by-name/li/libchop/package.nix
+++ b/pkgs/by-name/li/libchop/package.nix
@ -1,88 +0,0 @@
-{
-  fetchurl,
-  lib,
-  stdenv,
-  zlib,
-  bzip2,
-  libgcrypt,
-  gdbm,
-  gperf,
-  tdb,
-  gnutls,
-  db,
-  libuuid,
-  lzo,
-  pkg-config,
-  guile,
-  rpcsvc-proto,
-  libtirpc,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libchop";
-  version = "0.5.2";
-
-  src = fetchurl {
-    url = "mirror://savannah/libchop/libchop-${version}.tar.gz";
-    sha256 = "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g";
-  };
-
-  patches = [
-    ./gets-undeclared.patch
-    ./size_t.patch
-    ./0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch
-  ];
-
-  nativeBuildInputs = [
-    pkg-config
-    gperf
-    rpcsvc-proto
-  ];
-
-  env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ];
-  NIX_LDFLAGS = [ "-ltirpc" ];
-
-  buildInputs = [
-    zlib
-    bzip2
-    lzo
-    libgcrypt
-    gdbm
-    db
-    tdb
-    gnutls
-    libuuid
-    guile
-    libtirpc
-  ];
-
-  doCheck = false;
-
-  preConfigure = ''
-    sed -re 's%@GUILE@%&/guile%' -i */Makefile.* Makefile.*
-  '';
-
-  meta = with lib; {
-    description = "Tools & library for data backup and distributed storage";
-
-    longDescription = ''
-      Libchop is a set of utilities and library for data backup and
-      distributed storage.  Its main application is chop-backup, an
-      encrypted backup program that supports data integrity checks,
-      versioning at little cost, distribution among several sites,
-      selective sharing of stored data, adaptive compression, and more.
-      The library itself, which chop-backup builds upon, implements
-      storage techniques such as content-based addressing, content hash
-      keys, Merkle trees, similarity detection, and lossless compression.
-      It makes it easy to combine them in different ways.  The
-      ‘chop-archiver’ and ‘chop-block-server’ tools, illustrated in the
-      manual, provide direct access to these facilities from the command
-      line.  It is written in C and has Guile (Scheme) bindings.
-    '';
-
-    homepage = "https://www.nongnu.org/libchop/";
-    license = licenses.gpl3Plus;
-    maintainers = [ ];
-    platforms = platforms.gnu ++ platforms.linux;
-  };
-}
--- a/pkgs/by-name/li/libchop/size_t.patch
+++ b/pkgs/by-name/li/libchop/size_t.patch
@ -1,11 +0,0 @@
--- a/src/chop.c
-+++ b/src/chop.c
-@@ -539,7 +539,7 @@ extern const chop_class_t chop_gdbm_bloc
-   chop_qdbm_block_iterator_class;
- 
- const struct chop_class_entry *
-chop_lookup_class_entry (const char *str, unsigned int len);
-+chop_lookup_class_entry (const char *str, size_t len);
- 
- /* Include the gperf-generated perfect hash table.  */
- #include "class-lookup.c"
--- a/pkgs/by-name/li/libcmatrix/package.nix
+++ b/pkgs/by-name/li/libcmatrix/package.nix
@ -6,6 +6,7 @@
  libgcrypt,
  libsecret,
  libsoup_3,
+  cmake,
  meson,
  ninja,
  olm,
@ -30,6 +31,8 @@ stdenv.mkDerivation (finalAttrs: {
    meson
    ninja
    pkg-config
+
+    cmake # used by meson to find olm
  ];

  buildInputs = [
@ -42,6 +45,11 @@ stdenv.mkDerivation (finalAttrs: {
    sqlite
  ];

+  prePatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # 0u is not a valid version number on darwin
+    substituteInPlace src/meson.build --replace-fail "soversion: '0u'," "soversion: '0',"
+  '';
+
  meta = {
    changelog = "https://source.puri.sm/Librem5/libcmatrix/-/blob/${finalAttrs.src.tag}/NEWS";
    description = "Matrix protocol library written in C using GObject";
--- a/pkgs/by-name/li/libvpx/package.nix
+++ b/pkgs/by-name/li/libvpx/package.nix
@ -99,10 +99,18 @@ let
  isGeneric =
    (stdenv.hostPlatform.isPower && stdenv.hostPlatform.isLittleEndian)
    || stdenv.hostPlatform.parsed.cpu.name == "armv6l"
+    || stdenv.hostPlatform.isLoongArch64
    || stdenv.hostPlatform.isRiscV;

  target =
-    if (stdenv.hostPlatform.isBSD || stdenv.hostPlatform != stdenv.buildPlatform) then
+    if
+      (
+        stdenv.hostPlatform.isBSD
+        || stdenv.hostPlatform != stdenv.buildPlatform
+        # https://issues.chromium.org/issues/359039635
+        || stdenv.hostPlatform.isLoongArch64
+      )
+    then
      (if isGeneric then "generic-gnu" else "${cpu}-${kernel}-gcc")
    else
      null;
--- a/pkgs/by-name/mk/mkvtoolnix/package.nix
+++ b/pkgs/by-name/mk/mkvtoolnix/package.nix
@ -52,14 +52,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "mkvtoolnix";
-  version = "91.0";
+  version = "92.0";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "mbunkus";
    repo = "mkvtoolnix";
    tag = "release-${finalAttrs.version}";
-    hash = "sha256-cBzW8zj2JxzhdMkvs8nWiBID/8FSMT7FkrZ78c0f0ts=";
+    hash = "sha256-3yiQRGkjvOz80G6s39JHzqytxvGDmV9Lqs5bMxTAejo=";
  };

  passthru = {
--- a/pkgs/by-name/mo/mopidy-argos/package.nix
+++ b/pkgs/by-name/mo/mopidy-argos/package.nix
@ -0,0 +1,59 @@
+{
+  stdenv,
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  pkg-config,
+  meson,
+  ninja,
+  appstream-glib,
+  desktop-file-utils,
+  wrapGAppsHook3,
+  gobject-introspection,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "mopidy-argos";
+  version = "1.15.0";
+  pyproject = false; # Built with meson
+
+  src = fetchFromGitHub {
+    owner = "orontee";
+    repo = "argos";
+    tag = "v${version}";
+    hash = "sha256-fHdaYFq38t4uzpVD4qoAeVm5yWgj2O7hy4LDgZ1bZj4=";
+  };
+  postPatch = ''
+    patchShebangs build-aux/meson/postinstall.py
+  '';
+
+  nativeBuildInputs = [
+    pkg-config
+    meson
+    ninja
+    appstream-glib
+    gobject-introspection
+    desktop-file-utils
+    wrapGAppsHook3
+  ];
+
+  dependencies = with python3Packages; [
+    aiohttp
+    pycairo
+    pygobject3
+    pyxdg
+    zeroconf
+  ];
+
+  dontWrapGApps = true;
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  meta = {
+    homepage = "https://github.com/orontee/argos";
+    description = "Gtk front-end to control a Mopidy server";
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.hufman ];
+    mainProgram = "argos";
+  };
+}
--- a/pkgs/by-name/nb/nb-cli/package.nix
+++ b/pkgs/by-name/nb/nb-cli/package.nix
@ -17,6 +17,10 @@ python3.pkgs.buildPythonApplication rec {
    hash = "sha256-HZey1RVpx/fHNxdEue1LczYbwYUxEb3i3fHpkKHhn+8=";
  };

+  pythonRelaxDeps = [
+    "watchfiles"
+  ];
+
  build-system = [
    python3.pkgs.babel
    python3.pkgs.pdm-backend
@ -43,7 +47,15 @@ python3.pkgs.buildPythonApplication rec {
  # no test
  doCheck = false;

-  pythonImportsCheck = [ "nb_cli" ];
+  pythonImportsCheck = [
+    "nb_cli"
+    "nb_cli.cli"
+    "nb_cli.compat"
+    "nb_cli.config"
+    "nb_cli.handlers"
+    "nb_cli.i18n"
+    "nb_cli.log"
+  ];

  passthru.tests = {
    version = testers.testVersion { package = nb-cli; };
--- a/pkgs/by-name/ni/nix-converter/package.nix
+++ b/pkgs/by-name/ni/nix-converter/package.nix
@ -0,0 +1,38 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildGoModule {
+  pname = "nix-converter";
+  version = "0-unstable-2025-04-14";
+
+  src = fetchFromGitHub {
+    owner = "theobori";
+    repo = "nix-converter";
+    rev = "d06af43bf578f2650417600250e68782478ce98d";
+    hash = "sha256-/HEKbE1tLCGGu4xopky/02OWRt23UUTPKQCdi7ThCX8=";
+  };
+
+  vendorHash = "sha256-Ay1f9sk8RuJyOS7hl/lrscpxdlIgm9dMow/xTFoR+H4=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "All-in-one converter configuration language to Nix and vice versa";
+    homepage = "https://github.com/theobori/nix-converter";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      theobori
+      jaredmontoya
+    ];
+    mainProgram = "nix-converter";
+  };
+}
--- a/pkgs/by-name/ol/olm/package.nix
+++ b/pkgs/by-name/ol/olm/package.nix
@ -21,11 +21,18 @@ stdenv.mkDerivation rec {

  doCheck = true;

-  postPatch = ''
-    substituteInPlace olm.pc.in \
-      --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
-      --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
-  '';
+  postPatch =
+    ''
+      substituteInPlace olm.pc.in \
+        --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
+        --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
+    ''
+    # Clang 19 has become more strict about assigning to const variables
+    # Patch from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281497
+    + lib.optionalString (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "19") ''
+      substituteInPlace include/olm/list.hh \
+        --replace-fail "T * const other_pos = other._data;" "T const * other_pos = other._data;"
+    '';

  meta = with lib; {
    description = "Implements double cryptographic ratchet and Megolm ratchet";
--- a/pkgs/by-name/oo/oobicpl/package.nix
+++ b/pkgs/by-name/oo/oobicpl/package.nix
@ -1,46 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  libminc,
-  bicpl,
-  arguments,
-  pcre-cpp,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "oobicpl";
-  version = "unstable-2020-08-12";
-
-  src = fetchFromGitHub {
-    owner = "BIC-MNI";
-    repo = pname;
-    rev = "a9409da8a5bb4925438f32aff577b6333faec28b";
-    sha256 = "0b4chjhr32wbb1sash8cq1jfnr7rzdq84hif8anlrjqd3l0gw357";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  buildInputs = [
-    libminc
-    bicpl
-    arguments
-    pcre-cpp
-  ];
-
-  cmakeFlags = [
-    "-DLIBMINC_DIR=${libminc}/lib/cmake"
-    "-DBICPL_DIR=${bicpl}/lib"
-    "-DARGUMENTS_DIR=${arguments}/lib"
-    "-DOOBICPL_BUILD_SHARED_LIBS=TRUE"
-  ];
-
-  meta = with lib; {
-    homepage = "https://github.com/BIC-MNI/oobicpl";
-    description = "Brain Imaging Centre object-oriented programming library (and tools)";
-    maintainers = with maintainers; [ bcdarwin ];
-    platforms = platforms.unix;
-    license = licenses.free;
-  };
-}
--- a/pkgs/by-name/op/optinix/package.nix
+++ b/pkgs/by-name/op/optinix/package.nix
@ -20,11 +20,6 @@ buildGoModule rec {

  nativeBuildInputs = [ installShellFiles ];

-  preBuild = ''
-    substituteInPlace vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go \
-      --replace-fail '!os.IsNotExist(err)' '!os.IsNotExist(err) && !os.IsPermission(err)'
-  '';
-
  postInstall = ''
    installShellCompletion --cmd optinix \
      --bash <($out/bin/optinix completion bash) \
--- a/pkgs/by-name/os/osm-gps-map/dont-require-libsoup.patch
+++ b/pkgs/by-name/os/osm-gps-map/dont-require-libsoup.patch
@ -0,0 +1,13 @@
+diff --git a/osmgpsmap-1.0.pc.in b/osmgpsmap-1.0.pc.in
+index 86efb3c..da6d1a9 100644
+--- a/osmgpsmap-1.0.pc.in
+++ b/osmgpsmap-1.0.pc.in
+@@ -6,6 +6,7 @@ includedir=@includedir@
+ Name: @PACKAGE_NAME@
+ Description: Moving map widget using openstreet map data
+ Version: @PACKAGE_VERSION@
+-Requires: gtk+-3.0 libsoup-2.4
+Requires: gtk+-3.0
+Requires.private: libsoup-2.4
+ Libs: -L${libdir} -losmgpsmap-1.0
+ Cflags: -I${includedir}/osmgpsmap-1.0
--- a/pkgs/by-name/os/osm-gps-map/package.nix
+++ b/pkgs/by-name/os/osm-gps-map/package.nix
@ -11,15 +11,22 @@
  stdenv,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "osm-gps-map";
  version = "1.2.0";

  src = fetchzip {
-    url = "https://github.com/nzjrs/osm-gps-map/releases/download/${version}/osm-gps-map-${version}.tar.gz";
+    url = "https://github.com/nzjrs/osm-gps-map/releases/download/${finalAttrs.version}/osm-gps-map-${finalAttrs.version}.tar.gz";
    sha256 = "sha256-ciw28YXhR+GC6B2VPC+ZxjyhadOk3zYGuOssSgqjwH0=";
  };

+  patches = [
+    # libsoup is only used internally
+    # it should only be listed as private requirement
+    # https://github.com/nzjrs/osm-gps-map/pull/108
+    ./dont-require-libsoup.patch
+  ];
+
  outputs = [
    "out"
    "dev"
@ -35,15 +42,18 @@ stdenv.mkDerivation rec {
  buildInputs = [
    cairo
    glib
-    gtk3
    libsoup_2_4
  ];

-  meta = with lib; {
+  propagatedBuildInputs = [
+    gtk3
+  ];
+
+  meta = {
    description = "GTK widget for displaying OpenStreetMap tiles";
    homepage = "https://nzjrs.github.io/osm-gps-map";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ hrdinka ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ hrdinka ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
  };
-}
+})
--- a/pkgs/by-name/pa/paco/package.nix
+++ b/pkgs/by-name/pa/paco/package.nix
@ -1,43 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-  fetchpatch,
-}:
-
-buildGoModule rec {
-  pname = "paco";
-  version = "1.0";
-
-  src = fetchFromGitHub {
-    owner = "pacolang";
-    repo = "paco";
-    rev = "v${version}";
-    hash = "sha256-sCU7cjmsUTrhf/7Lm3wBPKwk80SAhCfc4lrCBggspw8=";
-  };
-
-  vendorHash = "sha256-J0TKp1df5IWq3Irlzf1lvhWlXnP//MsVqs9M8TtEraw=";
-
-  patches = [
-    # Set correct package path in go.mod
-    (fetchpatch {
-      url = "https://github.com/pacolang/paco/pull/1/commits/886f0407e94418d34c7e062c6857834aea3c99ac.patch";
-      hash = "sha256-HRNJSyWz1OY+kCV+eaRJbaDXkH4n1NaMpFxCuEhocK4=";
-    })
-  ];
-
-  subPackages = [ "." ];
-
-  ldflags = [
-    "-s"
-    "-w"
-  ];
-
-  meta = with lib; {
-    description = "Simple compiled programming language";
-    mainProgram = "paco";
-    homepage = "https://github.com/pacolang/paco";
-    license = licenses.mit;
-    maintainers = with maintainers; [ hugolgst ];
-  };
-}
--- a/pkgs/by-name/pi/pilot-link/incompatible-pointer-type.patch
+++ b/pkgs/by-name/pi/pilot-link/incompatible-pointer-type.patch
@ -0,0 +1,15 @@
+Index: pilot-link/src/pilot-read-todos.c
+===================================================================
+--- pilot-link/src/pilot-read-todos.c
+++ pilot-link/src/pilot-read-todos.c
+@@ -216,9 +216,9 @@
+ 				break;
+ 		}
+ 		else {
+ 			if (pi_file_read_record
+-			    (pif, i, (void *) &ptr, &len, &attr, &category,
+			    (pif, i, (void *) &ptr, (size_t *) &len, &attr, &category,
+ 			     0))
+ 				break;
+ 
+ 			pi_buffer_clear(recbuf);
--- a/pkgs/by-name/pi/pilot-link/package.nix
+++ b/pkgs/by-name/pi/pilot-link/package.nix
@ -19,7 +19,7 @@

 stdenv.mkDerivation {
  pname = "pilot-link";
-  version = "0.12.3-unstable-2022-09-26";
+  version = "0.13.0-unstable-2022-09-26";

  src = fetchFromGitHub {
    owner = "desrod";
@ -32,7 +32,10 @@ stdenv.mkDerivation {
  # https://github.com/desrod/pilot-link/issues/16
  # https://aur.archlinux.org/packages/pilot-link-git
  patches =
-    [ ./configure-checks.patch ]
+    [
+      ./configure-checks.patch
+      ./incompatible-pointer-type.patch
+    ]
    ++ lib.optionals enableConduits [ ./format-string-literals.patch ]
    ++ lib.optionals enableLibpng [ ./pilot-link-png14.patch ];

@ -54,6 +57,8 @@ stdenv.mkDerivation {
    ++ lib.optionals enableLibpng [ "--enable-libpng" ]
    ++ lib.optionals enableLibusb [ "--enable-libusb" ];

+  enableParallelBuilding = true;
+
  meta = {
    description = "Suite of tools for connecting to PalmOS handheld devices";
    homepage = "https://github.com/desrod/pilot-link";
--- a/pkgs/by-name/po/pocket-id/package.nix
+++ b/pkgs/by-name/po/pocket-id/package.nix
@ -12,13 +12,13 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "pocket-id";
-  version = "0.49.0";
+  version = "0.51.0";

  src = fetchFromGitHub {
    owner = "pocket-id";
    repo = "pocket-id";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-fyyeYArjhsS/R9VsZsRM3oO5fz8EUqjNIuvFJpGZbds=";
+    hash = "sha256-tNPbowMytALmvJ1H8IWCmXIQFlXKEHA5+T9FWdpaLi0=";
  };

  backend = buildGoModule {
--- a/pkgs/by-name/po/poetry/unwrapped.nix
+++ b/pkgs/by-name/po/poetry/unwrapped.nix
@ -139,6 +139,11 @@ buildPythonPackage rec {
    "test_list_poetry_managed"
    "test_find_all_with_poetry_managed"
    "test_find_poetry_managed_pythons"
+    # Flaky
+    "test_threading_property_types"
+    "test_threading_single_thread_safe"
+    "test_threading_property_caching"
+    "test_threading_atomic_cached_property_different_instances"
  ];

  pytestFlagsArray = [
--- a/pkgs/by-name/qp/qpid-cpp/package.nix
+++ b/pkgs/by-name/qp/qpid-cpp/package.nix
@ -3,7 +3,7 @@
  stdenv,
  fetchpatch,
  fetchurl,
-  boost,
+  boost183,
  cmake,
  libuuid,
  python3,
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
    python3
  ];
  buildInputs = [
-    boost
+    boost183
    libuuid
    ruby
  ];
--- a/pkgs/by-name/ra/ratman/package.nix
+++ b/pkgs/by-name/ra/ratman/package.nix
@ -19,8 +19,8 @@ rustPlatform.buildRustPackage rec {
    domain = "codeberg.org";
    owner = "irdest";
    repo = "irdest";
-    rev = "${version}";
-    sha256 = "sha256-OuKUZSvIUekhbe1LoEFBL8+sU2KLXBsp1JCEEuxkUlk=";
+    tag = "${version}";
+    hash = "sha256-rdKfKbikyqs0Y/y9A8XRVSKenjHD5rS3blxwy98Tvmg=";
  };

  useFetchCargoVendor = true;
--- a/pkgs/by-name/sh/share-preview/package.nix
+++ b/pkgs/by-name/sh/share-preview/package.nix
@ -26,10 +26,14 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-FqualaTkirB+gBcgkThQpSBHhM4iaXkiGujwBUnUX0E=";
  };

+  patches = [
+    ./wasm-bindgen.patch
+  ];
+
  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) src;
+    inherit (finalAttrs) src patches;
    name = "share-preview-${finalAttrs.version}";
-    hash = "sha256-XY48fQ5HLvZ1nxLk6rbuxSBAHAPUcnwu/5AwgTWhfbg=";
+    hash = "sha256-lDSRXe+AjJzWT0hda/aev6kNJAvHblGmmAYXdYhrnQs=";
  };

  nativeBuildInputs = [
@ -59,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
  meta = {
    description = "Preview and debug websites metadata tags for social media share";
    homepage = "https://apps.gnome.org/SharePreview";
+    downloadPage = "https://github.com/rafaelmardojai/share-preview";
+    changelog = "https://github.com/rafaelmardojai/share-preview/releases/tag/${finalAttrs.version}";
    license = lib.licenses.gpl3Plus;
    mainProgram = "share-preview";
    teams = [ lib.teams.gnome-circle ];
--- a/pkgs/by-name/sh/share-preview/wasm-bindgen.patch
+++ b/pkgs/by-name/sh/share-preview/wasm-bindgen.patch
--- a/pkgs/by-name/st/stylelint/package.nix
+++ b/pkgs/by-name/st/stylelint/package.nix
@ -5,16 +5,16 @@
 }:
 buildNpmPackage rec {
  pname = "stylelint";
-  version = "16.19.0";
+  version = "16.19.1";

  src = fetchFromGitHub {
    owner = "stylelint";
    repo = "stylelint";
    tag = version;
-    hash = "sha256-mQQhO63zX69ke7774t4YYpKTC4JHKBFFOlE8ovJYhco=";
+    hash = "sha256-KYUNKA/KJXfRiGkhzkBKkiuEMJAwpkt4FXwx/oJQdq4=";
  };

-  npmDepsHash = "sha256-dx5FQsiL6XtsJh8wYq+q8j4n/vwlr0U0HpZqLwbIAXY=";
+  npmDepsHash = "sha256-5KWs4AboLHJBXJaDXAs30e0e9PAncFQzGHdNDxG8Lpo=";

  dontNpmBuild = true;

--- a/pkgs/by-name/ti/tile-downloader/package.nix
+++ b/pkgs/by-name/ti/tile-downloader/package.nix
@ -0,0 +1,46 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitLab,
+  nix-update-script,
+  openssl,
+  pkg-config,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "tile-downloader";
+  version = "0.1.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.scd31.com";
+    owner = "stephen";
+    repo = "tile-downloader";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-+FnLGMUGyuaN7uPRvuounDKwF6pV9NKv3r/ajdKtdCE=";
+  };
+
+  cargoHash = "sha256-jKNp+YJKZ3qpaDzwi3DvFaZAipRhm1+sTtKBtQEj7qI=";
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+  buildInputs = [
+    openssl
+  ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  meta = {
+    description = "Multi-threaded raster tile downloader, primarily designed for downloading OSM tiles for usage offline";
+    mainProgram = "tile-downloader";
+    homepage = "https://gitlab.scd31.com/stephen/tile-downloader";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ scd31 ];
+  };
+})
--- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix
+++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix
@ -6,14 +6,14 @@
  openssl,
 }:

-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "twitch-tui";
  version = "2.6.19";

  src = fetchFromGitHub {
    owner = "Xithrius";
-    repo = pname;
-    tag = "v${version}";
+    repo = "twitch-tui";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-hA66YcxbQem9ymOu3tGA4biKUCoJ2jKnUSK+9+0P2Eg=";
  };

@ -28,12 +28,12 @@ rustPlatform.buildRustPackage rec {
    openssl
  ];

-  meta = with lib; {
+  meta = {
    description = "Twitch chat in the terminal";
    homepage = "https://github.com/Xithrius/twitch-tui";
-    changelog = "https://github.com/Xithrius/twitch-tui/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = [ maintainers.taha ];
+    changelog = "https://github.com/Xithrius/twitch-tui/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.lordmzte ];
    mainProgram = "twt";
  };
-}
+})
--- a/pkgs/by-name/uc/ucg/package.nix
+++ b/pkgs/by-name/uc/ucg/package.nix
@ -5,7 +5,7 @@
  autoreconfHook,
  callPackage,
  pkg-config,
-  pcre,
+  pcre2,
 }:

 stdenv.mkDerivation (finalAttrs: {
@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  buildInputs = [
-    pcre
+    pcre2
  ];

  passthru.tests = {
--- a/pkgs/by-name/vi/vinegar/package.nix
+++ b/pkgs/by-name/vi/vinegar/package.nix
@ -51,16 +51,20 @@ let
            hash = "sha256-89wnr2rIbyw490hHwckB9g1GKCXm6BERnplfwEUlNOg=";
          })
        ];
+
+        postInstall = ''
+          cp $out/bin/wine $out/bin/wine64
+        '';
      });
 in
-buildGoModule rec {
+buildGoModule (finalAttrs: {
  pname = "vinegar";
  version = "1.8.1";

  src = fetchFromGitHub {
    owner = "vinegarhq";
    repo = "vinegar";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-7rc6LKZx0OOZDedtTpHIQT4grx1FejRiVnJnVDUddy4=";
  };

@ -133,7 +137,7 @@ buildGoModule rec {
          winetricks
        ]
      } \
-      --prefix PUREGOTK_LIB_FOLDER : ${passthru.libraryPath}/lib
+      --prefix PUREGOTK_LIB_FOLDER : ${finalAttrs.passthru.libraryPath}/lib
  '';

  passthru = {
@ -155,7 +159,7 @@ buildGoModule rec {
  };

  meta = {
-    changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${version}";
+    changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${finalAttrs.version}";
    description = "Open-source, minimal, configurable, fast bootstrapper for running Roblox Studio on Linux";
    homepage = "https://github.com/vinegarhq/vinegar";
    license = lib.licenses.gpl3Only;
@ -164,4 +168,4 @@ buildGoModule rec {
    platforms = [ "x86_64-linux" ];
    sourceProvenance = [ lib.sourceTypes.fromSource ];
  };
-}
+})
--- a/pkgs/by-name/xn/xnviewmp/package.nix
+++ b/pkgs/by-name/xn/xnviewmp/package.nix
@ -0,0 +1,67 @@
+{
+  appimageTools,
+  fetchurl,
+  runCommand,
+  lib,
+  makeDesktopItem,
+  copyDesktopItems,
+  imagemagick,
+}:
+let
+  icon =
+    runCommand "xnviewmp-icon.png"
+      {
+        nativeBuildInputs = [ imagemagick ];
+        src = fetchurl {
+          url = "https://www.xnview.com/img/app-xnsoft-360.webp";
+          hash = "sha256-wIzF/WOsPcrYFYC/kGZi6FSJFuErci5EMONjrx1VCdQ=";
+        };
+      }
+      ''
+        convert $src $out
+      '';
+in
+appimageTools.wrapType2 rec {
+  pname = "xnviewmp";
+  version = "1.8.8";
+
+  src = fetchurl {
+    url = "https://download.xnview.com/old_versions/XnView_MP/XnView_MP-${version}.glibc2.17-x86_64.AppImage";
+    hash = "sha256-zPlb2r+oKNq1iv8dAWE/wbXtKAf3A+XOsSOkciHM6OA=";
+  };
+
+  nativeBuildInputs = [
+    copyDesktopItems
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "xnviewmp";
+      desktopName = "XnView MP";
+      exec = "xnviewmp %F";
+      icon = "xnviewmp";
+      comment = "An efficient multimedia viewer, browser and converter";
+      categories = [ "Graphics" ];
+    })
+  ];
+
+  extraPkgs = pkgs: [
+    pkgs.qt5.qtbase
+  ];
+
+  extraInstallCommands = ''
+    install -m 444 -D ${icon} $out/share/icons/hicolor/512x512/apps/xnviewmp.png
+  '';
+
+  meta = {
+    description = "Efficient multimedia viewer, browser and converter";
+    changelog = "https://www.xnview.com/mantisbt/changelog_page.php";
+    homepage = "https://www.xnview.com/en/xnviewmp/";
+    downloadPage = "https://download.xnview.com/old_versions/XnView_MP/";
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    license = lib.licenses.unfree;
+    mainProgram = "xnviewmp";
+    maintainers = with lib.maintainers; [ oddlama ];
+    platforms = lib.platforms.linux;
+  };
+}
--- a/pkgs/by-name/yu/yubihsm-shell/package.nix
+++ b/pkgs/by-name/yu/yubihsm-shell/package.nix
@ -60,10 +60,6 @@ stdenv.mkDerivation rec {
    NIX_CFLAGS_COMPILE="$(pkg-config --cflags libpcsclite) $NIX_CFLAGS_COMPILE"
  '';

-  cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
-    "-DDISABLE_LTO=ON"
-  ];
-
  # causes redefinition of _FORTIFY_SOURCE
  hardeningDisable = [ "fortify3" ];

@ -73,6 +69,5 @@ stdenv.mkDerivation rec {
    maintainers = with maintainers; [ matthewcroughan ];
    license = licenses.asl20;
    platforms = platforms.all;
-    broken = stdenv.hostPlatform.isDarwin;
  };
 }
--- a/pkgs/by-name/ze/zegrapher/package.nix
+++ b/pkgs/by-name/ze/zegrapher/package.nix
@ -1,6 +1,6 @@
 {
  lib,
-  boost,
+  boost186,
  fetchFromGitHub,
  qt5,
  stdenv,
@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  buildInputs = [
-    boost
+    boost186
  ];

  strictDeps = true;
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
@ -27,13 +27,13 @@

 stdenv.mkDerivation rec {
  pname = "switchboard-plug-about";
-  version = "8.2.0";
+  version = "8.2.1";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = pname;
    rev = version;
-    sha256 = "sha256-NMi+QyIunUIzg9IlzeUCz2eQrQlF28lufFc51XOQljU=";
+    sha256 = "sha256-H4BDLP3yzQi+ougpvBvnv1R1TImzUjSOVDGbOqw9hvg=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix
+++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix
@ -19,13 +19,13 @@

 stdenv.mkDerivation rec {
  pname = "xdg-desktop-portal-pantheon";
-  version = "8.0.0";
+  version = "8.0.1";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "portals";
    rev = version;
-    sha256 = "sha256-pf7xQwsBRjjyOMUPe7fJp1vOhhBmuXJ6Uf4YosxbHtw=";
+    sha256 = "sha256-oBOyYE4NLlNmCRO9Uk22/OZb9+fXcyOICE8V3n4grEw=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/kompute/default.nix
+++ b/pkgs/development/libraries/kompute/default.nix
@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
+  fetchpatch,
  cmake,
  vulkan-headers,
  vulkan-loader,
@ -35,6 +36,15 @@ stdenv.mkDerivation rec {
    "-DKOMPUTE_OPT_INSTALL=1"
  ];

+  patches = [
+    # FIXME: remove next update
+    (fetchpatch {
+      name = "vulkan-14-support.patch";
+      url = "https://github.com/KomputeProject/kompute/commit/299b11fb4b8a7607c5d2c27e2735f26b06ae8e29.patch";
+      sha256 = "sha256-JuoTQ+VjIdyF+I1IcT1ofbBjRS0Ibm2w6F2jrRJlx40=";
+    })
+  ];
+
  nativeBuildInputs = [
    cmake
    ninja
--- a/pkgs/development/libraries/opencolorio/1.x.nix
+++ b/pkgs/development/libraries/opencolorio/1.x.nix
@ -3,22 +3,22 @@
  lib,
  fetchFromGitHub,
  cmake,
-  boost,
+  gitMinimal,
  pkg-config,
  lcms2,
  tinyxml,
-  git,
+  boost,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAtts: {
  pname = "opencolorio";
  version = "1.1.1";

  src = fetchFromGitHub {
    owner = "imageworks";
    repo = "OpenColorIO";
-    rev = "v${version}";
-    sha256 = "12srvxca51czpfjl0gabpidj9n84mw78ivxy5w75qhq2mmc798sb";
+    tag = "v${finalAtts.version}";
+    hash = "sha256-S6N0WK0CQ1wOL77viA6vBNkkW7xLPUClu5+FoljfWYs=";
  };

  outputs = [
@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
  # TODO: Investigate whether git can be dropped: It's only used to apply patches
  nativeBuildInputs = [
    cmake
+    gitMinimal
    pkg-config
-    git
  ];

  buildInputs = [
@ -57,6 +57,13 @@ stdenv.mkDerivation rec {
      stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64
    ) "-DCMAKE_OSX_ARCHITECTURES=arm64";

+  env = lib.optionalAttrs stdenv.cc.isClang {
+    # yaml-cpp uses std::auto_ptr and std::binary_function which has
+    # been disabled in clang with libcxx. These flags re-enables these
+    # features
+    NIX_CXXSTDLIB_COMPILE = "-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR=1 -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION=1";
+  };
+
  postInstall = ''
    moveToOutput bin "$bin"
    moveToOutput cmake "$dev"
@ -66,11 +73,11 @@ stdenv.mkDerivation rec {
      --replace "$out/bin" "$bin/bin"
  '';

-  meta = with lib; {
+  meta = {
    homepage = "https://opencolorio.org";
    description = "Color management framework for visual effects and animation";
-    license = licenses.bsd3;
-    maintainers = [ ];
-    platforms = platforms.unix;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ yzx9 ];
+    platforms = lib.platforms.unix;
  };
-}
+})
--- a/pkgs/development/python-modules/aiohttp-swagger/default.nix
+++ b/pkgs/development/python-modules/aiohttp-swagger/default.nix
@ -2,11 +2,10 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
+  setuptools,
  aiohttp,
  jinja2,
  markupsafe,
-  pytest-aiohttp,
-  pytestCheckHook,
  pythonOlder,
  pyyaml,
 }:
@ -14,45 +13,38 @@
 buildPythonPackage rec {
  pname = "aiohttp-swagger";
  version = "1.0.15";
-  format = "setuptools";
+  pyproject = true;

  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "cr0hn";
-    repo = pname;
-    rev = version;
+    repo = "aiohttp-swagger";
+    tag = version;
    hash = "sha256-M43sNpbXWXFRTd549cZhvhO35nBB6OH+ki36BzSk87Q=";
  };

-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
    aiohttp
    jinja2
    markupsafe
    pyyaml
  ];

-  nativeCheckInputs = [
-    pytestCheckHook
-    pytest-aiohttp
+  pythonRelaxDeps = [
+    "markupsafe"
+    "jinja2"
  ];

-  postPatch = ''
-    substituteInPlace requirements.txt \
-      --replace "markupsafe~=1.1.1" "markupsafe>=1.1.1" \
-      --replace "jinja2~=2.11.2" "jinja2>=2.11.2"
-  '';
-
-  preCheck = ''
-    # The custom client is obsolete
-    rm tests/conftest.py
-  '';
-
  pythonImportsCheck = [ "aiohttp_swagger" ];

-  meta = with lib; {
+  meta = {
    description = "Swagger API Documentation builder for aiohttp";
    homepage = "https://github.com/cr0hn/aiohttp-swagger";
-    license = licenses.mit;
+    license = lib.licenses.mit;
  };
 }
--- a/pkgs/development/python-modules/docling-core/default.nix
+++ b/pkgs/development/python-modules/docling-core/default.nix
@ -28,14 +28,14 @@

 buildPythonPackage rec {
  pname = "docling-core";
-  version = "2.28.0";
+  version = "2.29.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "docling-project";
    repo = "docling-core";
    tag = "v${version}";
-    hash = "sha256-vvaqO9rsXeQUt5+u9aEC1JNvXSgFMgfqNjjZLXjqkmA=";
+    hash = "sha256-KUDqaZv6gE0t5FXjQiuKUsmtV0qMKyF637z7Zg+LYoE=";
  };

  build-system = [
--- a/pkgs/development/python-modules/essentials-openapi/default.nix
+++ b/pkgs/development/python-modules/essentials-openapi/default.nix
@ -14,6 +14,7 @@
  pyyaml,
  rich,
  setuptools,
+  stdenv,
 }:
 buildPythonPackage rec {
  pname = "essentials-openapi";
@ -59,6 +60,13 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "openapidocs" ];

+  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
+    # These tests start a server using a hardcoded port, and since
+    # multiple Python versions are always built simultaneously, this
+    # failure is quite likely to occur.
+    "tests/test_cli.py"
+  ];
+
  meta = {
    homepage = "https://github.com/Neoteroi/essentials-openapi";
    description = "Functions to handle OpenAPI Documentation";
--- a/pkgs/development/python-modules/essentials/default.nix
+++ b/pkgs/development/python-modules/essentials/default.nix
@ -3,6 +3,7 @@
  fetchFromGitHub,
  setuptools,
  pytestCheckHook,
+  stdenv,
  lib,
 }:
 buildPythonPackage rec {
@ -21,6 +22,12 @@ buildPythonPackage rec {

  nativeCheckInputs = [ pytestCheckHook ];

+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # time.sleep(0.01) can be up to 0.05s on darwin
+    "test_stopwatch"
+    "test_stopwatch_with_context_manager"
+  ];
+
  pythonImportsCheck = [ "essentials" ];

  meta = with lib; {
--- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix
+++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "google-ai-generativelanguage";
-  version = "0.6.17";
+  version = "0.6.18";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "google_ai_generativelanguage";
    inherit version;
-    hash = "sha256-hDlQNQOrpshbOHFQT0kLvGa+hUAx2LtNWsldPKIXPzg=";
+    hash = "sha256-J0up/PaUZv9k6XHVZYhENDiOUjMAr9Ro/I4wM82OYG4=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/h5io/default.nix
+++ b/pkgs/development/python-modules/h5io/default.nix
@ -2,25 +2,30 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
-  pythonOlder,
-  setuptools,
-  numpy,
+
+  # build-system
+  setuptools-scm,
+
+  # dependencies
  h5py,
+  numpy,
+
+  # tests
  pytestCheckHook,
+  scipy,
+  tables,
 }:

 buildPythonPackage rec {
  pname = "h5io";
-  version = "0.2.1";
+  version = "0.2.5";
  pyproject = true;

-  disabled = pythonOlder "3.7";
-
  src = fetchFromGitHub {
    owner = "h5io";
    repo = "h5io";
    tag = "h5io-${version}";
-    hash = "sha256-3mrHIkfaXq06mMzUwudRO81DWTk0TO/e15IQA5fxxNc=";
+    hash = "sha256-ZkG9e7KtDvoRq9XCExYseE+Z7tMQTWcSiwsSrN5prdI=";
  };

  postPatch = ''
@ -30,22 +35,31 @@ buildPythonPackage rec {
      --replace "--cov=h5io" ""
  '';

-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools-scm ];

-  propagatedBuildInputs = [
-    numpy
+  dependencies = [
    h5py
+    numpy
  ];

-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    scipy
+    tables
+  ];
+
+  disabledTests = [
+    # See https://github.com/h5io/h5io/issues/86
+    "test_state_with_pathlib"
+  ];

  pythonImportsCheck = [ "h5io" ];

-  meta = with lib; {
+  meta = {
    description = "Read and write simple Python objects using HDF5";
    homepage = "https://github.com/h5io/h5io";
    changelog = "https://github.com/h5io/h5io/releases/tag/h5io-${version}";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ mbalatsko ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ mbalatsko ];
  };
 }
--- a/pkgs/development/python-modules/hdbscan/default.nix
+++ b/pkgs/development/python-modules/hdbscan/default.nix
@ -1,14 +1,18 @@
 {
  lib,
  buildPythonPackage,
+  fetchFromGitHub,
+  fetchpatch,
+
  cython,
  numpy,
-  pytestCheckHook,
  scipy,
  scikit-learn,
-  fetchPypi,
  joblib,
  six,
+
+  # test
+  pytestCheckHook,
 }:

 buildPythonPackage rec {
@ -16,27 +20,40 @@ buildPythonPackage rec {
  version = "0.8.40";
  format = "setuptools";

-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-yeOD/xe+7gWRB1/2XVJL2ltaNd+wHSGCRae6MMjUihc=";
+  src = fetchFromGitHub {
+    owner = "scikit-learn-contrib";
+    repo = "hdbscan";
+    tag = "release-${version}";
+    hash = "sha256-xsBlmSQU47e+M+nRqUXdWKS7Rtj2QZ1UWLAvjSQOJ0Q=";
  };

+  patches = [
+    (fetchpatch {
+      # Replace obsolete use of assert_raises with pytest.raises
+      name = "replace-assert_raises";
+      url = "https://github.com/scikit-learn-contrib/hdbscan/pull/667/commits/04d6a4dcdcd2bb2597419b8aa981d7620765809f.patch";
+      hash = "sha256-z/u5b2rNPKOCe+3/GVE8rMB5ajeU5PrvLVesjEgj9TA=";
+    })
+  ];
+
  pythonRemoveDeps = [ "cython" ];
+
  nativeBuildInputs = [
    cython
-  ];
-  propagatedBuildInputs = [
-    numpy
-    scipy
-    scikit-learn
    joblib
+    numpy
+    scikit-learn
+    scipy
    six
  ];
+
  preCheck = ''
    cd hdbscan/tests
    rm __init__.py
  '';
+
  nativeCheckInputs = [ pytestCheckHook ];
+
  disabledTests = [
    # known flaky tests: https://github.com/scikit-learn-contrib/hdbscan/issues/420
    "test_mem_vec_diff_clusters"
@ -47,13 +64,22 @@ buildPythonPackage rec {
    # more flaky tests https://github.com/scikit-learn-contrib/hdbscan/issues/570
    "test_hdbscan_boruvka_balltree"
    "test_hdbscan_best_balltree_metric"
+    # "got an unexpected keyword argument"
+    "test_hdbscan_badargs"
+  ];
+
+  disabledTestPaths = [
+    # joblib.externals.loky.process_executor.BrokenProcessPool:
+    "test_branches.py"
  ];

  pythonImportsCheck = [ "hdbscan" ];

-  meta = with lib; {
+  meta = {
    description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API";
    homepage = "https://github.com/scikit-learn-contrib/hdbscan";
-    license = licenses.bsd3;
+    changelog = "https://github.com/scikit-learn-contrib/hdbscan/releases/tag/release-${version}";
+    license = lib.licenses.bsd3;
+    maintainers = [ ];
  };
 }
--- a/pkgs/development/python-modules/hieroglyph/default.nix
+++ b/pkgs/development/python-modules/hieroglyph/default.nix
@ -1,23 +1,58 @@
 {
  lib,
-  fetchPypi,
  buildPythonPackage,
-  isPy27,
+  fetchFromGitHub,
+  fetchpatch,
+
+  # build-system
+  setuptools,
+
+  # dependencies
  sphinx,
 }:

 buildPythonPackage rec {
  pname = "hieroglyph";
  version = "2.1.0";
-  format = "setuptools";
-  disabled = isPy27; # python2 compatible sphinx is too low

-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b4b5db13a9d387438e610c2ca1d81386ccd206944d9a9dd273f21874486cddaf";
+  src = fetchFromGitHub {
+    owner = "nyergler";
+    repo = "hieroglyph";
+    tag = "hieroglyph-${version}";
+    hash = "sha256-nr5cHF0Lg2mjQvnOoM5HCmMUiGh1QOeTD0nc8BvCBOE=";
  };

-  propagatedBuildInputs = [ sphinx ];
+  pyproject = true;
+
+  build-system = [ setuptools ];
+
+  patches = [
+    # https://github.com/nyergler/hieroglyph/pull/177hieroglyph-quickstart
+    (fetchpatch {
+      name = "hieroglyph-upgrade-versioneer";
+      url = "https://github.com/nyergler/hieroglyph/commit/9cebee269ac10964b2436c0204156b7bd620a3d4.patch";
+      hash = "sha256-ZvU7uASU727/NUAW8I7k9idzMpEdnuwRshdHm2/GQ3w=";
+    })
+    # https://github.com/nyergler/hieroglyph/pull/174
+    (fetchpatch {
+      name = "hieroglyph-slide-builder-type-error";
+      url = "https://github.com/nyergler/hieroglyph/pull/174/commits/d75c550f797e3635d33db11f50968755288962a7.patch";
+      hash = "sha256-qNQVgWL9jy0cwtxKUbWi3Qc77RU2H3raN0BzBjDk9C8=";
+    })
+  ];
+
+  # load_additional_themes has been deprecated, need to use its deprecated name
+  postPatch = ''
+    substituteInPlace src/hieroglyph/builder.py \
+      --replace-fail "theme_factory.load_additional_themes" "theme_factory._load_additional_themes"
+  '';
+
+  dependencies = [
+    setuptools
+    sphinx
+  ];
+
+  pythonImportsCheck = [ "hieroglyph" ];

  # all tests fail; don't know why:
  # test_absolute_paths_made_relative (hieroglyph.tests.test_path_fixing.PostProcessImageTests) ... ERROR
--- a/pkgs/development/python-modules/jupyter-server-ydoc/default.nix
+++ b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix
@ -15,13 +15,13 @@

 buildPythonPackage rec {
  pname = "jupyter-server-ydoc";
-  version = "2.0.1";
+  version = "2.0.2";
  pyproject = true;

  src = fetchPypi {
    pname = "jupyter_server_ydoc";
    inherit version;
-    hash = "sha256-9P2n9D0HUkU+lmIffniD7tAJEUbe7Q7jjC/l+Cxps/U=";
+    hash = "sha256-Iu5y57yeLZ/emIIJLRdqyMpxAfsHj2/vTLcqgSlRCSg=";
  };

  build-system = [ hatchling ];
--- a/pkgs/development/python-modules/kaggle/default.nix
+++ b/pkgs/development/python-modules/kaggle/default.nix
@ -16,6 +16,7 @@
  tqdm,
  urllib3,
  webencodings,
+  protobuf,
 }:

 buildPythonPackage rec {
@ -44,6 +45,7 @@ buildPythonPackage rec {
    tqdm
    urllib3
    webencodings
+    protobuf
  ];

  # Tests try to access the network.
--- a/pkgs/development/python-modules/meeko/default.nix
+++ b/pkgs/development/python-modules/meeko/default.nix
@ -2,7 +2,7 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
-  fetchpatch,
+  gemmi,
  numpy,
  pytestCheckHook,
  pythonOlder,
@ -24,22 +24,9 @@ buildPythonPackage rec {
    hash = "sha256-ViIBiczwxTwraYn8UnFAZFCFT28v3WEYm04W2YpU/4g=";
  };

-  patches = [
-    # https://github.com/forlilab/Meeko/issues/60
-    (fetchpatch {
-      name = "fix-unknown-sidechains.patch";
-      url = "https://github.com/forlilab/Meeko/commit/28c9fbfe3b778aa1bd5e8d7e4f3e6edf44633a0c.patch";
-      hash = "sha256-EJbLnbKTTOsTxKtLiU7Af07yjfY63ungGUHbGvrm0AU=";
-    })
-    (fetchpatch {
-      name = "add-test-data.patch";
-      url = "https://github.com/forlilab/Meeko/commit/57b52e3afffb82685cdd1ef1bf6820d55924b97a.patch";
-      hash = "sha256-nLnyIjT68iaY3lAEbH9EJ5jZflhxABBwDqw8kaRKf3k=";
-    })
-  ];
-
  propagatedBuildInputs = [
    # setup.py only requires numpy but others are needed at runtime
+    gemmi
    numpy
    rdkit
    scipy
--- a/pkgs/development/python-modules/mizani/default.nix
+++ b/pkgs/development/python-modules/mizani/default.nix
@ -19,14 +19,14 @@

 buildPythonPackage rec {
  pname = "mizani";
-  version = "0.13.4";
+  version = "0.13.5";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "has2k1";
    repo = "mizani";
    tag = "v${version}";
-    hash = "sha256-gZ4rJw+m0XgpfV6nylTqR6Taer6bok5E93WxOyAhXCk=";
+    hash = "sha256-W88B8WCwIqjMhjoDJaksHBhvg/Sr0RRDwo9stniyzkM=";
  };

  build-system = [ setuptools-scm ];
--- a/pkgs/development/python-modules/neoteroi-mkdocs/default.nix
+++ b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix
@ -12,6 +12,7 @@
  pytestCheckHook,
  rich,
  setuptools,
+  stdenv,
 }:
 buildPythonPackage rec {
  pname = "neoteroi-mkdocs";
@ -48,6 +49,13 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "neoteroi.mkdocs" ];

+  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
+    # These tests start a server using a hardcoded port, and since
+    # multiple Python versions are always built simultaneously, this
+    # failure is quite likely to occur.
+    "tests/test_http.py"
+  ];
+
  meta = with lib; {
    homepage = "https://github.com/Neoteroi/mkdocs-plugins";
    description = "Plugins for MkDocs";
--- a/pkgs/development/python-modules/pymilvus/default.nix
+++ b/pkgs/development/python-modules/pymilvus/default.nix
@ -23,14 +23,14 @@

 buildPythonPackage rec {
  pname = "pymilvus";
-  version = "2.5.7";
+  version = "2.5.8";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "milvus-io";
    repo = "pymilvus";
    tag = "v${version}";
-    hash = "sha256-Sv1V8JjDQtgyKdd8yFNbXIXUK9hmlyB4xsmk49W0wGk=";
+    hash = "sha256-AsbUt5dyVsrbWYzjsqe7bMs4E/npkKTetfHrDK4kt6I=";
  };

  build-system = [
--- a/pkgs/development/python-modules/pystemd/default.nix
+++ b/pkgs/development/python-modules/pystemd/default.nix
@ -2,26 +2,41 @@
  buildPythonPackage,
  lib,
  fetchPypi,
+  setuptools,
  systemd,
  lxml,
  psutil,
  pytest,
  mock,
  pkg-config,
+  cython,
 }:

 buildPythonPackage rec {
  pname = "pystemd";
  version = "0.13.2";
-  format = "setuptools";
+  pyproject = true;
+
  src = fetchPypi {
    inherit pname version;
    hash = "sha256-Tc+ksTpVaFxJ09F8EGMeyhjDN3D2Yxb47yM3uJUcwUQ=";
  };

+  postPatch = ''
+    # remove cythonized sources, build them anew to support more python version
+    rm pystemd/*.c
+  '';
+
  buildInputs = [ systemd ];

-  nativeBuildInputs = [ pkg-config ];
+  build-system = [
+    setuptools
+    cython
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+  ];

  propagatedBuildInputs = [
    lxml
@ -33,15 +48,22 @@ buildPythonPackage rec {
    pytest
  ];

-  checkPhase = "pytest tests";
+  checkPhase = ''
+    runHook preCheck
+    # pytestCheckHook doesn't work
+    pytest tests
+    runHook postCheck
+  '';

-  meta = with lib; {
+  pythonImportsCheck = [ "pystemd" ];
+
+  meta = {
    description = ''
      Thin Cython-based wrapper on top of libsystemd, focused on exposing the
      dbus API via sd-bus in an automated and easy to consume way
    '';
    homepage = "https://github.com/facebookincubator/pystemd/";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ flokli ];
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ flokli ];
  };
 }
--- a/pkgs/development/python-modules/rdkit/default.nix
+++ b/pkgs/development/python-modules/rdkit/default.nix
@ -117,11 +117,11 @@ buildPythonPackage rec {
    (lib.cmakeBool "RDK_BUILD_INCHI_SUPPORT" true)
    (lib.cmakeBool "RDK_BUILD_MAEPARSER_SUPPORT" true)
    (lib.cmakeBool "RDK_BUILD_THREADSAFE_SSS" true)
+    (lib.cmakeBool "RDK_BUILD_XYZ2MOL_SUPPORT" true)
    (lib.cmakeBool "RDK_BUILD_YAEHMOP_SUPPORT" true)
    (lib.cmakeBool "RDK_INSTALL_INTREE" false)
    (lib.cmakeBool "RDK_INSTALL_STATIC_LIBS" false)
    (lib.cmakeBool "RDK_TEST_MULTITHREADED" true)
-    (lib.cmakeBool "RDK_TEST_MULTITHREADED" true)
    (lib.cmakeBool "RDK_USE_FLEXBISON" false)
    (lib.cmakeBool "RDK_USE_URF" false)
    (lib.cmakeFeature "AVALONTOOLS_DIR" "avalon")
@ -141,6 +141,7 @@ buildPythonPackage rec {
    "rdkit"
    "rdkit.Chem"
    "rdkit.Chem.AllChem"
+    "rdkit.Chem.rdDetermineBonds"
  ];

  meta = with lib; {
--- a/pkgs/development/python-modules/sagemaker-core/default.nix
+++ b/pkgs/development/python-modules/sagemaker-core/default.nix
@ -28,14 +28,14 @@

 buildPythonPackage rec {
  pname = "sagemaker-core";
-  version = "1.0.29";
+  version = "1.0.31";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "aws";
    repo = "sagemaker-core";
    tag = "v${version}";
-    hash = "sha256-m/gxOnQmYhNjAMM5DG3DzllWcWmfjD3B0NRY+wyGVP8=";
+    hash = "sha256-cZbGma/H8XrQwuyXCPxwjPe3b9w21DXoWAWgqaoBYJE=";
  };

  build-system = [
--- a/pkgs/development/python-modules/temporalio/default.nix
+++ b/pkgs/development/python-modules/temporalio/default.nix
@ -0,0 +1,84 @@
+{
+  lib,
+  buildPackages,
+  buildPythonPackage,
+  cargo,
+  fetchFromGitHub,
+  maturin,
+  pythonOlder,
+  poetry-core,
+  protobuf,
+  python-dateutil,
+  rustc,
+  rustPlatform,
+  setuptools,
+  setuptools-rust,
+  types-protobuf,
+  typing-extensions,
+}:
+
+buildPythonPackage rec {
+  pname = "temporalio";
+  version = "1.11.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "temporalio";
+    repo = "sdk-python";
+    rev = "refs/tags/${version}";
+    hash = "sha256-942EmFOAYUWq58MW2rIVhDK9dHkzi62fUdOudYP94hU=";
+    fetchSubmodules = true;
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit pname version src;
+    sourceRoot = "${src.name}/${cargoRoot}";
+    hash = "sha256-9hP+zN6jcRmRhPmcZ4Zgp61IeS7gDPfsOvweAxKHnHM=";
+  };
+
+  cargoRoot = "temporalio/bridge";
+
+  build-system = [
+    maturin
+    poetry-core
+  ];
+
+  preBuild = ''
+    export PROTOC=${buildPackages.protobuf}/bin/protoc
+  '';
+
+  dependencies = [
+    protobuf
+    types-protobuf
+    typing-extensions
+  ] ++ lib.optional (pythonOlder "3.11") python-dateutil;
+
+  nativeBuildInputs = [
+    cargo
+    rustPlatform.cargoSetupHook
+    rustPlatform.maturinBuildHook
+    rustc
+    setuptools
+    setuptools-rust
+  ];
+
+  pythonImportsCheck = [
+    "temporalio"
+    "temporalio.bridge.temporal_sdk_bridge"
+    "temporalio.client"
+    "temporalio.worker"
+  ];
+
+  meta = {
+    description = "Temporal Python SDK";
+    homepage = "https://temporal.io/";
+    changelog = "https://github.com/temporalio/sdk-python/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      jpds
+      levigross
+    ];
+  };
+}
--- a/pkgs/development/python-modules/uv-dynamic-versioning/default.nix
+++ b/pkgs/development/python-modules/uv-dynamic-versioning/default.nix
@ -22,7 +22,7 @@

 buildPythonPackage rec {
  pname = "uv-dynamic-versioning";
-  version = "0.8.0";
+  version = "0.8.2";
  pyproject = true;

  src = fetchFromGitHub {
@ -31,7 +31,7 @@ buildPythonPackage rec {
    tag = "v${version}";
    # Tests perform mock operations on the local repo
    leaveDotGit = true;
-    hash = "sha256-DO10OGij7koV5VYqywRR28pg0sEOAuGpqz1Ksf39MQo=";
+    hash = "sha256-iIWghJXhs0IblO7Kgfe6lEc0F/KYF1c8/TN5tkIvXa0=";
  };

  build-system = [
--- a/pkgs/development/python-modules/vg/default.nix
+++ b/pkgs/development/python-modules/vg/default.nix
@ -11,7 +11,7 @@
 buildPythonPackage rec {
  pname = "vg";
  version = "2.0.0";
-  format = "pyproject";
+  pyproject = true;

  disabled = pythonOlder "3.7";

@ -27,19 +27,21 @@ buildPythonPackage rec {
      --replace 'requires = ["setuptools", "poetry-core>=1.0.0"]' 'requires = ["poetry-core>=1.0.0"]'
  '';

-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];

-  propagatedBuildInputs = [ numpy ];
+  dependencies = [ numpy ];

  nativeCheckInputs = [ pytestCheckHook ];

+  disabledTests = [ "test_basic" ];
+
  pythonImportsCheck = [ "vg" ];

-  meta = with lib; {
+  meta = {
    description = "Linear algebra for humans: a very good vector-geometry and linear-algebra toolbelt";
    homepage = "https://github.com/lace/vg";
    changelog = "https://github.com/lace/vg/blob/${version}/CHANGELOG.md";
-    license = with licenses; [ bsd2 ];
-    maintainers = with maintainers; [ clerie ];
+    license = [ lib.licenses.bsd2 ];
+    maintainers = with lib.maintainers; [ clerie ];
  };
 }
--- a/pkgs/development/python-modules/yalexs-ble/default.nix
+++ b/pkgs/development/python-modules/yalexs-ble/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "yalexs-ble";
-  version = "2.6.0";
+  version = "3.0.0";
  pyproject = true;

  disabled = pythonOlder "3.10";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "bdraco";
    repo = "yalexs-ble";
    tag = "v${version}";
-    hash = "sha256-NSN0i99Pd3ivRd9aFIDu/CnQHCMbEIqpceDaeB5k3vU=";
+    hash = "sha256-sHAdeL3mUUsKqRkv9suA3mfbwJvMADpMqt1Qu5lITnQ=";
  };

  build-system = [ poetry-core ];
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@ -286,7 +286,8 @@ rec {
            tests = {
              toolchains =
                let
-                  javaVersion = lib.versions.major (lib.getVersion jdk23);
+                  javaVersion = lib.getVersion jdk23;
+                  javaMajorVersion = lib.versions.major javaVersion;
                in
                runCommand "detects-toolchains-from-nix-env"
                  {
@ -302,10 +303,14 @@ rec {
                  }
                  ''
                    cp -a $src/* .
-                    substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaVersion}'
+                    substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaMajorVersion}'
                    env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \
                    gradle run --no-daemon --quiet --console plain > $out
-                    test "$(<$out)" = "${javaVersion}"
+                    actual="$(<$out)"
+                    if [[ "${javaVersion}" != "$actual"* ]]; then
+                      echo "Error: Expected '${javaVersion}', to start with '$actual'" >&2
+                      exit 1
+                    fi
                  '';
            } // gradle.tests;
          }
--- a/pkgs/tools/games/steamback/default.nix
+++ b/pkgs/tools/games/steamback/default.nix
@ -23,7 +23,7 @@ buildPythonApplication rec {
    hash = "sha256-hvMPSxIfwwQqo80JCpYhcbVY4kXs5jWtjjafVSMrw6o=";
  };

-  nativeBuildInputs = [
+  build-system = [
    setuptools-scm
    wheel
  ];
@ -33,7 +33,7 @@ buildPythonApplication rec {
    pillow
  ];

-  propagatedBuildInputs = [
+  dependencies = [
    psutil
    async-tkinter-loop
    timeago
@ -45,21 +45,29 @@ buildPythonApplication rec {
    "async-tkinter-loop"
    "platformdirs"
    "Pillow"
+    "psutil"
  ];

  checkPhase = ''
    runHook preCheck

-    $out/bin/${pname} --help
+    $out/bin/steamback --help

    runHook postCheck
  '';

-  meta = with lib; {
+  pythonImportsCheck = [
+    "steamback"
+    "steamback.gui"
+    "steamback.test"
+    "steamback.util"
+  ];
+
+  meta = {
    description = "Decky plugin to add versioned save-game snapshots to Steam-cloud enabled games";
    mainProgram = "steamback";
    homepage = "https://github.com/geeksville/steamback";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ AngryAnt ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ AngryAnt ];
  };
 }
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -709,6 +709,7 @@ mapAliases {
  gg = go-graft; # Added 2025-03-07
  ghostwriter = makePlasma5Throw "ghostwriter"; # Added 2023-03-18
  git-codeowners = throw "'git-codeowners' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
+  gmni = throw "gmni has been removed as it is no longer maintained upstream"; # Added 2025-05-02
  gmp5 = throw "'gmp5' has been removed as it is unmaintained. Consider using 'gmp' instead"; # Added 2024-10-28
  gmpc = throw "'gmpc' has been removed due to lack of maintenance upstream. Consider using 'plattenalbum' instead"; # Added 2024-09-14
  gmtk = throw "'gmtk' has been removed due to lack of maintenance upstream"; # Added 2024-09-14
@ -951,6 +952,7 @@ mapAliases {
  libbitcoin-explorer = throw "libbitcoin-explorer has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
  libbitcoin-network = throw "libbitcoin-network has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
  libbitcoin-protocol = throw "libbitcoin-protocol has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
+  libchop = throw "libchop has been removed due to failing to build and being unmaintained upstream"; # Added 2025-05-02
  libdwg = throw "libdwg has been removed as upstream is unmaintained, the code doesn't build without significant patches, and the package had no reverse dependencies"; # Added 2024-12-28
  libgcrypt_1_8 = throw "'libgcrypt_1_8' is end-of-life. Consider using 'libgcrypt' instead"; # Added 2025-01-05
  libgda = lib.warnOnInstantiate "‘libgda’ has been renamed to ‘libgda5’" libgda5; # Added 2025-01-21
@ -1349,6 +1351,7 @@ mapAliases {
  openjdk22_headless = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24
  jdk22 = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24
  jdk22_headless = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24
+  oobicpl = throw "oobicpl was removed as it is unmaintained upstream"; # Added 2025-04-26
  openjfx11 = throw "OpenJFX 11 was removed as it has reached its end of life"; # Added 2024-10-07
  openjfx19 = throw "OpenJFX 19 was removed as it has reached its end of life"; # Added 2024-08-01
  openjfx20 = throw "OpenJFX 20 was removed as it has reached its end of life"; # Added 2024-08-01
@ -1396,6 +1399,7 @@ mapAliases {
  passky-desktop = throw "passky-desktop has been removed, as it was unmaintained and blocking the Electron 29 removal."; # Added 2025-02-24
  p2pvc = throw "p2pvc has been removed as it is unmaintained upstream and depends on OpenCV 2"; # Added 2024-08-20
  packet-cli = throw "'packet-cli' has been renamed to/replaced by 'metal-cli'"; # Converted to throw 2024-10-17
+  paco = throw "'paco' has been removed as it has been abandoned"; # Added 2025-04-30
  inherit (perlPackages) pacup;
  panopticon = throw "'panopticon' has been removed because it is unmaintained upstream"; # Added 2025-01-25
  paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -2759,8 +2759,6 @@ with pkgs;

  persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { };

-  twitch-tui = callPackage ../applications/networking/instant-messengers/twitch-tui { };
-
  inherit (import ../development/libraries/libsbsms pkgs)
    libsbsms
    libsbsms_2_0_2
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -16999,6 +16999,8 @@ self: super: with self; {

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

+  temporalio = callPackage ../development/python-modules/temporalio { };
+
  tenacity = callPackage ../development/python-modules/tenacity { };

  tenant-schemas-celery = callPackage ../development/python-modules/tenant-schemas-celery { };