Merge master into staging-next

2026-07-06 17:13:24 -05:00 · 2026-04-15 06:38:38 +00:00 · 2026-04-15 06:38:38 +00:00 · e8ecf89184
commit e8ecf89184
parent b6a280bc95 587464cfd4
44 changed files with 349 additions and 241 deletions
--- a/doc/hooks/index.md
+++ b/doc/hooks/index.md
@ -20,6 +20,7 @@ ghc.section.md
 gnome.section.md
 haredo.section.md
 installShellFiles.section.md
+installFonts.section.md
 julec.section.md
 just.section.md
 libglycin.section.md
--- a/doc/hooks/installFonts.section.md
+++ b/doc/hooks/installFonts.section.md
@ -0,0 +1,24 @@
+# `installFonts` {#installfonts}
+
+This hook installs common font formats to the proper location. In its default state, the hook automatically handles ttf, ttc, otf, bdf, and psf. Given a `webfont` output, woff and woff2 formats will be installed under this output.
+
+The automatic behavior of the hook can be disabled by setting the `dontInstallFonts` variable to true.
+
+Additionally, it exposes the `installFont` function that can be used from your `postInstall`
+hook, to install additional formats:
+
+## `installFont` {#installfonts-installfont}
+
+The `installFont` function takes two arguments, a file extension to move (*without* a preceding dot), and the install location.
+
+### Example Usage {#installfonts-installfont-exampleusage}
+
+```nix
+{
+  nativeBuildInputs = [ installFonts ];
+
+  postInstall = ''
+    installFont svg $out/share/fonts/svg
+  '';
+}
+```
--- a/doc/redirects.json
+++ b/doc/redirects.json
@ -134,18 +134,21 @@
  "inkscape-plugins": [
    "index.html#inkscape-plugins"
  ],
+  "installfonts": [
+    "index.html#installfonts"
+  ],
+  "installfonts-installfont": [
+    "index.html#installfonts-installfont"
+  ],
+  "installfonts-installfont-exampleusage": [
+    "index.html#installfonts-installfont-exampleusage"
+  ],
  "javascript-buildNpmPackage-npmFlags": [
    "index.html#javascript-buildNpmPackage-npmFlags"
  ],
  "javascript-buildNpmPackage-npmWorkspace": [
    "index.html#javascript-buildNpmPackage-npmWorkspace"
  ],
-  "libcxxhardeningextensive": [
-    "index.html#libcxxhardeningextensive"
-  ],
-  "libcxxhardeningfast": [
-    "index.html#libcxxhardeningfast"
-  ],
  "julec-hook": [
    "index.html#julec-hook"
  ],
@ -182,6 +185,12 @@
  "julec-hook-variables": [
    "index.html#julec-hook-variables"
  ],
+  "libcxxhardeningextensive": [
+    "index.html#libcxxhardeningextensive"
+  ],
+  "libcxxhardeningfast": [
+    "index.html#libcxxhardeningfast"
+  ],
  "major-ghc-deprecation": [
    "index.html#major-ghc-deprecation"
  ],
--- a/nixos/tests/installed-tests/fwupd.nix
+++ b/nixos/tests/installed-tests/fwupd.nix
@ -3,6 +3,9 @@
 makeInstalledTest {
  tested = pkgs.fwupd;

+  # same as fwupd upstream CI
+  testRunnerFlags = [ "--timeout=1200" ];
+
  testConfig = {
    services.fwupd = {
      enable = true;
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -1049,11 +1049,11 @@
    "vendorHash": null
  },
  "oracle_oci": {
-    "hash": "sha256-lyIrdjvsII9LjoqTByXTlOZAO+fJU+AB0jOBG8nlN+c=",
+    "hash": "sha256-U4Laml29samuCVGCaLSH/nR/o9jbn8lK/c73OsDeE7c=",
    "homepage": "https://registry.terraform.io/providers/oracle/oci",
    "owner": "oracle",
    "repo": "terraform-provider-oci",
-    "rev": "v8.8.0",
+    "rev": "v8.9.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
--- a/pkgs/by-name/ac/act/package.nix
+++ b/pkgs/by-name/ac/act/package.nix
@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "act";
-  version = "0.2.86";
+  version = "0.2.87";

  src = fetchFromGitHub {
    owner = "nektos";
    repo = "act";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-nA7QzQYd4oa+OJiPLpfWNjavVJiCd0t62+qC2TpJcSM=";
+    hash = "sha256-i3DaVLspm/lP6HvRD56qToi3Vj9MijK0IfZA4n2Y5IA=";
  };

  vendorHash = "sha256-MsrWfrXuIi1m0vhDR05qbD4ynNpKvKwjUgDKbaq5iLs=";
--- a/pkgs/by-name/as/asunder/package.nix
+++ b/pkgs/by-name/as/asunder/package.nix
@ -36,11 +36,11 @@ let
 in

 stdenv.mkDerivation (finalAttrs: {
-  version = "3.0.1";
+  version = "3.0.2";
  pname = "asunder";
  src = fetchurl {
    url = "http://littlesvr.ca/asunder/releases/asunder-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-iGji4bl7ZofIAOf2EiYqMWu4V+3TmIN2jOYottJTN2s=";
+    hash = "sha256-txNB10bM9WqnexeFxq+BqmQdCErD00t4vrU3YYhItks=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ca/cargo-outdated/package.nix
+++ b/pkgs/by-name/ca/cargo-outdated/package.nix
@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cargo-outdated";
-  version = "0.18.0";
+  version = "0.19.0";

  src = fetchFromGitHub {
    owner = "kbknapp";
    repo = "cargo-outdated";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-r7FtuXx9+OmVAdL6+9s2bYHjsURmX60+2c7+2FjkSRs=";
+    hash = "sha256-V4zNFi/ZU98egCElU/dDLQZm/8f6oyvbeQYn7JFraDs=";
  };

-  cargoHash = "sha256-l4UfmntTRlqRq1040FTzAn/QU33+owv569tcWNXSGN0=";
+  cargoHash = "sha256-51UjhAC2boNgW5kc7WxZOxcnXirw1E07CjLRcj/GEOM=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/by-name/el/elinks/package.nix
+++ b/pkgs/by-name/el/elinks/package.nix
@ -33,13 +33,13 @@ assert enablePython -> python != null;

 stdenv.mkDerivation (finalAttrs: {
  pname = "elinks";
-  version = "0.19.0";
+  version = "0.19.1";

  src = fetchFromGitHub {
    owner = "rkd77";
    repo = "elinks";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-eFH42PCMF3HPvNqcaXOyIM6AAr3RusgxiRlUa2X8B9U=";
+    hash = "sha256-aQ+q2I6uTVv5kpKBaGJ1xiE/9vv9T7JI05VX/ROkAqA=";
  };

  buildInputs = [
--- a/pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch
+++ b/pkgs/by-name/fw/fwupd/0001-Install-fwupdplugin-to-out.patch
@ -8,7 +8,7 @@ Subject: [PATCH] Install fwupdplugin to out
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/meson.build b/meson.build
-index b711ab04b..7b065f278 100644
+index 1a56d3308..c7bf2c9aa 100644
 --- a/meson.build
 +++ b/meson.build
@@ -734,7 +734,7 @@ if build_standalone
--- a/pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch
+++ b/pkgs/by-name/fw/fwupd/0002-Add-output-for-installed-tests.patch
@ -24,11 +24,11 @@ index e15cab2fa..bad033dbf 100644
 
 if umockdev_integration_tests.allowed()
 diff --git a/meson.build b/meson.build
-index 7b065f278..1a4b0ea1f 100644
+index c7bf2c9aa..bf77bf6d6 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -239,8 +239,8 @@ else
-   datadir = join_paths(prefix, get_option('datadir'))
+@@ -241,8 +241,8 @@ else
+   includedir = join_paths(prefix, get_option('includedir'))
   sysconfdir = join_paths(prefix, get_option('sysconfdir'))
   localstatedir = join_paths(prefix, get_option('localstatedir'))
 -  installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name())
@ -47,10 +47,10 @@ index 7b065f278..1a4b0ea1f 100644
 conf.set_quoted('FWUPD_LIBDIR', libdir)
 conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir)
 diff --git a/meson_options.txt b/meson_options.txt
-index 18991b983..937578f19 100644
+index eb57391eb..420997355 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -197,6 +197,11 @@ option(
+@@ -198,6 +198,11 @@ option(
   value: 'fwupd-refresh',
   description: 'User account to use for fwupd-refresh.service (empty for DynamicUser)',
 )
--- a/pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch
+++ b/pkgs/by-name/fw/fwupd/0003-Add-option-for-installation-sysconfdir.patch
@ -6,13 +6,13 @@ Subject: [PATCH] Add option for installation sysconfdir
 ---
 data/bios-settings.d/meson.build |  2 +-
 data/meson.build                 |  2 +-
- data/pki/meson.build             |  8 ++++----
+ data/pki/meson.build             |  4 ++--
 data/remotes.d/meson.build       |  8 ++++----
 docs/meson.build                 | 16 ++++++++--------
 meson.build                      |  6 ++++++
 meson_options.txt                |  6 ++++++
 plugins/uefi-capsule/meson.build |  4 ++--
- 8 files changed, 32 insertions(+), 20 deletions(-)
+ 8 files changed, 30 insertions(+), 18 deletions(-)

 diff --git a/data/bios-settings.d/meson.build b/data/bios-settings.d/meson.build
 index 2a2a07016..99df55afb 100644
@ -27,7 +27,7 @@ index 2a2a07016..99df55afb 100644
   )
 endif
 diff --git a/data/meson.build b/data/meson.build
-index 5716669f0..78e754f40 100644
+index 70d08c55e..5a5d8bf46 100644
 --- a/data/meson.build
 +++ b/data/meson.build
@@ -29,7 +29,7 @@ if build_standalone
@ -40,25 +40,10 @@ index 5716669f0..78e754f40 100644
   )
   plugin_quirks += files('cfi.quirk', 'ds20.quirk', 'power.quirk', 'vendors.quirk')
 diff --git a/data/pki/meson.build b/data/pki/meson.build
-index 1072051c0..6ef9c9111 100644
+index b87068405..21f59753a 100644
 --- a/data/pki/meson.build
 +++ b/data/pki/meson.build
-@@ -12,12 +12,12 @@ if supported_gpg
-   install_data(
-     ['GPG-KEY-Linux-Foundation-Firmware', 'GPG-KEY-Linux-Vendor-Firmware-Service'],
-     install_tag: 'runtime',
-    install_dir: join_paths(sysconfdir, 'pki', 'fwupd'),
-+    install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd'),
-   )
-   install_data(
-     ['GPG-KEY-Linux-Foundation-Metadata', 'GPG-KEY-Linux-Vendor-Firmware-Service'],
-     install_tag: 'runtime',
-    install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata'),
-+    install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata'),
-   )
- endif
- 
-@@ -25,11 +25,11 @@ if supported_pkcs7
+@@ -8,11 +8,11 @@ if supported_pkcs7
   install_data(
     ['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'],
     install_tag: 'runtime',
@ -111,7 +96,7 @@ index b8d24c267..0dd4ad32a 100644
 +  install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
 )
 diff --git a/docs/meson.build b/docs/meson.build
-index 787b4387c..b3144757f 100644
+index b4d48b086..8a1f8fc8c 100644
 --- a/docs/meson.build
 +++ b/docs/meson.build
@@ -196,7 +196,7 @@ if build_docs
@ -123,7 +108,7 @@ index 787b4387c..b3144757f 100644
   )
 
   subdir('hsi-tests.d')
-@@ -247,7 +247,7 @@ if build_docs
+@@ -257,7 +257,7 @@ if build_docs
     build_by_default: true,
     install: true,
     install_tag: 'doc',
@ -132,7 +117,7 @@ index 787b4387c..b3144757f 100644
   )
   man_cmd = []
   foreach man : man_md
-@@ -260,36 +260,36 @@ if build_docs
+@@ -270,36 +270,36 @@ if build_docs
     command: [generate_index, '@INPUT@', '-o', '@OUTPUT@', man_cmd],
     install: true,
     install_tag: 'doc',
@ -176,10 +161,10 @@ index 787b4387c..b3144757f 100644
   )
 endif
 diff --git a/meson.build b/meson.build
-index 1a4b0ea1f..16c7cad40 100644
+index bf77bf6d6..f1f51e841 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -246,6 +246,12 @@ endif
+@@ -248,6 +248,12 @@ endif
 mandir = join_paths(prefix, get_option('mandir'))
 localedir = join_paths(prefix, get_option('localedir'))
 
@ -193,7 +178,7 @@ index 1a4b0ea1f..16c7cad40 100644
 gio = dependency(
   'gio-2.0',
 diff --git a/meson_options.txt b/meson_options.txt
-index 937578f19..08b26b3ad 100644
+index 420997355..67b3058d5 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
@@ -14,6 +14,12 @@ option(
@ -210,7 +195,7 @@ index 937578f19..08b26b3ad 100644
   'build',
   type: 'combo',
 diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build
-index 647ace53e..4ee0192df 100644
+index f104f36d7..30356ea53 100644
 --- a/plugins/uefi-capsule/meson.build
 +++ b/plugins/uefi-capsule/meson.build
@@ -23,7 +23,7 @@ if host_machine.system() == 'linux'
--- a/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch
+++ b/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch
@ -8,10 +8,10 @@ Subject: [PATCH] Get the efi app from fwupd-efi
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/meson.build b/meson.build
-index 16c7cad40..81804bf3b 100644
+index f1f51e841..aaefe55d9 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -657,7 +657,7 @@ endif
+@@ -646,7 +646,7 @@ endif
 
 # EFI
 if build_standalone
--- a/pkgs/by-name/fw/fwupd/package.nix
+++ b/pkgs/by-name/fw/fwupd/package.nix
@ -17,9 +17,6 @@
  pkg-config,
  pkgsBuildBuild,

-  # propagatedBuildInputs
-  json-glib,
-
  # nativeBuildInputs
  ensureNewerSourcesForZipFilesHook,
  gettext,
@ -27,8 +24,6 @@
  gobject-introspection,
  meson,
  ninja,
-  protobuf,
-  protobufc,
  shared-mime-info,
  vala,
  wrapGAppsNoGuiHook,
@ -42,7 +37,6 @@
  fwupd-efi,
  gnutls,
  gusb,
-  libarchive,
  libcbor,
  libdrm,
  libgudev,
@ -135,7 +129,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "fwupd";
-  version = "2.0.19";
+  version = "2.1.1";

  # libfwupd goes to lib
  # daemon, plug-ins and libfwupdplugin go to out
@ -153,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "fwupd";
    repo = "fwupd";
    tag = finalAttrs.version;
-    hash = "sha256-DjO+7CEOef5KMbYEPtDr3GrnXTDUO/jwwZ4P17o4oDg=";
+    hash = "sha256-pb5BBA+3KTeZZ8WyNDaY9EKNTxp4MT/3G/MEgQ+Nysk=";
  };

  patches = [
@ -174,6 +168,18 @@ stdenv.mkDerivation (finalAttrs: {

    # EFI capsule is located in fwupd-efi now.
    ./0004-Get-the-efi-app-from-fwupd-efi.patch
+
+    # FIXME: remove patches that fix CI on aarch64 after next release
+    (fetchpatch {
+      url = "https://github.com/fwupd/fwupd/commit/b3d721360faa4de7dd6960d8f9f8f13aa310715f.patch";
+      sha256 = "sha256-x37QCK7XBzUUjUj1m3jaNe1qvaqtszB9DGFyF8gC3Ig=";
+      name = "fix-mtdram-test-for-missing-kernel-module.patch";
+    })
+    (fetchpatch {
+      url = "https://github.com/fwupd/fwupd/commit/9ad8b76dc6c5af005a2c712ae3a6f352b51e9eea.patch";
+      sha256 = "sha256-h9zLTHeJbfDoamdfICKc0ohQ51yJC4I/CK0SQ4H6rRk=";
+      name = "fix-test_get_devices-on-non-x86-architectures.patch";
+    })
  ];

  postPatch = ''
@ -197,10 +203,6 @@ stdenv.mkDerivation (finalAttrs: {
    (pkgsBuildBuild.callPackage ./build-time-python.nix { })
  ];

-  propagatedBuildInputs = [
-    json-glib
-  ];
-
  nativeBuildInputs = [
    ensureNewerSourcesForZipFilesHook # required for firmware zipping
    gettext
@ -210,8 +212,6 @@ stdenv.mkDerivation (finalAttrs: {
    meson
    ninja
    pkg-config
-    protobuf # for protoc
-    protobufc # for protoc-gen-c
    shared-mime-info
    vala
    wrapGAppsNoGuiHook
@ -230,7 +230,6 @@ stdenv.mkDerivation (finalAttrs: {
    fwupd-efi
    gnutls
    gusb
-    libarchive
    libcbor
    libdrm
    libgudev
@ -243,7 +242,6 @@ stdenv.mkDerivation (finalAttrs: {
    modemmanager
    pango
    polkit
-    protobufc
    readline
    sqlite
    tpm2-tss
@ -265,6 +263,9 @@ stdenv.mkDerivation (finalAttrs: {
    (lib.mesonOption "sysconfdir_install" "${placeholder "out"}/etc")
    (lib.mesonOption "efi_os_dir" "nixos")
    (lib.mesonEnable "plugin_modem_manager" true)
+    # HSI is auto-disabled on non-x86 upstream; auto_features=enabled overrides
+    # that, breaking the fwupdtool installed test which expects rc=1 on non-x86.
+    (lib.mesonEnable "hsi" isx86)
    (lib.mesonBool "vendor_metadata" true)
    (lib.mesonBool "plugin_uefi_capsule_splash" false)
    # TODO: what should this be?
@ -359,12 +360,8 @@ stdenv.mkDerivation (finalAttrs: {
      "fwupd/remotes.d/lvfs.conf"
      "fwupd/remotes.d/vendor.conf"
      "fwupd/remotes.d/vendor-directory.conf"
-      "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware"
-      "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service"
      "pki/fwupd/LVFS-CA-2025PQ.pem"
      "pki/fwupd/LVFS-CA.pem"
-      "pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata"
-      "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service"
      "pki/fwupd-metadata/LVFS-CA-2025PQ.pem"
      "pki/fwupd-metadata/LVFS-CA.pem"
      "grub.d/35_fwupd"
--- a/pkgs/by-name/ge/geogram/cmake-fix-link-libraries.patch
+++ b/pkgs/by-name/ge/geogram/cmake-fix-link-libraries.patch
@ -0,0 +1,17 @@
+--- a/src/lib/geogram/CMakeLists.txt	1970-01-01 01:00:01.000000000 +0100
+++ b/src/lib/geogram/CMakeLists.txt	2026-03-03 10:21:32.918057952 +0100
+@@ -92,7 +92,13 @@
+   if(GEOGRAM_USE_BUILTIN_DEPS)
+       target_link_libraries(geogram pthread dl)
+   else()
+-      target_link_libraries(geogram pthread dl lua5.4 z triangle Meshb.7 rply)
+      target_link_libraries(geogram pthread dl z Meshb.7 rply)
+      if(GEOGRAM_WITH_LUA)
+         target_link_libraries(geogram lua5.4)
+      endif()
+      if(GEOGRAM_WITH_TRIANGLE)
+         target_link_libraries(geogram triangle)
+      endif()
+   endif()
+ endif()
+ endif()
--- a/pkgs/by-name/ge/geogram/package.nix
+++ b/pkgs/by-name/ge/geogram/package.nix
@ -5,64 +5,58 @@
  cmake,
  doxygen,
  zlib,
-  python3Packages,
  nix-update-script,
-  fetchpatch2,
+  stb,
+  libmeshb,
+  rply,
 }:
-
-let
-  exploragram = fetchFromGitHub {
-    owner = "BrunoLevy";
-    repo = "exploragram";
-    rev = "3190f685653f8aa75b7c4604d008c59a999f1bb6";
-    hash = "sha256-9ePCOyQWSxu12PtHFSxfoDcvTtxvYR3T68sU3cAfZiE=";
-  };
-  testdata = fetchFromGitHub {
-    owner = "BrunoLevy";
-    repo = "geogram.data";
-    rev = "ceab6179189d23713b902b6f26ea2ff36aea1515";
-    hash = "sha256-zUmYI6+0IdDkglLzzWHS8ZKmc5O6aJ2X4IwRBouRIxI=";
-  };
-in
 stdenv.mkDerivation (finalAttrs: {
  pname = "geogram";
-  version = "1.9.2";
+  version = "1.9.9";

  src = fetchFromGitHub {
    owner = "BrunoLevy";
    repo = "geogram";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-v7ChuE9F/z1MD5OUMiGXZWiGqjMauIka4sNXVDe/yYU=";
+    hash = "sha256-wAq6j/HUOv6In49lJVRZ2iS6ugbtYOxHN3PwTE1HZks=";
    fetchSubmodules = true;
  };

  outputs = [
-    "bin"
    "lib"
    "dev"
    "doc"
    "out"
  ];

+  strictDeps = true;
+  __structuredAttrs = true;
+
  cmakeFlags = [
    # Triangle is unfree
-    "-DGEOGRAM_WITH_TRIANGLE=OFF"
+    (lib.cmakeBool "GEOGRAM_WITH_TRIANGLE" false)

    # Disable some extra features (feel free to create a PR if you need one of those)

    # If GEOGRAM_WITH_LEGACY_NUMERICS is enabled GeoGram will build its own version of
    # ARPACK, CBLAS, CLAPACK, LIBF2C and SUPERLU
-    "-DGEOGRAM_WITH_LEGACY_NUMERICS=OFF"
+    (lib.cmakeBool "GEOGRAM_WITH_LEGACY_NUMERICS" false)

    # Don't build Lua
-    "-DGEOGRAM_WITH_LUA=OFF"
+    (lib.cmakeBool "GEOGRAM_WITH_LUA" false)

    # Disable certain features requiring GLFW
-    "-DGEOGRAM_WITH_GRAPHICS=OFF"
+    (lib.cmakeBool "GEOGRAM_WITH_GRAPHICS" false)
+
+    # Enables a packaging mode in some places
+    (lib.cmakeBool "GEOGRAM_FOR_DEBIAN" true)
+
+    # Only build the library itself
+    (lib.cmakeBool "GEOGRAM_LIB_ONLY" true)

    # NOTE: Options introduced by patch (see below)
-    "-DGEOGRAM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake"
-    "-DGEOGRAM_INSTALL_PKGCONFIG_DIR=${placeholder "dev"}/lib/pkgconfig"
+    (lib.cmakeOptionType "path" "GEOGRAM_INSTALL_CMAKE_DIR" "${placeholder "dev"}/lib/cmake")
+    (lib.cmakeOptionType "path" "GEOGRAM_INSTALL_PKGCONFIG_DIR" "${placeholder "dev"}/lib/pkgconfig")
  ];

  nativeBuildInputs = [
@ -72,64 +66,25 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs = [
    zlib
+    stb
+    libmeshb
+    rply
  ];

-  # exploragram library is not listed as submodule and must be copied manually
-  prePatch = ''
-    cp -r ${exploragram} ./src/lib/exploragram/ && chmod 755 ./src/lib/exploragram/
-  '';
-
  patches = [
    # This patch replaces the bundled (outdated) zlib with our zlib
    # Should be harmless, but if there are issues this patch can also be removed
    # Also check https://github.com/BrunoLevy/geogram/issues/49 for progress
    ./replace-bundled-zlib.patch

-    # fixes https://github.com/BrunoLevy/geogram/issues/203, remove when 1.9.3 is released
-    (fetchpatch2 {
-      url = "https://github.com/BrunoLevy/geogram/commit/2e1b6fba499ddc55b2150a1f610cf9f8d4934c39.patch";
-      hash = "sha256-t6Pocf3VT8HpKOSh1UKKa0QHpsZyFqlAng6ltiAfKA8=";
-    })
+    ./cmake-fix-link-libraries.patch
  ];

-  postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 ''
-    substituteInPlace cmake/platforms/*/config.cmake \
-      --replace "-m64" ""
-  '';
-
  postBuild = ''
    make doc-devkit-full
  '';

-  nativeCheckInputs = [
-    python3Packages.robotframework
-  ];
-
-  doCheck = true;
-
-  checkPhase =
-    let
-      skippedTests = [
-        # Skip slow RVD test
-        "RVD"
-
-        # Needs unfree library geogramplus with extended precision
-        # see https://github.com/BrunoLevy/geogram/wiki/GeogramPlus
-        "CSGplus"
-      ];
-    in
-    ''
-      runHook preCheck
-
-      ln -s ${testdata} ../tests/data
-
-      source tests/testenv.sh
-      robot \
-        ${lib.concatMapStringsSep " " (t: lib.escapeShellArg "--skip=${t}") skippedTests} \
-        ../tests
-
-      runHook postCheck
-    '';
+  doCheck = false;

  passthru.updateScript = nix-update-script { };

--- a/pkgs/by-name/ge/geogram/replace-bundled-zlib.patch
+++ b/pkgs/by-name/ge/geogram/replace-bundled-zlib.patch
@ -1,6 +1,6 @@
 --- a/src/lib/geogram/third_party/CMakeLists.txt	1970-01-01 01:00:01.000000000 +0100
 +++ b/src/lib/geogram/third_party/CMakeLists.txt	2023-03-09 20:46:16.740801862 +0100
-@@ -33,7 +33,6 @@
+@@ -62,7 +62,6 @@
 aux_source_directories(SOURCES "Source Files\\LM6"          LM7)
 aux_source_directories(SOURCES "Source Files\\rply"         rply)
 aux_source_directories(SOURCES "Source Files\\shewchuk"     shewchuk)
@ -10,7 +10,7 @@
 
 --- a/src/lib/geogram/CMakeLists.txt	1970-01-01 01:00:01.000000000 +0100
 +++ b/src/lib/geogram/CMakeLists.txt	2023-03-09 20:49:21.080059939 +0100
-@@ -70,6 +70,9 @@
+@@ -109,6 +109,9 @@
     target_link_libraries(geogram psapi)
 endif()
 
@ -20,24 +20,11 @@
 # Install the library
 install_devkit_targets(geogram)
 
--- a/src/lib/geogram/basic/geofile.h	1970-01-01 01:00:01.000000000 +0100
-+++ b/src/lib/geogram/basic/geofile.h	2023-03-09 20:52:33.713329571 +0100
-@@ -44,7 +44,7 @@
- #include <geogram/basic/numeric.h>
- #include <geogram/basic/memory.h>
- #include <geogram/basic/string.h>
-#include <geogram/third_party/zlib/zlib.h>
-+#include <zlib.h>
- 
- #include <stdexcept>
- #include <fstream>
 --- a/src/lib/geogram/third_party/CMakeLists.txt	1970-01-01 01:00:01.000000000 +0100
-+++ b/src/lib/geogram/third_party/CMakeLists.txt	2023-03-09 20:54:50.276520762 +0100
-@@ -60,8 +59,10 @@
-     ${ANDROID_NDK}/sources/android/native_app_glue
-   )
+++ b/src/lib/geogram/third_party/CMakeLists.txt	2026-03-03 09:48:09.800627417 +0100
+@@ -92,6 +92,8 @@
   message(STATUS "building for Android")
- endif()  
+ endif()
 
 +find_package(ZLIB REQUIRED)
 +target_link_libraries(geogram_third_party PUBLIC ZLIB::ZLIB)
--- a/pkgs/by-name/gh/ghostfolio/package.nix
+++ b/pkgs/by-name/gh/ghostfolio/package.nix
@ -11,13 +11,13 @@

 buildNpmPackage rec {
  pname = "ghostfolio";
-  version = "2.252.0";
+  version = "2.254.0";

  src = fetchFromGitHub {
    owner = "ghostfolio";
    repo = "ghostfolio";
    tag = version;
-    hash = "sha256-IR6/LTCBUfGweGA+cM/qfgK3i2ZUaV9u7K2XZH0Q0ZI=";
+    hash = "sha256-bcUr0tzq/X2pOmg7ZYj46+TQO9NBKmevm+C6PbyV/yc=";
    # 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;
@ -27,7 +27,7 @@ buildNpmPackage rec {
    '';
  };

-  npmDepsHash = "sha256-2EGjP7PQVeWpXonAOM7JD3rRptyEbNgSGe1sTlV/ImM=";
+  npmDepsHash = "sha256-Wa15OSsd2IXTO1OjZoiFsSF0UhrzvS6fsymvxyPm0s8=";

  nativeBuildInputs = [
    prisma_6
--- a/pkgs/by-name/gi/github-copilot-cli/sources.json
+++ b/pkgs/by-name/gi/github-copilot-cli/sources.json
@ -1,19 +1,19 @@
 {
-  "version": "1.0.21",
+  "version": "1.0.26",
  "x86_64-linux": {
    "name": "copilot-linux-x64",
-    "hash": "sha256-pvxJSj3Vp2JG+zNCS68Iq7W0y2iJ//KM8pUVXCixz3c="
+    "hash": "sha256-i77fn0DOW/VjCzXY4mQbmtADQ2pFsju4zPM9iZNmmG8="
  },
  "aarch64-linux": {
    "name": "copilot-linux-arm64",
-    "hash": "sha256-QUuuOtIo5LtJ734f5pf7wUSdNF+VdmBxp8Haa7IasWg="
+    "hash": "sha256-bc/MoSL8RvCRLE1Qkwi9OdZpSIYc7LW6tjGU+kqb6nI="
  },
  "x86_64-darwin": {
    "name": "copilot-darwin-x64",
-    "hash": "sha256-dS3MmOrDhgatzqZOXumIiinINduWm17dq95rqPmeqXc="
+    "hash": "sha256-l316KVesMJtZflglg1fYgYvmBAM3LvaK2B9YxuInpLg="
  },
  "aarch64-darwin": {
    "name": "copilot-darwin-arm64",
-    "hash": "sha256-mQy7nZTNLa0CRej3xO0riP+qhlMb+Eboby2QWPTUWIo="
+    "hash": "sha256-Y3/7JUU3g5sssXxJ/1+ERpJ9XOkYl0gPM+6vzwQO79U="
  }
 }
--- a/pkgs/by-name/ip/ipsw/package.nix
+++ b/pkgs/by-name/ip/ipsw/package.nix
@ -6,17 +6,17 @@
 }:

 buildGo126Module (finalAttrs: {
-  version = "3.1.668";
+  version = "3.1.671";
  pname = "ipsw";

  src = fetchFromGitHub {
    owner = "blacktop";
    repo = "ipsw";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-SsFj5/a9Xk7I4H07kdfVnbIF6sTE61ztqYMSFt5tpPY=";
+    hash = "sha256-Grh0WeeslpebG+ryacUPXD3OPIbJtA1zDejothKmdxQ=";
  };

-  vendorHash = "sha256-jvZSO3aLRI+7Nl/U4dmyhKrXkRV97tmkkU+uSHR8+Co=";
+  vendorHash = "sha256-J4S5VsGZEeDdiNNl0LlqIPG53Vg0xKuW1wsmrULetgQ=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/le/leo-editor/package.nix
+++ b/pkgs/by-name/le/leo-editor/package.nix
@ -10,13 +10,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "leo-editor";
-  version = "6.8.7";
+  version = "6.8.8";

  src = fetchFromGitHub {
    owner = "leo-editor";
    repo = "leo-editor";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-GbbSPZQEPufRcF2aLjr9vEVLZlUIgAEP1QkaNILwJV4=";
+    hash = "sha256-A7eFYdmKd4E515xRI4fuLs8wuC9sZu1qd2qMZXs7Ko0=";
  };

  dontBuild = true;
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@ -20,13 +20,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libdeltachat";
-  version = "2.48.0";
+  version = "2.49.0";

  src = fetchFromGitHub {
    owner = "chatmail";
    repo = "core";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-9qrxzAoBdCzDaMWZnCPxKy9bISd19aI4U1kRcK85Mzg=";
+    hash = "sha256-iMgWXlffbGG25iM/SMCQzer1J6clDWwP0hURloL3n2k=";
  };

  patches = [
@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
  cargoDeps = rustPlatform.fetchCargoVendor {
    pname = "chatmail-core";
    inherit (finalAttrs) version src;
-    hash = "sha256-UcQoY2NvnvWmGjHn1xwi0deyPZjtnbfQJJo32K7TX38=";
+    hash = "sha256-0QhMJis1Hbl/Tn3Rwiz+UjCSieodfYhgL060DWjEOIM=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/li/libmeshb/package.nix
+++ b/pkgs/by-name/li/libmeshb/package.nix
@ -0,0 +1,35 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  gfortran,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libmeshb";
+  version = "7.80";
+
+  src = fetchFromGitHub {
+    owner = "LoicMarechal";
+    repo = "libMeshb";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-nkQ7Lq0rUCbqaWq6GkHejDqWFa21/pGBLZg93LSVvjc=";
+  };
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [
+    cmake
+    gfortran
+  ];
+
+  meta = {
+    description = "A library to handle the *.meshb file format.";
+    homepage = "https://github.com/LoicMarechal/libMeshb";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ tmarkus ];
+  };
+})
--- a/pkgs/by-name/md/mdns-scanner/package.nix
+++ b/pkgs/by-name/md/mdns-scanner/package.nix
@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "mdns-scanner";
-  version = "0.26.3";
+  version = "0.27.0";

  src = fetchFromGitHub {
    owner = "CramBL";
    repo = "mdns-scanner";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-/Bgt5dROZVbtRHhRiwGzNdZgXb5KSmRV0S9sXyETF/k=";
+    hash = "sha256-rJhY2U7GMzt8/yoXKyHc0no38nfdYTnGn8ghdeNhM2Q=";
  };

-  cargoHash = "sha256-blyzKp25kWFrVo+FCfYp5Kd3LPqmNuSYgBdiibzMX1c=";
+  cargoHash = "sha256-n/KVarvd3gcWLYZD5Ww7XoMRHRuTcldxI/HB4Wta5NA=";

  meta = {
    homepage = "https://github.com/CramBL/mdns-scanner";
--- a/pkgs/by-name/me/metadata-cleaner/package.nix
+++ b/pkgs/by-name/me/metadata-cleaner/package.nix
@ -12,7 +12,6 @@
  librsvg,
  meson,
  ninja,
-  nix-update-script,
  pkg-config,
  poppler_gi,
  wrapGAppsHook4,
@ -20,14 +19,14 @@

 python3.pkgs.buildPythonApplication (finalAttrs: {
  pname = "metadata-cleaner";
-  version = "2.5.6";
+  version = "4.0.0";
  pyproject = false;

  src = fetchFromGitLab {
-    owner = "rmnvgr";
-    repo = "metadata-cleaner";
+    owner = "metadatacleaner";
+    repo = "metadatacleaner";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-J+nwgLbAFoh1gq3J4cqQEShZJCSZesyCjT9DfkCWIHs=";
+    hash = "sha256-9e8uH//FtufYUsvule3JirkeHTjDMebruZ3bAYyDVWY=";
  };

  nativeBuildInputs = [
@ -56,15 +55,11 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
    pygobject3
  ];

-  passthru = {
-    updateScript = nix-update-script { };
-  };
-
  meta = {
    description = "Python GTK application to view and clean metadata in files, using mat2";
    mainProgram = "metadata-cleaner";
-    homepage = "https://gitlab.com/rmnvgr/metadata-cleaner";
-    changelog = "https://gitlab.com/rmnvgr/metadata-cleaner/-/blob/v${finalAttrs.version}/CHANGELOG.md";
+    homepage = "https://gitlab.com/metadatacleaner/metadatacleaner";
+    changelog = "https://gitlab.com/metadatacleaner/metadatacleaner/-/releases/${finalAttrs.src.tag}";
    license = with lib.licenses; [
      gpl3Plus
      cc-by-sa-40
--- a/pkgs/by-name/ne/neovide/package.nix
+++ b/pkgs/by-name/ne/neovide/package.nix
@ -30,16 +30,16 @@

 rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
  pname = "neovide";
-  version = "0.16.1";
+  version = "0.16.2";

  src = fetchFromGitHub {
    owner = "neovide";
    repo = "neovide";
    tag = finalAttrs.version;
-    hash = "sha256-yiIJEVEjXvFkTm4PIPOVX8gDAI6aA5PzBMlu51POCZU=";
+    hash = "sha256-mzlyw9NIBb35QJ5L7+ZxgJ5IUoHznAUQOLA0SglJ3bw=";
  };

-  cargoHash = "sha256-bWkK8tmKJrBKmdzJzHDht7BYVBMgpapzG79o8RM+Wuc=";
+  cargoHash = "sha256-WVNmG+KJK93yLrL2/KPc2czAxwt5brKxRkrPB7Bv46M=";

  env = {
    SKIA_SOURCE_DIR =
--- a/pkgs/by-name/nf/nfdump/package.nix
+++ b/pkgs/by-name/nf/nfdump/package.nix
@ -14,13 +14,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "nfdump";
-  version = "1.7.6";
+  version = "1.7.7";

  src = fetchFromGitHub {
    owner = "phaag";
    repo = "nfdump";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-4iyoQAjOQW4KNJbRmdisdecuOz+DFvQGEKgq8cq7GDI=";
+    hash = "sha256-2CQ57OEKCOaRvuBX4GN2Gz/S7B6CUTpvArD84QqLZEw=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/no/noti/package.nix
+++ b/pkgs/by-name/no/noti/package.nix
@ -1,7 +1,7 @@
 {
  lib,
  buildGoModule,
-  fetchFromGitHub,
+  fetchFromCodeberg,
  installShellFiles,
 }:

@ -9,8 +9,8 @@ buildGoModule (finalAttrs: {
  pname = "noti";
  version = "3.8.0";

-  src = fetchFromGitHub {
-    owner = "variadico";
+  src = fetchFromCodeberg {
+    owner = "roble";
    repo = "noti";
    tag = finalAttrs.version;
    hash = "sha256-FwOS4ifMiODIzKVQufLhkDYOcmXz9dAfWw+hM3rXT/Y=";
@ -44,7 +44,7 @@ buildGoModule (finalAttrs: {
      Never sit and wait for some long-running process to finish. Noti can alert
      you when it's done. You can receive messages on your computer or phone.
    '';
-    homepage = "https://github.com/variadico/noti";
+    homepage = "https://codeberg.org/roble/noti";
    license = lib.licenses.mit;
    maintainers = [ lib.maintainers.stites ];
    mainProgram = "noti";
--- a/pkgs/by-name/re/resterm/package.nix
+++ b/pkgs/by-name/re/resterm/package.nix
@ -8,13 +8,13 @@

 buildGoModule (finalAttrs: {
  pname = "resterm";
-  version = "0.24.1";
+  version = "0.26.2";

  src = fetchFromGitHub {
    owner = "unkn0wn-root";
    repo = "resterm";
    tag = "v${finalAttrs.version}";
-    sha256 = "sha256-7AgxDA1E20H2WYGFuwCIyBcB/1Zt58AbQwkEkcJdnq0=";
+    hash = "sha256-Addc59NlrD4GMEuir2BKoURDjMcqZYtAq4UPRCxNmCE=";
  };

  vendorHash = "sha256-AjckKD6NScBa8w9nWMdVExuNadz3vHnK854XXg3nj84=";
--- a/pkgs/by-name/rp/rply/package.nix
+++ b/pkgs/by-name/rp/rply/package.nix
@ -0,0 +1,47 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "rply";
+  version = "1.1.4";
+
+  src = fetchFromGitHub {
+    owner = "diegonehab";
+    repo = finalAttrs.pname;
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-WkUgb6WeYp1OpV3/+EcEJkxEXYP0e7inQZQM87tGOGo=";
+  };
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  buildPhase = ''
+    runHook preBuild
+
+    gcc -c -fPIC -o rply.o rply.c
+    gcc -shared -o librply.so rply.o
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib $out/include
+    cp -t $out/lib librply.so
+    cp -t $out/include rply.h
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "ANSI C Library for PLY file format input and output";
+    homepage = "https://github.com/diegonehab/rply";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ tmarkus ];
+  };
+})
--- a/pkgs/by-name/sh/shishi/package.nix
+++ b/pkgs/by-name/sh/shishi/package.nix
@ -30,15 +30,24 @@ stdenv.mkDerivation (finalAttrs: {

  separateDebugInfo = true;

-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    libgcrypt
+    pkg-config
+  ];
+
  buildInputs = [
    libgcrypt
    libgpg-error
    libtasn1
-    # TODO use lib.optional instead of setting packages to null
-    (if usePam then pam else null)
-    (if useLibidn then libidn else null)
-    (if useGnutls then gnutls else null)
+  ]
+  ++ lib.optionals usePam [
+    pam
+  ]
+  ++ lib.optionals useLibidn [
+    libidn
+  ]
+  ++ lib.optionals useGnutls [
+    gnutls
  ];

  configureFlags = [
@ -79,6 +88,8 @@ stdenv.mkDerivation (finalAttrs: {
    -e 's,\(-ltasn1\),-L${libtasn1.out}/lib \1,'
  '';

+  strictDeps = true;
+
  meta = {
    homepage = "https://www.gnu.org/software/shishi/";
    description = "Implementation of the Kerberos 5 network security system";
--- a/pkgs/by-name/sh/shot-scraper/package.nix
+++ b/pkgs/by-name/sh/shot-scraper/package.nix
@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication (finalAttrs: {
  pname = "shot-scraper";
-  version = "1.9";
+  version = "1.9.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "simonw";
    repo = "shot-scraper";
    tag = finalAttrs.version;
-    hash = "sha256-HIiUZZz2/EqTdaCtiaqVaJfbRwkoYL8H6XHaIYP0R6M=";
+    hash = "sha256-l1SPhdcQ2lH2Glw4BJSlJxUSBE28b5/ny+66hUJtOQU=";
  };

  postPatch = ''
--- a/pkgs/by-name/sn/snmalloc/package.nix
+++ b/pkgs/by-name/sn/snmalloc/package.nix
@ -0,0 +1,42 @@
+{
+  lib,
+  stdenv,
+  clangStdenv,
+  fetchFromGitHub,
+  cmake,
+  nix-update-script,
+}:
+
+clangStdenv.mkDerivation (finalAttrs: {
+  pname = "snmalloc";
+  version = "0.7.4";
+  src = fetchFromGitHub {
+    owner = "microsoft";
+    repo = "snmalloc";
+    tag = finalAttrs.version;
+    hash = "sha256-+UCqUrfvhnB4leiYCnGJ8ORfVkTaGimaErP56XCJ5PM=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Message passing based memory allocator";
+    homepage = "https://github.com/microsoft/snmalloc";
+    downloadPage = "https://github.com/microsoft/snmalloc/releases";
+    changelog = "https://github.com/microsoft/snmalloc/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ VZstless ];
+  };
+})
--- a/pkgs/by-name/sp/spicedb/package.nix
+++ b/pkgs/by-name/sp/spicedb/package.nix
@ -8,16 +8,16 @@

 buildGoModule (finalAttrs: {
  pname = "spicedb";
-  version = "1.51.0";
+  version = "1.51.1";

  src = fetchFromGitHub {
    owner = "authzed";
    repo = "spicedb";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-kKdBS9Rl0nHRE3Nv/B5KF8SRlG4dnGmpVt8qaE3idMI=";
+    hash = "sha256-I5srDvkGDe0QQirDtMzTGdz8TS625E8wHYJDdRADhhc=";
  };

-  vendorHash = "sha256-9VWTJyAOJD7YivzNcVOYYF3eWnR7Fhb/neSVx9pNM7g=";
+  vendorHash = "sha256-vVkqu2YR/puTAdsPZFWrPDo57Npke4+vngJBcQeQr8Q=";

  ldflags = [
    "-X 'github.com/jzelinskie/cobrautil/v2.Version=${finalAttrs.src.tag}'"
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@ -13,13 +13,13 @@

 buildGoModule (finalAttrs: {
  pname = "VictoriaMetrics";
-  version = "1.139.0";
+  version = "1.140.0";

  src = fetchFromGitHub {
    owner = "VictoriaMetrics";
    repo = "VictoriaMetrics";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-5+Hlt9cF/V3x+4TGrMd1NPaApQsIWWvDIYmN/BLhLMU=";
+    hash = "sha256-f/qcUSf/JMfe0rTUY5qT9k7MCVqsZCwRzsCv6puz6tw=";
  };

  vendorHash = null;
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@ -1,14 +1,14 @@
 {
  "darwin": {
-    "hash": "sha256-+vr4OINeprn3dqarB6ZotK4oA1h09WT6wIuKyxPtAeQ=",
-    "version": "0.2026.03.25.08.24.stable_09"
+    "hash": "sha256-gkXz9pkv/0T9TR+wGj8PU7JOC4qEbCHoKSei6xdL8Qs=",
+    "version": "0.2026.04.08.08.36.stable_05"
  },
  "linux_x86_64": {
-    "hash": "sha256-FceMF9fAz4XMBwL/iAaQdz/elSnS5DNV1uaBy5BEwSc=",
-    "version": "0.2026.03.25.08.24.stable_09"
+    "hash": "sha256-Vt6NPu5u7LMnP8sxpl8p3JZSk3ymFf4PZmNdmiVMCO0=",
+    "version": "0.2026.04.08.08.36.stable_05"
  },
  "linux_aarch64": {
-    "hash": "sha256-9x3mNKT8PaFaZouMN7iXPfCv2U1SsbkI4BcpzfhCODw=",
-    "version": "0.2026.03.25.08.24.stable_09"
+    "hash": "sha256-ZaZoRRUAxuemXS+vkIlP5skr1BpT5nWOI2jjVjCK+gw=",
+    "version": "0.2026.04.08.08.36.stable_05"
  }
 }
--- a/pkgs/by-name/x4/x42-gmsynth/package.nix
+++ b/pkgs/by-name/x4/x42-gmsynth/package.nix
@ -9,13 +9,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "x42-gmsynth";
-  version = "0.6.3";
+  version = "0.6.4";

  src = fetchFromGitHub {
    owner = "x42";
    repo = "gmsynth.lv2";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-js7c8d+yOjrRBs/xtHNfhXAcbiPX1PKFjHsThtEgzPQ=";
+    hash = "sha256-PDuvVNw9hxJVJwEYGeBJDKAt9ogHHJWELw/8LT+ZnVQ=";
  };

  nativeBuildInputs = [ pkg-config ];
--- a/pkgs/by-name/xb/xbps/package.nix
+++ b/pkgs/by-name/xb/xbps/package.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "xbps";
-  version = "0.60.6";
+  version = "0.60.7";

  src = fetchFromGitHub {
    owner = "void-linux";
    repo = "xbps";
    tag = finalAttrs.version;
-    hash = "sha256-euV8oi1na+mfILnnUHK5S8Pi6+QuOUA8KhD0FHUqM70=";
+    hash = "sha256-noi+OAyBmLCBnmLDWEuNXEOPyqt9Qr1v4CNm7GjKXHA=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/xl/xlockmore/package.nix
+++ b/pkgs/by-name/xl/xlockmore/package.nix
@ -13,11 +13,11 @@

 stdenv.mkDerivation rec {
  pname = "xlockmore";
-  version = "5.87";
+  version = "5.88";

  src = fetchurl {
    url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz";
-    sha256 = "sha256-Pzu/xN3jCMqA05MHj1FTiSHaKzx11cKmBkIOEpVga3s=";
+    sha256 = "sha256-oioJDS8MlSXgsVw11wk7g9TRdYfz7crdHatcn39eB+E=";
    curlOpts = "--user-agent 'Mozilla/5.0'";
  };

--- a/pkgs/by-name/ya/yapesdl/package.nix
+++ b/pkgs/by-name/ya/yapesdl/package.nix
@ -8,13 +8,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "yapesdl";
-  version = "0.80.1";
+  version = "0.81.1";

  src = fetchFromGitHub {
    owner = "calmopyrin";
    repo = "yapesdl";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-VCjxdVatu1h6VNMkLYL8Nknwn7ax0J2OhO1bc7dnQRA=";
+    hash = "sha256-vCScQmkODKZKbvrauuR9WNTjjKEvlomfzB0QifHxSVs=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ze/zexy/package.nix
+++ b/pkgs/by-name/ze/zexy/package.nix
@ -7,14 +7,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "zexy";
-  version = "2.4.3";
+  version = "2.4.4";

  src = fetchFromGitLab {
    domain = "git.iem.at";
    owner = "pd";
    repo = "zexy";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-9f0uYBDBq5lcN/N0uJwC/HBEFcj9b8ZtBHnPAce2s/A=";
+    hash = "sha256-9+kWnfYLSOI2PaFQVzlaq1EjzUeOZvVRomGfWSLNXCw=";
  };

  buildInputs = [ puredata ];
--- a/pkgs/development/python-modules/latex2mathml/default.nix
+++ b/pkgs/development/python-modules/latex2mathml/default.nix
@ -2,26 +2,26 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
-  poetry-core,
+  hatchling,
  pytestCheckHook,
  pytest-cov-stub,
  multidict,
  xmljson,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "latex2mathml";
-  version = "3.78.1";
+  version = "3.79.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "roniemartinez";
    repo = "latex2mathml";
-    tag = version;
-    hash = "sha256-VhBq6KSiomFPue9yzYhU68gH+MkHovVi8VEEFi3yUZ8=";
+    tag = finalAttrs.version;
+    hash = "sha256-/ixS6TlovxOZgBqDq1t6KzcG6EKBSYwf3c+drHjQec4=";
  };

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

  nativeCheckInputs = [
    pytestCheckHook
@ -35,9 +35,9 @@ buildPythonPackage rec {
  meta = {
    description = "Pure Python library for LaTeX to MathML conversion";
    homepage = "https://github.com/roniemartinez/latex2mathml";
-    changelog = "https://github.com/roniemartinez/latex2mathml/releases/tag/${src.tag}";
+    changelog = "https://github.com/roniemartinez/latex2mathml/releases/tag/${finalAttrs.src.tag}";
    license = lib.licenses.mit;
    mainProgram = "latex2mathml";
    maintainers = with lib.maintainers; [ sfrijters ];
  };
-}
+})
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@ -44,14 +44,14 @@ let
 in
 buildPythonPackage (finalAttrs: {
  pname = "pymupdf";
-  version = "1.27.2";
+  version = "1.27.2.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pymupdf";
    repo = "PyMuPDF";
    tag = finalAttrs.version;
-    hash = "sha256-7Bnu5AG1b5v4hd85xzyFvjsqXl5Lqltbb2NcmkTQwaE=";
+    hash = "sha256-o70IMa64jjX+b83uW4gISOiNrWtefQ8nc8Z99DfqrQI=";
  };

  patches = [
--- a/pkgs/development/python-modules/victron-mqtt/default.nix
+++ b/pkgs/development/python-modules/victron-mqtt/default.nix
@ -12,14 +12,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "victron-mqtt";
-  version = "2026.4.1";
+  version = "2026.4.9";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "tomer-w";
    repo = "victron_mqtt";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-EJVzbOgf0BT9qIDite3JhNmK1uU3zrXgJWW8KhZh0bk=";
+    hash = "sha256-Lq3I5xZCu3UrllW0cHLo7wlKnDOl73TDRN97gThvP1M=";
  };

  build-system = [