Merge master into staging-nixos

2026-09-29 19:30:11 +00:00 · 2026-08-07 06:26:08 +00:00
parent 89a868bf7f 8796310803
commit caee6599bf
32 changed files with 223 additions and 198 deletions
--- a/nixos/modules/services/hardware/kmonad.nix
+++ b/nixos/modules/services/hardware/kmonad.nix
@@ -146,11 +146,8 @@ let
          ${lib.getExe cfg.package} ${mkCfg keyboard} \
            ${utils.escapeSystemdExecArgs cfg.extraArgs}
        '';
-        Restart = "always";
-        # Restart at increasing intervals from 2s to 1m
-        RestartSec = 2;
-        RestartSteps = 30;
-        RestartMaxDelaySec = "1min";
+        # Restarts are initiated by the accompanying path unit. See systemd.path(5).
+        Restart = "no";
        Nice = -20;
        DynamicUser = true;
        User = "kmonad";
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,9 +1,10 @@
 {
  "chromium": {
-    "version": "151.0.7922.75",
+    "version": "151.0.7922.108",
    "chromedriver": {
-      "version": "151.0.7922.76",
-      "hash_darwin_aarch64": "sha256-OzlgQzGpu/yt5Gzck6/opqnxduKrJJnhOcTgIzSOx3c="
+      "version": "151.0.7922.109",
+      "hash_darwin": "sha256-VzMu90gOs02icI3PgvpNYXeE5c0QjCVB9CpM287roZo=",
+      "hash_darwin_aarch64": "sha256-5djEbPAayOVr8hr2VfXvlU4W6F+Kd/wiCt5NvQtgoOY="
    },
    "deps": {
      "depot_tools": {
@@ -20,8 +21,8 @@
    "DEPS": {
      "src": {
        "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "1ddc0a2003eb30c3990568d74ed0437451e9c374",
-        "hash": "sha256-QKVYipzVK/TUVdI4k8LLNmmhwAR6xP/Bgc1ZmNjySjo=",
+        "rev": "4744b886309d987d292e43232776d2206cccb13d",
+        "hash": "sha256-1i2IAA5sXyMPBzh6xOIY3CllEDtIS9Buk8Z2Vm1JnYw=",
        "recompress": true
      },
      "src/third_party/clang-format/script": {
@@ -91,8 +92,8 @@
      },
      "src/third_party/angle": {
        "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "392ccfac4cdbaa282d50d6db2fba742c6b91fb55",
-        "hash": "sha256-D9bOXnU1B1fwQySWS1tah5gT/6n6urjbVE5ydvAsim8="
+        "rev": "a17d5224d83f6018eb6a21a644ad9ef86eac475d",
+        "hash": "sha256-oXjtHByC3KrLgG3by6OdvID4ViM+2AnSft+fcspbNG0="
      },
      "src/third_party/angle/third_party/glmark2/src": {
        "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -206,8 +207,8 @@
      },
      "src/third_party/catapult": {
        "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "6146421e05bbedf9d9f0fe94f16afdbfb6b8fef1",
-        "hash": "sha256-AYJGyPKCz0SzAYEX2k8B7sMQugBfmmv3IELpuxT0/4U="
+        "rev": "c7282e69291240dbee993364a340934982443334",
+        "hash": "sha256-kYmzjsjMDj96QBwpvZagsqsibouMx/q3UkuMFJd1jt4="
      },
      "src/third_party/ced/src": {
        "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -261,8 +262,8 @@
      },
      "src/third_party/devtools-frontend/src": {
        "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "deb254e98496516b3d0bca323ffa49f7b08aec42",
-        "hash": "sha256-yjOrjHNRw6VphX6TLJryYoo3/9vOKMUsyStSUElPTes="
+        "rev": "3edf00b60c60c9248990a39a702ca4882809fe06",
+        "hash": "sha256-14qm+rI536GCqNkd9umSpJ9JoXf/47wuknJsVUb3ty0="
      },
      "src/third_party/dom_distiller_js/dist": {
        "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -581,8 +582,8 @@
      },
      "src/third_party/openh264/src": {
        "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264",
-        "rev": "652bdb7719f30b52b08e506645a7322ff1b2cc6f",
-        "hash": "sha256-tf0lnxATCkoq+xRti6gK6J47HwioAYWnpEsLGSA5Xdg="
+        "rev": "fca40fc19f5fb854609d297ae4bde71df72787c9",
+        "hash": "sha256-KMn8T8jCs4tdsmrU/fEBd0IWnBdD702x9JdJ0p98ZGk="
      },
      "src/third_party/openscreen/src": {
        "url": "https://chromium.googlesource.com/openscreen",
@@ -656,8 +657,8 @@
      },
      "src/third_party/skia": {
        "url": "https://skia.googlesource.com/skia.git",
-        "rev": "f4eee5c6735d33a829ab2cfbf3fe23d0376e7992",
-        "hash": "sha256-UKewcYGGJrWA+ZJAp5TA3gGQpns+/5L6PlFxpEHWfG8="
+        "rev": "86bb2f25f46f4d620b4a26e738f59a9b6c22d2eb",
+        "hash": "sha256-tnUcFuwWtw0uGNIsU38M54V1MAYFs7/2yjP9Cs1fEHo="
      },
      "src/third_party/smhasher/src": {
        "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -826,8 +827,8 @@
      },
      "src/v8": {
        "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "792d9716fea48312ad7ce4413c538e00628b1d50",
-        "hash": "sha256-oOJU+FgNSkvNarn24OFQAhXXmdH8MHAMw/Y9mfRnW4A="
+        "rev": "20ad8d002c17ccc7ccfbefc6c4dcf1242fe80921",
+        "hash": "sha256-J2dblSPMoZTpotDpuPp6beRYv+KtCirqNxEGEQKpqcQ="
      },
      "src/agents/shared": {
        "url": "https://chromium.googlesource.com/chromium/agents.git",
--- a/pkgs/applications/networking/browsers/chromium/update.mjs
+++ b/pkgs/applications/networking/browsers/chromium/update.mjs
@@ -170,6 +170,10 @@ async function fetch_chromedriver_binaries(version) {
  const url = (platform) => `https://storage.googleapis.com/chrome-for-testing-public/${version}/${platform}/chromedriver-${platform}.zip`
  return {
    version,
+    // Do not remove x86_64-darwin from the update script/lockfile until 26.05 is EOL, as
+    // chromium bumps (which chromedriver is part of) are annoying to backport otherwise.
+    // See https://github.com/NixOS/nixpkgs/pull/541166#discussion_r3599248819
+    hash_darwin: await prefetch(url('mac-x64')),
    hash_darwin_aarch64: await prefetch(url('mac-arm64')),
  }
 }
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1058,11 +1058,11 @@
    "vendorHash": null
  },
  "oracle_oci": {
-    "hash": "sha256-ZDpyBnralPWEMorou9A8+llGqavGlPMe1YJlUMrfYRY=",
+    "hash": "sha256-iziNFt2N7tu9xLLb9kNDQy9X2pE5K/4D3cZLfS3RCEo=",
    "homepage": "https://registry.terraform.io/providers/oracle/oci",
    "owner": "oracle",
    "repo": "terraform-provider-oci",
-    "rev": "v8.23.0",
+    "rev": "v8.26.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
--- a/pkgs/by-name/ag/age-plugin-se/package.nix
+++ b/pkgs/by-name/ag/age-plugin-se/package.nix
@@ -12,13 +12,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "age-plugin-se";
-  version = "0.1.4";
+  version = "0.2.1";

  src = fetchFromGitHub {
    owner = "remko";
    repo = "age-plugin-se";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-sg73DzlW4aXNbIIePZox4JkF10OfsMtPw0q/0DWwgDk=";
+    hash = "sha256-ga9EYfvscXf8VHSptjgnjaeZT+D/69PAr/s53JOHG20=";
  };

  nativeBuildInputs = [
@@ -36,16 +36,26 @@ stdenv.mkDerivation (finalAttrs: {
      swift-crypto = fetchFromGitHub {
        owner = "apple";
        repo = "swift-crypto";
-        # FIXME: Update to a newer version once https://github.com/NixOS/nixpkgs/issues/343210 is fixed
-        # This is the last version to support swift tools 5.8 which is newest version supported by nixpkgs:
-        # https://github.com/apple/swift-crypto/commit/35703579f63c2518fc929a1ce49805ba6134137c
        tag = "3.7.1";
        hash = "sha256-zxmHxTryAezgqU5qjXlFFThJlfUsPxb1KRBan4DSm9A=";
      };
    in
    ''
+      ${lib.optionalString (lib.versionAtLeast swift.version "6") ''
+        echo "age-plugin-se still applies patch-package-swift-legacy; remove or revisit this patch now that nixpkgs Swift is 6+."
+        exit 1
+      ''}
+      make patch-package-swift-legacy
      ln -s ${swift-crypto} swift-crypto
      substituteInPlace Package.swift --replace-fail 'url: "https://github.com/apple/swift-crypto.git"' 'path: "./swift-crypto"), //'
+      ${lib.optionalString stdenv.hostPlatform.isLinux ''
+        # Swift 5.10.1's corelibs Foundation lacks Date.ISO8601Format().
+        # Remove this substitution once the upstream fallback is released:
+        # https://github.com/remko/age-plugin-se/issues/20
+        substituteInPlace Sources/Plugin.swift --replace-fail \
+          'let createdAt = now.ISO8601Format()' \
+          'let createdAt = ISO8601DateFormatter().string(from: now)'
+      ''}
    '';

  makeFlags = [
--- a/pkgs/by-name/al/allure/package.nix
+++ b/pkgs/by-name/al/allure/package.nix
@@ -8,11 +8,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "allure";
-  version = "2.44.1";
+  version = "2.45.0";

  src = fetchurl {
    url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz";
-    hash = "sha256-YwUjnOAKchIabtzCEUYhORoUj9hmveRy64mWJtL4oMU=";
+    hash = "sha256-lWJawzJm0zqVDVIVFCFtuhCXpH/8g/V/Tpwk44A6abY=";
  };

  dontConfigure = true;
--- a/pkgs/by-name/br/brlcad/disable-rpath-manipulation.patch
+++ b/pkgs/by-name/br/brlcad/disable-rpath-manipulation.patch
@@ -1,5 +1,4 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7526f05b70..18871afb75 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
@@ -356,20 +356,6 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
@@ -24,10 +23,9 @@ index 7526f05b70..18871afb75 100644
 # For certain platforms (in particular Visual C++) we want to keep some pre-defined
 # flags that are commonly used in the build logic.
 diff --git a/misc/CMake/BRLCAD_ExternalDeps.cmake b/misc/CMake/BRLCAD_ExternalDeps.cmake
-index fdce1dc0c0..1375de50d1 100644
 --- a/misc/CMake/BRLCAD_ExternalDeps.cmake
 +++ b/misc/CMake/BRLCAD_ExternalDeps.cmake
-@@ -752,15 +752,6 @@ function(brlcad_bext_process)
+@@ -905,15 +905,6 @@ endfunction()
   string(REPLACE ";" "\n" TP_B "${ALL_BINARY_FILES}")
   file(WRITE "${TP_INVENTORY_BINARIES}" "${TP_B}")
 
@@ -43,19 +41,10 @@ index fdce1dc0c0..1375de50d1 100644
   if(NNOEXEC_FILES)
     message("Scrubbing paths from new 3rd party data files...")
     foreach(tf ${NNOEXEC_FILES})
-@@ -864,6 +855,7 @@ function(brlcad_bext_process)
-   # to define an RPATH that will allow the binary files to work when
-   # the install directory is relocated.
-   foreach(bf ${ALL_BINARY_FILES})
-+    continue()
-     if(IS_SYMLINK ${bf})
-       continue()
-     endif(IS_SYMLINK ${bf})
 diff --git a/misc/CMake/BRLCAD_Util.cmake b/misc/CMake/BRLCAD_Util.cmake
-index 631909f499..43a536d21d 100644
 --- a/misc/CMake/BRLCAD_Util.cmake
 +++ b/misc/CMake/BRLCAD_Util.cmake
-@@ -154,17 +154,6 @@ function(PLUGIN_SETUP plugin_targets subdir)
+@@ -220,17 +220,6 @@ function(PLUGIN_SETUP plugin_targets subdir)
       LIBRARY DESTINATION ${LIBEXEC_DIR}/${subdir}
       ARCHIVE DESTINATION ${LIBEXEC_DIR}/${subdir}
     )
--- a/pkgs/by-name/br/brlcad/fix-perm-test-cmake.patch
+++ b/pkgs/by-name/br/brlcad/fix-perm-test-cmake.patch
@@ -1,15 +0,0 @@
-diff --git a/src/tclscripts/CMakeLists.txt b/src/tclscripts/CMakeLists.txt
-index 364d529ff0..7626e26e68 100644
--- a/src/tclscripts/CMakeLists.txt
-+++ b/src/tclscripts/CMakeLists.txt
-@@ -139,7 +139,9 @@ if(TARGET btclsh)
-   )
-   add_custom_target(TclIndexBld ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tclindexbld.sentinel)
-   distclean(${CMAKE_CURRENT_BINARY_DIR}/tclindexbld.sentinel)
-  set_target_properties(perm_test PROPERTIES FOLDER "Compilation Utilities")
-+  if(BUILD_TESTING)
-+    set_target_properties(perm_test PROPERTIES FOLDER "Compilation Utilities")
-+  endif()
- 
-   foreach(ifile ${index_install_files})
-     # Install logic for index file.
--- a/pkgs/by-name/br/brlcad/package.nix
+++ b/pkgs/by-name/br/brlcad/package.nix
@@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  fetchpatch,

  # nativeBuildInputs
  cmake,
@@ -37,6 +36,7 @@
  # nativeCheckInputs
  gzip,
  which,
+  writableTmpDirAsHomeHook,

  # build options
  enableQt ? false,
@@ -45,8 +45,8 @@ let
  bext = fetchFromGitHub {
    owner = "BRL-CAD";
    repo = "bext";
-    rev = "f9074f84c87605f89d912069cee1b1e710ead635"; # must match brlcad_bext_init() in CMakeLists.txt
-    hash = "sha256-wOzrHiEA+IVUnchSRRUAzIwKkGWtyvnrInnADi3KgiI=";
+    rev = "12f7d5669eec143eb882a367fa2d2a56127d1942"; # must match brlcad_bext_init() in CMakeLists.txt
+    hash = "sha256-T6zA/zLmSPTlj7+AlxxWXb1OsxdBEcyatYCYUUTIDY8=";
    fetchSubmodules = true;
    # remove unneeded subprojects to reduce NAR size
    postFetch =
@@ -55,7 +55,7 @@ let
          "appleseed"
          "astyle"
          "boost"
-          "clipper2"
+          "bullet"
          "deflate"
          "eigen"
          "embree"
@@ -63,7 +63,6 @@ let
          "flexbison"
          "fmt"
          "gdal"
-          "geogram"
          "gte"
          "icu"
          "ispc"
@@ -73,7 +72,6 @@ let
          "lmdb"
          "lz4"
          "minizip-ng"
-          "mmesh"
          "ncurses"
          "netpbm"
          "onetbb"
@@ -81,13 +79,11 @@ let
          "opencv"
          "openexr"
          "openimageio"
-          "openmesh"
          "osl"
          "ospray"
          "patchelf"
          "plief"
          "png"
-          "poissonrecon"
          "proj"
          "pugixml"
          "pystring"
@@ -113,7 +109,7 @@ in

 stdenv.mkDerivation (finalAttrs: {
  pname = "brlcad";
-  version = "7.42.2";
+  version = "7.44.0";

  strictDeps = true;
  __structuredAttrs = true;
@@ -122,70 +118,82 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "BRL-CAD";
    repo = "brlcad";
    tag = "rel-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
-    hash = "sha256-smsCbUWlAfO9xyT8Bz/vLRkTJuehF9xANrP8bT//t18=";
+    hash = "sha256-ehfjrff2mjaW0s0G8I7pNXpRXdnsOcPwRTXewNijAZo=";
  };

  prePatch = ''
    # clone bext src so we can patch it
+    # (copy hidden files too, e.g. .gitmodules, which the dependency-graph target needs)
    mkdir -p build/bext
-    cp -r --no-preserve=mode ${bext}/* build/bext/
+    cp -r --no-preserve=mode ${bext}/. build/bext/
  '';

  patches = [
-    # make libgcv work with modern lemon
-    (fetchpatch {
-      url = "https://github.com/BRL-CAD/brlcad/commit/0dbd82a10040edc45754242ab36ed130a0259fb8.patch";
-      hash = "sha256-N54FnF69PgeRUDZk/i9hoLHoBzb1neYN20KhDyMqvi4=";
-      excludes = [ "CMakeLists.txt" ];
-    })
    # disable internal RPATH manipulation which gets in our way
    ./disable-rpath-manipulation.patch
+
    # make <PACKAGE>_ROOT respect our cmakeFlags settings instead of being hardwired to CMAKE_BINARY_DIR
    ./fix-findpackage-root.patch
+
+    # only reset a dependency's cached find_package results when the third-party
+    # state actually changed, so externally-injected values (e.g. GTE_INCLUDE_DIR)
+    # survive configure instead of being unconditionally cleared
+    ./restore-find-package-reset-guard.patch
+
    # libgcv defines EQUAL macro, which causes gdal to not define STRCASECMP macro
    ./fix-gdal-strcasecmp.patch
-    # only call set_target_properties on perm-test when testing is enabled
-    # https://github.com/BRL-CAD/brlcad/pull/235
-    ./fix-perm-test-cmake.patch
+
    # fix typo in GeometryIO.tcl which causes model exports to fail
    # https://github.com/BRL-CAD/brlcad/pull/234
    ./fix-export.patch
  ];

-  postPatch = ''
+  postPatch =
    # disable all bext projects by default
-    substituteInPlace build/bext/CMakeLists.txt \
-      --replace-fail "add_project" "#add_project"
-
+    ''
+      substituteInPlace build/bext/CMakeLists.txt \
+        --replace-fail "add_project" "#add_project"
+    ''
    # enable bext projects we actually need:
    # * itcl: needs v3
    # * itk: needs v3
    # * iwidgets, tkhtml, tktable: missing in nixpkgs
    # * manifold: needs v2
+    # * mmesh: required by librt, missing in nixpkgs
    # * opennurbs: many vendored patches
-    # * osmesa, perplex, regex, utahrle: specialized vendored libraries
+    # * osmesa, perplex, regex: specialized vendored libraries
+    # * poissonrecon: provides SPSR headers to brlcad via the bext noinstall dir
    # * patch, strclear: required internally
-    # * assetimport, lemon, re2c, tcl, tk, zlib: transitive dependency, not actually built
-    substituteInPlace build/bext/CMakeLists.txt \
-      --replace-fail "#add_project(patch)" "add_project(patch)"
-    for name in itcl itk iwidgets tkhtml tktable manifold opennurbs osmesa perplex regex utahrle strclear zlib assetimport lemon re2c tcl tk; do
+    # * assetimport, clipper2, lemon, re2c, tcl, tk, zlib: transitive dependency, not actually built
+    + ''
      substituteInPlace build/bext/CMakeLists.txt \
-        --replace-fail "#add_project($name " "add_project($name "
-    done
+        --replace-fail \
+          "#add_project(patch)" \
+          "add_project(patch)"

+      for name in itcl itk iwidgets tkhtml tktable manifold mmesh opennurbs osmesa perplex regex poissonrecon strclear clipper2 zlib assetimport lemon re2c tcl tk; do
+        substituteInPlace build/bext/CMakeLists.txt \
+          --replace-fail \
+            "#add_project($name " \
+            "add_project($name "
+      done
+    ''
    # inject TCL_ROOT into bext projects
-    sed -i '1i set(TCL_ROOT "${tcl};${tk}")' \
-      build/bext/CMake/FindTCL.cmake \
-      build/bext/itcl/addfiles/FindTCL.cmake \
-      build/bext/itk/addfiles/FindTCL.cmake \
-      build/bext/tktable/tktable/CMake/FindTCL.cmake \
-      build/bext/tkhtml/tkhtml/CMake/FindTCL.cmake
-  ''
-  + lib.optionalString stdenv.hostPlatform.isAarch64 ''
+    + ''
+      sed -i '1i set(TCL_ROOT "${tcl};${tk}")' \
+        build/bext/CMake/FindTCL.cmake \
+        build/bext/itcl/addfiles/FindTCL.cmake \
+        build/bext/itk/addfiles/FindTCL.cmake \
+        build/bext/tktable/tktable/CMake/FindTCL.cmake \
+        build/bext/tkhtml/tkhtml/CMake/FindTCL.cmake
+    ''
    # remove a failing test
-    substituteInPlace src/libbu/tests/CMakeLists.txt \
-      --replace-fail "brlcad_add_test(NAME bu_color_to_rgb_floats_1 COMMAND bu_test color 4 192,78,214)" ""
-  '';
+    + lib.optionalString stdenv.hostPlatform.isAarch64 ''
+      substituteInPlace src/libbu/tests/CMakeLists.txt \
+        --replace-fail \
+          "brlcad_add_test(NAME bu_color_to_rgb_floats_1 COMMAND bu_test test_color 4 192,78,214)" \
+          ""
+    '';

  nativeBuildInputs = [
    cmake
@@ -229,6 +237,9 @@ stdenv.mkDerivation (finalAttrs: {
    (lib.cmakeBool "BRLCAD_ENABLE_STRICT" false)
    (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
    (lib.cmakeBool "BRLCAD_ENABLE_QT" enableQt)
+    # static-library link-closure validation tests fail to link (libbn's static
+    # target does not pull in its libbu dependency); we only ship the shared libs
+    (lib.cmakeBool "BRLCAD_VALIDATE_STATIC_LINKS" false)
    (lib.cmakeFeature "GTE_INCLUDE_DIR" "${gtmathematics}/include/gtmathematics")
    (lib.cmakeFeature "LMDB_LIBRARY" "${lmdb.out}/lib/liblmdb${stdenv.hostPlatform.extensions.sharedLibrary}")
    (lib.cmakeFeature "LMDB_INCLUDE_DIR" "${lmdb.dev}/include")
@@ -249,7 +260,7 @@ stdenv.mkDerivation (finalAttrs: {
      "-Wno-error=template-id-cdtor"
    ];
    CFLAGS = toString [
-      # itk, tkhtml, tktable, utahrle
+      # itk, tkhtml, tktable
      "-Wno-incompatible-pointer-types"
      "-std=gnu17"
    ];
@@ -258,6 +269,8 @@ stdenv.mkDerivation (finalAttrs: {
  nativeCheckInputs = [
    gzip
    which
+    # bu_dir test writes into HOME/cache/config, which must be writable
+    writableTmpDirAsHomeHook
  ];

  doCheck = true;
--- a/pkgs/by-name/br/brlcad/restore-find-package-reset-guard.patch
+++ b/pkgs/by-name/br/brlcad/restore-find-package-reset-guard.patch
@@ -0,0 +1,13 @@
+diff --git a/misc/CMake/BRLCAD_ExternalDeps.cmake b/misc/CMake/BRLCAD_ExternalDeps.cmake
+--- a/misc/CMake/BRLCAD_ExternalDeps.cmake
+++ b/misc/CMake/BRLCAD_ExternalDeps.cmake
+@@ -1069,6 +1069,9 @@ endfunction(brlcad_bext_process)
+ # Not all packages will define all of these, but it shouldn't matter -
+ # an unset of an unused variable shouldn't be harmful
+ function(find_package_reset pname trigger_var)
+  if(NOT ${trigger_var})
+    return()
+  endif(NOT ${trigger_var})
+   unset(${pname}_DIR CACHE)
+   unset(${pname}_CONFIG CACHE)
+   unset(${pname}_DEFINITIONS CACHE)
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -112,12 +112,12 @@ in
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python.pkgs.buildPythonApplication rec {
  pname = "diffoscope";
-  version = "325";
+  version = "326";
  pyproject = true;

  src = fetchurl {
    url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    hash = "sha256-z8mdVWYo/UHfNIQy/XSDYSMAytIwXk/R3FRm4IsikIc=";
+    hash = "sha256-Km0CvLx8BQ44Nwzxd9kHVFgVOnWPc+vly3ThcENGMOQ=";
  };

  outputs = [
--- a/pkgs/by-name/gl/gleam/package.nix
+++ b/pkgs/by-name/gl/gleam/package.nix
@@ -17,16 +17,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "gleam";
-  version = "1.18.0";
+  version = "1.18.1";

  src = fetchFromGitHub {
    owner = "gleam-lang";
    repo = "gleam";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Qq55vu/urXMKzDwJMvGMA6qIyYeMxhFGV03oijUBVNk=";
+    hash = "sha256-974B+22Lvd7KB9M0yuuxkolLtRmg42NrAX5CIrIc3Ac=";
  };

-  cargoHash = "sha256-ZBpnRZo13f2UGbIfOC/S6yzVOoJf+t4ID5b8RleYf0g=";
+  cargoHash = "sha256-as+2oyOpGA71oPDGTuZhfPccr8AjsUZJFtnRLYRxFOI=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -179,7 +179,7 @@ let

  linux = stdenvNoCC.mkDerivation (finalAttrs: {
    inherit pname meta passthru;
-    version = "151.0.7922.75";
+    version = "151.0.7922.108";

    src =
      let
@@ -194,8 +194,8 @@ let
        url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_${debArch}.deb";
        hash =
          {
-            amd64 = "sha256-y3NZpTMI++RBvvbVvdYbQIwbQPmA6L99AusxFheRjRA=";
-            arm64 = "sha256-4s9A1b915d1s5IvFRzl5+h/0JYtF1jcburiH2502G64=";
+            amd64 = "sha256-v7bm00UFXrSBpQ20IyVvonMs4BD3haVsMn4hOmOO/e8=";
+            arm64 = "sha256-I/XSe+atb11pwcEbYC1O0lqEmc/foRw8pHmtC1goVJk=";
          }
          .${debArch};
      };
@@ -300,11 +300,11 @@ let

  darwin = stdenvNoCC.mkDerivation (finalAttrs: {
    inherit pname meta passthru;
-    version = "151.0.7922.76";
+    version = "151.0.7922.109";

    src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/acrzfi6wlim2i4amr3kgmykhgfpa_151.0.7922.76/GoogleChrome-151.0.7922.76.dmg";
-      hash = "sha256-76bPkMZf0Lfr9tYbZoEtBeg8MpRES9kZShiOGyZwF28=";
+      url = "http://dl.google.com/release2/chrome/cy2fmmk4db26pfgaa3nc5udp2i_151.0.7922.109/GoogleChrome-151.0.7922.109.dmg";
+      hash = "sha256-CqLJP/LSSX6lKkqBqYCbcIy9GLJGVGVmzH8pHYEsJoU=";
    };

    dontPatch = true;
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -3,9 +3,9 @@
  stdenv,
  fetchFromGitHub,
  makeBinaryWrapper,
-  electron_42,
-  nodejs-slim_24,
-  pnpm_10,
+  electron_43,
+  nodejs-slim_26,
+  pnpm_11,
  fetchPnpmDeps,
  pnpmConfigHook,
  darwin,
@@ -21,14 +21,14 @@
 }:

 let
-  nodejs-slim = nodejs-slim_24;
-  pnpm = pnpm_10.override { inherit nodejs-slim; };
-  electron = electron_42;
+  nodejs-slim = nodejs-slim_26;
+  pnpm = pnpm_11.override { inherit nodejs-slim; };
+  electron = electron_43;
  appName = "Podman Desktop";
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "podman-desktop";
-  version = "1.28.2";
+  version = "1.29.1";

  passthru.updateScript = _experimental-update-script-combinators.sequence [
    (nix-update-script { })
@@ -68,14 +68,14 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "podman-desktop";
    repo = "podman-desktop";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-8pp1lxWduKZuxDXmq3GQQ7w10PUC9wR667gO6u9OhSI=";
+    hash = "sha256-yAGwXY1MxjIS4ChK/YUHSjysFFKlsPmdxysTW7y7DlA=";
  };

  pnpmDeps = fetchPnpmDeps {
    inherit (finalAttrs) pname version src;
    inherit pnpm;
-    fetcherVersion = 3;
-    hash = "sha256-llkgy+JDJRxTZXxXHxza3RKdACU/Yd9xiGJ5CyptXpY=";
+    fetcherVersion = 4;
+    hash = "sha256-W5Hl/6sMfpHsf6OZ+u9nP0FN1U0Mv3c30j5cABWBS9A=";
  };

  patches = [
--- a/pkgs/by-name/ru/rufin/package.nix
+++ b/pkgs/by-name/ru/rufin/package.nix
@@ -14,7 +14,7 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rufin";
-  version = "0.12.0";
+  version = "0.12.5";

  __structuredAttrs = true;

@@ -22,10 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "screwys";
    repo = "Rufin";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-1kxZthQ8A+cNJSc/BO8V06bwbLOdTQT/cYqxMVZg5Yw=";
+    hash = "sha256-QOlDZAVjDgAV1G4+f82TpNbyv+96QGDAUqf5r+A4PuU=";
  };

-  cargoHash = "sha256-S+Jt95zPBjymhp5wnx6EIsTgHkKwOb6KklsT9dBhdDA=";
+  cargoHash = "sha256-6u23YZSYYYAcnoOOZiCUCy9rbiOS59Nu4hj3WKhL/B0=";

  strictDeps = true;

--- a/pkgs/by-name/so/sony-dump/package.nix
+++ b/pkgs/by-name/so/sony-dump/package.nix
@@ -6,7 +6,7 @@
 }:
 stdenv.mkDerivation {
  pname = "sony-dump";
-  version = "0-unstable-2019-11-3";
+  version = "0-unstable-2019-11-03";

  src = fetchFromGitHub {
    owner = "munjeni";
--- a/pkgs/by-name/st/stakk/package.nix
+++ b/pkgs/by-name/st/stakk/package.nix
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "stakk";
-  version = "1.17.1";
+  version = "1.17.2";

  src = fetchFromGitHub {
    owner = "glennib";
    repo = "stakk";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-5wEZOxXg30F0MqeszDRYrOBnsOzfXxld8iQkZSPqUIY=";
+    hash = "sha256-+q94xzOV9rA7B1pBBt9ZjESzcV8mhraiMGgDQekZM7Y=";
  };

-  cargoHash = "sha256-iEGrGSia/Da1bpXVAOI9M7QNNVHUAB/RFRgzl+IrFlU=";
+  cargoHash = "sha256-/Wx1n5zt+rBGtM04bi2PTiO8zqCJvgKz5aoTo7f08NI=";

  useNextest = true;

--- a/pkgs/by-name/ti/tidal-hifi/electron.nix
+++ b/pkgs/by-name/ti/tidal-hifi/electron.nix
@@ -8,11 +8,11 @@ let
    https://github.com/Mastermindzh/tidal-hifi/blob/master/build/electron-builder.base.yml
     for the expected version
  */
-  version = "41.5.0";
+  version = "43.0.0";
 in
 (fetchzip {
  url = "https://github.com/castlabs/electron-releases/releases/download/v${version}+wvcus/electron-v${version}+wvcus-linux-x64.zip";
-  hash = "sha256-LjM80c48AzEwoU8h07qUELTV5jjQeApanaoPZ/szdag=";
+  hash = "sha256-cUhDsxW4V13H2oWgCSyrWicoo5yTD36XQZQ0TvCfexc=";
  stripRoot = false;

 }).overrideAttrs
--- a/pkgs/by-name/ti/tidal-hifi/package.nix
+++ b/pkgs/by-name/ti/tidal-hifi/package.nix
@@ -92,13 +92,13 @@ let
 in
 buildNpmPackage (finalAttrs: {
  pname = "tidal-hifi";
-  version = "7.0.1";
+  version = "8.1.1";

  src = fetchFromGitHub {
    owner = "Mastermindzh";
    repo = "tidal-hifi";
    tag = finalAttrs.version;
-    hash = "sha256-6RKGSXWe3YP52bv03kEX60RLE+WRBEsou6yHLZGEVPs=";
+    hash = "sha256-Y5tpnHXEjfaOTarzXitJvWxukxPvUYLzTZq13li5ckw=";
  };

  nativeBuildInputs = [
@@ -107,7 +107,7 @@ buildNpmPackage (finalAttrs: {
    copyDesktopItems
  ];

-  npmDepsHash = "sha256-8uDzikiVGLjhpba6HpSHcvlNghRtmugqjazoAYP1M98=";
+  npmDepsHash = "sha256-J+8JD4Y3giWX8ridtH3N9lobZV/8zgEPoUjuOksq+bs=";
  forceGitDeps = true;
  makeCacheWritable = true;

--- a/pkgs/by-name/ti/tideways-cli/package.nix
+++ b/pkgs/by-name/ti/tideways-cli/package.nix
@@ -11,7 +11,7 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "tideways-cli";
-  version = "1.2.20";
+  version = "1.3.0";

  nativeBuildInputs = [ installShellFiles ];

@@ -38,15 +38,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    sources = {
      "x86_64-linux" = fetchurl {
        url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_amd64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-nhwWsD3EefHSC7YSVla4WFTDiTWZjTf7sUZjMNROXoQ=";
+        hash = "sha256-jL0hLRaWVO3ZPTUIOrI/p9baJHtZ/hbbLXj/x3IGd0c=";
      };
      "aarch64-linux" = fetchurl {
        url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_arm64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-s74CnmEQ9RPki1af477tQFkrp6C9MwfehXTq2HPNAkk=";
+        hash = "sha256-RNHqi7dKAJvRO5vhi3rsZofRfI3hE4OQS3ZnRc5t77I=";
      };
      "aarch64-darwin" = fetchurl {
        url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_arm64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-RTt5XKMJbYPea6pEPD72mITfUW41v584zrwT3rkEcQg=";
+        hash = "sha256-8wQr0uNKnoBNOhNSzhW+z40dS68um0I9Gs3+b8HyAHI=";
      };
    };

--- a/pkgs/by-name/wo/worktrunk/package.nix
+++ b/pkgs/by-name/wo/worktrunk/package.nix
@@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "worktrunk";
-  version = "0.68.0";
+  version = "0.71.0";

  src = fetchFromGitHub {
    owner = "max-sixty";
    repo = "worktrunk";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-4mxWRNNrpM5Fo49Xm8ypzBS15Y8kPPFd1iPod1RwxjA=";
+    hash = "sha256-TBna2iFzrVyfa4D/rDysQdZPS5yHEv/mTY8ixc4GilE=";
  };

-  cargoHash = "sha256-ZEv3peP/mjDDWYw4LNuhIt8I806W/yfUKtEA7e3t7rA=";
+  cargoHash = "sha256-UdSWEP9m/b9xtEtyX5JWvF4LU2uJdbk4juYrKwrx4gA=";

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

--- a/pkgs/development/ocaml-modules/eio/default.nix
+++ b/pkgs/development/ocaml-modules/eio/default.nix
@@ -3,12 +3,13 @@
  ocaml,
  version ?
    if lib.versionAtLeast ocaml.version "5.2" then
-      "1.3"
+      "1.4"
    else if lib.versionAtLeast ocaml.version "5.1" then
      "1.2"
    else
      "0.12",
  buildDunePackage,
+  dune-configurator,
  bigstringaf,
  cstruct,
  domain-local-await,
@@ -35,14 +36,14 @@ let
        minimalOCamlVersion = "5.1";
        hash = "sha256-N5LpEr2NSUuy449zCBgl5NISsZcM8sHxspZsqp/WvEA=";
      };
-      "1.3" = {
+      "1.4" = {
        minimalOCamlVersion = "5.2";
-        hash = "sha256-jtXBPmaJ8xyF3KXxJ2LYS4zABCp7B9PkZN9utLcrPfw=";
+        hash = "sha256-uhGtSG9JITDbtIbys73EkFZD8QAWgG3fhumjTkNGqqU=";
      };
    }
    ."${version}";
 in
-buildDunePackage {
+buildDunePackage (finalAttrs: {
  pname = "eio";
  inherit version;
  inherit (param) minimalOCamlVersion;
@@ -52,6 +53,8 @@ buildDunePackage {
    inherit (param) hash;
  };

+  buildInputs = lib.optional (lib.versionAtLeast finalAttrs.version "1.4") dune-configurator;
+
  propagatedBuildInputs = [
    bigstringaf
    cstruct
@@ -74,6 +77,8 @@ buildDunePackage {
    mdx.bin
  ];

+  doCheck = true;
+
  meta = {
    homepage = "https://github.com/ocaml-multicore/eio";
    changelog = "https://github.com/ocaml-multicore/eio/raw/v${version}/CHANGES.md";
@@ -81,4 +86,4 @@ buildDunePackage {
    license = lib.licenses.isc;
    maintainers = with lib.maintainers; [ toastal ];
  };
-}
+})
--- a/pkgs/development/ocaml-modules/eio/linux.nix
+++ b/pkgs/development/ocaml-modules/eio/linux.nix
@@ -1,5 +1,7 @@
 {
+  lib,
  buildDunePackage,
+  dune-configurator,
  eio,
  fmt,
  logs,
@@ -19,6 +21,8 @@ buildDunePackage {

  dontStrip = true;

+  buildInputs = lib.optional (lib.versionAtLeast eio.version "1.4") dune-configurator;
+
  propagatedBuildInputs = [
    eio
    fmt
--- a/pkgs/development/ocaml-modules/eio/main.nix
+++ b/pkgs/development/ocaml-modules/eio/main.nix
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  buildDunePackage,
+  dune-configurator,
  eio,
  eio_posix,
  eio_linux,
@@ -20,6 +21,8 @@ buildDunePackage {

  dontStrip = true;

+  buildInputs = lib.optional (lib.versionAtLeast eio.version "1.4") dune-configurator;
+
  propagatedBuildInputs = [
    eio_posix
  ]
--- a/pkgs/development/ocaml-modules/eio/posix.nix
+++ b/pkgs/development/ocaml-modules/eio/posix.nix
@@ -20,8 +20,6 @@ buildDunePackage {

  minimalOCamlVersion = "5.0";

-  dontStrip = true;
-
  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
    NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
  };
@@ -36,4 +34,6 @@ buildDunePackage {
    logs
    iomux
  ];
+
+  dontStrip = true;
 }
--- a/pkgs/development/ocaml-modules/httpcats/default.nix
+++ b/pkgs/development/ocaml-modules/httpcats/default.nix
@@ -1,6 +1,5 @@
 {
-  fetchpatch2,
-  fetchzip,
+  fetchurl,
  buildDunePackage,
  lib,
  logs,
@@ -12,27 +11,20 @@
  tls-miou-unix,
  dns-client-miou-unix,
  happy-eyeballs-miou-unix,
-  mirage-crypto-rng-miou-unix,
+  mirage-crypto-rng,
  alcotest,
  digestif,
 }:

 buildDunePackage (finalAttrs: {
  pname = "httpcats";
-  version = "0.2.1";
+  version = "0.3.1";

-  src = fetchzip {
+  src = fetchurl {
    url = "https://github.com/robur-coop/httpcats/releases/download/v${finalAttrs.version}/httpcats-${finalAttrs.version}.tbz";
-    hash = "sha256-ehtwxQGHw8igzI0dy2Zzs+VOqvck/tAUuuJl+jSpVU8=";
+    hash = "sha256-5BymoyJS5JykTnSee0HhSKzbHkb8j6COuY7tZtGDGh0=";
  };

-  patches = [
-    (fetchpatch2 {
-      url = "https://github.com/robur-coop/httpcats/commit/d8787555d4831e0488780d42bd2c65de662d1d38.patch";
-      hash = "sha256-6zXPb+mvw2rcEMv28b0npcL8cKl3CASxDbl7FOAGsXs=";
-    })
-  ];
-
  propagatedBuildInputs = [
    h2
    h1
@@ -49,7 +41,7 @@ buildDunePackage (finalAttrs: {
  checkInputs = [
    logs
    fmt
-    mirage-crypto-rng-miou-unix
+    mirage-crypto-rng
    alcotest
    digestif
  ];
--- a/pkgs/development/ocaml-modules/uring/default.nix
+++ b/pkgs/development/ocaml-modules/uring/default.nix
@@ -1,11 +1,18 @@
 {
  lib,
  ocaml,
-  version ? if lib.versionAtLeast ocaml.version "5.1" then "2.7.0" else "0.9",
+  version ?
+    if lib.versionAtLeast ocaml.version "5.2" then
+      "2.15.0"
+    else if lib.versionAtLeast ocaml.version "5.1" then
+      "2.14.0"
+    else
+      "0.9",
+  fetchurl,
+  pkg-config,
  buildDunePackage,
  cstruct,
  dune-configurator,
-  fetchurl,
  fmt,
  optint,
  mdx,
@@ -18,33 +25,41 @@ let
        minimalOCamlVersion = "4.12";
        hash = "sha256-eXWIxfL9UsKKf4sanBjKfr6Od4fPDctVnkU+wjIXW0M=";
      };
-      "2.7.0" = {
+      "2.14.0" = {
        minimalOCamlVersion = "5.1.0";
-        hash = "sha256-mePi6/TXtxgtLYLyHRAdnRcgeldCVgUaPY+MZXSzC6U=";
+        hash = "sha256-U6B3/ExryC7WLYj1iIUHoXZQluFE56Rf3dwOpux/qIE=";
+      };
+      "2.15.0" = {
+        minimalOCamlVersion = "5.2.0";
+        hash = "sha256-MK1F5tTbvZT5MkyZrz28+nj4+Yo8VxdxCBDHghUdMYY=";
      };
    }
    .${version};
 in
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
  pname = "uring";
  inherit version;
  inherit (param) minimalOCamlVersion;

  src = fetchurl {
-    url = "https://github.com/ocaml-multicore/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
+    url = "https://github.com/ocaml-multicore/ocaml-uring/releases/download/v${finalAttrs.version}/uring-${version}.tbz";
    inherit (param) hash;
  };

+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    dune-configurator
+  ];
+
  propagatedBuildInputs = [
    cstruct
    fmt
    optint
  ];

-  buildInputs = [
-    dune-configurator
-  ];
-
  checkInputs = [
    mdx
  ];
@@ -60,8 +75,8 @@ buildDunePackage rec {
  dontStrip = true;

  meta = {
-    homepage = "https://github.com/ocaml-multicore/ocaml-${pname}";
-    changelog = "https://github.com/ocaml-multicore/ocaml-${pname}/raw/v${version}/CHANGES.md";
+    homepage = "https://github.com/ocaml-multicore/ocaml-uring";
+    changelog = "https://raw.githubusercontent.com/ocaml-multicore/ocaml-uring/v${finalAttrs.version}/CHANGES.md";
    description = "Bindings to io_uring for OCaml";
    license = with lib.licenses; [
      isc
@@ -70,4 +85,4 @@ buildDunePackage rec {
    platforms = lib.platforms.linux;
    maintainers = with lib.maintainers; [ toastal ];
  };
-}
+})
--- a/pkgs/development/python-modules/pylance/default.nix
+++ b/pkgs/development/python-modules/pylance/default.nix
@@ -35,7 +35,7 @@

 buildPythonPackage (finalAttrs: {
  pname = "pylance";
-  version = "9.0.0";
+  version = "9.0.1";
  pyproject = true;
  __structuredAttrs = true;

@@ -43,7 +43,7 @@ buildPythonPackage (finalAttrs: {
    owner = "lancedb";
    repo = "lance";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-G4BcK/con6a1MOlA9pB3+uI8YULLNg71G8bFLKhUedg=";
+    hash = "sha256-t4Eia0d+w4mhY2RP7WJqebh4SW8Hvk3v5mG0zOPY0zw=";
  };

  sourceRoot = "${finalAttrs.src.name}/python";
@@ -55,7 +55,7 @@ buildPythonPackage (finalAttrs: {
      src
      sourceRoot
      ;
-    hash = "sha256-IzB+kzjAEWQpA0gCyKAXI+5XAJK00AV3alFRgastbPM=";
+    hash = "sha256-W5FFlsu1LGc6U0VaJQQ7zVlIYGWVcZC448PQ7YqpCy4=";
  };

  # `lance-linalg`'s AVX-512 VNNI u8-distance kernels call `_mm512_dpbusd_epi32` /
--- a/pkgs/development/python-modules/victron-mqtt/default.nix
+++ b/pkgs/development/python-modules/victron-mqtt/default.nix
@@ -13,14 +13,14 @@

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

  src = fetchFromGitHub {
    owner = "tomer-w";
    repo = "victron_mqtt";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-X7sgY8fqwnt8U3o1yFEOOA5iRcMk8KMLre+NZ1aH3sw=";
+    hash = "sha256-5bY5IG+WgCwgAv4i/RidiRmEzO0iuhTBKRl63nMdnAo=";
  };

  build-system = [
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -25,7 +25,7 @@ let

  buildRPackage = pkgs.callPackage ./generic-builder.nix {
    inherit R;
-    inherit (pkgs) gettext;
+    inherit (pkgs) gettext gfortran;
  };

  # Generates package templates given per-repository settings
--- a/pkgs/development/r-modules/generic-builder.nix
+++ b/pkgs/development/r-modules/generic-builder.nix
@@ -5,6 +5,7 @@
  xvfb-run,
  util-linux,
  gettext,
+  gfortran,
  libiconv,
 }:

@@ -16,12 +17,6 @@

 stdenv.mkDerivation (
  {
-    __structuredAttrs = true;
-    outputChecks.out.disallowedReferences = [
-      stdenv.cc
-      stdenv.cc.cc
-    ];
-
    buildInputs =
      buildInputs
      ++ [
@@ -33,6 +28,7 @@ stdenv.mkDerivation (
        xvfb-run
      ]
      ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        gfortran
        libiconv
      ];

@@ -75,8 +71,6 @@ stdenv.mkDerivation (
      runHook postInstall
    '';

-    stripDebugList = [ "library/${attrs.pname}/libs" ];
-
    postFixup = ''
      if test -e $out/nix-support/propagated-build-inputs; then
          ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -387,7 +387,7 @@ mapAliases {
  mathlibtools = throw "mathlibtools has been removed because the upstream repository was archived in 2023"; # added 2025-07-09
  matlink-gpapi = throw "'matlink-gpapi' has been removed as it was broken and unmaintained"; # Added 2025-11-09
  maubot = throw "'maubot' has been promoted to a top-level attribute: `pkgs.maubot`"; # added 2026-07-12
-  mdformat-tables = "'mdformat-tables' has been archived and replaced by 'mdformat-gfm"; # added 2025-01-25
+  mdformat-tables = throw "'mdformat-tables' has been archived and replaced by 'mdformat-gfm"; # added 2025-01-25
  MDP = throw "'MDP' has been renamed to/replaced by 'mdp'"; # Converted to throw 2025-10-29
  MechanicalSoup = throw "'MechanicalSoup' has been renamed to/replaced by 'mechanicalsoup'"; # Converted to throw 2025-10-29
  meld3 = throw "'meld3' has been removed because it was unused and unmaintained upstream"; # added 2026-06-08
@@ -402,11 +402,11 @@ mapAliases {
  mkdocs-macros = mkdocs-macros-plugin; # added 2025-09-02
  mkdocs-minify = throw "'mkdocs-minify' has been renamed to/replaced by 'mkdocs-minify-plugin'"; # Converted to throw 2025-10-29
  mne-python = throw "'mne-python' has been renamed to/replaced by 'mne'"; # Converted to throw 2025-10-29
-  modeled = "'modeled' has been removed because it is unmaintained"; # Added 2026-01-19
+  modeled = throw "'modeled' has been removed because it is unmaintained"; # Added 2026-01-19
  monarchmoney = throw "'monarchmoney' has been renamed to/replaced by 'monarchmoneycommunity'"; # Added 2026-03-05
  monkeytype = throw "'monkeytype' has been removed as it was unmaintained upstream"; # Added 2026-04-19
-  more-properties = "'more-properties' has been removed to due lack of upstream maintenance"; # Added 2026-07-14
-  moretools = "'moretools' has been removed because it is unmaintained"; # Added 2026-01-19
+  more-properties = throw "'more-properties' has been removed to due lack of upstream maintenance"; # Added 2026-07-14
+  moretools = throw "'moretools' has been removed because it is unmaintained"; # Added 2026-01-19
  mpd2 = warnAlias "'mpd2' has been renamed to 'python-mpd2'"; # Added 2026-06-14
  mpire = throw "'mpire' has been removed because it is unused in Nixpkgs"; # Added 2026-06-22
  msldap-bad = throw "'msldap-bad' has been renamed to/replaced by 'badldap'"; # added 2025-11-06
@@ -524,7 +524,7 @@ mapAliases {
  pyqt5_sip = throw "'pyqt5_sip' has been renamed to/replaced by 'pyqt5-sip'"; # Converted to throw 2025-10-29
  pyqt5_with_qtmultimedia = throw "'pyqt5_with_qtmultimedia' has been renamed to/replaced by 'pyqt5-multimedia'"; # Converted to throw 2025-10-29
  pyqt5_with_qtwebkit = throw "'pyqt5_with_qtwebkit' has been removed as it depended on insecure&unmaintained qtwebkit"; # Added 2026-04-26
-  pyqtwebengine = "'pyqtwebengine' has been removed as it depended on the removed qt5 webengine"; # Added 2026-02-10
+  pyqtwebengine = throw "'pyqtwebengine' has been removed as it depended on the removed qt5 webengine"; # Added 2026-02-10
  pyramid_beaker = throw "'pyramid_beaker' has been renamed to/replaced by 'pyramid-beaker'"; # Converted to throw 2025-10-29
  pyramid_chameleon = throw "'pyramid_chameleon' has been renamed to/replaced by 'pyramid-chameleon'"; # Converted to throw 2025-10-29
  pyramid_exclog = throw "'pyramid_exclog' has been renamed to/replaced by 'pyramid-exclog'"; # Converted to throw 2025-10-29
@@ -624,7 +624,7 @@ mapAliases {
  retry_decorator = throw "'retry_decorator' has been renamed to/replaced by 'retry-decorator'"; # Converted to throw 2025-10-29
  retworkx = throw "'retworkx' has been renamed to/replaced by 'rustworkx'"; # Converted to throw 2025-10-29
  rki-covid-parser = throw "rki-covid-parser has been removed because it is unmaintained and broken"; # added 2025-09-20
-  robotframework-tools = "'robotframework-tools' has been removed because it is unmaintained"; # Added 2026-01-19
+  robotframework-tools = throw "'robotframework-tools' has been removed because it is unmaintained"; # Added 2026-01-19
  roman-numerals-py = roman-numerals; # added 2025-12-03
  ROPGadget = throw "'ROPGadget' has been renamed to/replaced by 'ropgadget'"; # Converted to throw 2025-10-29
  rtslib = throw "'rtslib' has been renamed to/replaced by 'rtslib-fb'"; # Converted to throw 2025-10-29
@@ -731,7 +731,7 @@ mapAliases {
  vega_datasets = throw "'vega_datasets' has been renamed to/replaced by 'vega-datasets'"; # Converted to throw 2025-10-29
  ViennaRNA = throw "'ViennaRNA' has been renamed to/replaced by 'viennarna'"; # Converted to throw 2025-10-29
  vncdo = vncdotool; # Added 2026-06-30
-  volvooncall = "'volvooncall' was removed because Home Assistant dropped the integration"; # added 2026-07-20
+  volvooncall = throw "'volvooncall' was removed because Home Assistant dropped the integration"; # added 2026-07-20
  vulcan-api = throw "vulcan-api has been removed. Their API has changed and they don't allow access from unofficial software anymore."; # added 2025-09-05
  vxi11 = throw "'vxi11' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-27
  Wand = throw "'Wand' has been renamed to/replaced by 'wand'"; # Converted to throw 2025-10-29
@@ -755,7 +755,7 @@ mapAliases {
  zc-buildout221 = throw "'zc-buildout221' has been renamed to/replaced by 'zc-buildout'"; # Converted to throw 2025-10-29
  zc_lockfile = throw "'zc_lockfile' has been renamed to/replaced by 'zc-lockfile'"; # Converted to throw 2025-10-29
  zebrafy = throw "'zebrafy' has been removed due to lack of upstream maintenance"; # Added 2026-05-11
-  zetup = "'zetup' has been removed because it is unmaintained"; # Added 2026-01-19
+  zetup = throw "'zetup' has been removed because it is unmaintained"; # Added 2026-01-19
  zeversolarlocal = throw "'zeversolarlocal' has been removed because it is unmaintained"; # Added 2026-01-28
  zope_component = throw "'zope_component' has been renamed to/replaced by 'zope-component'"; # Converted to throw 2025-10-29
  zope_configuration = throw "'zope_configuration' has been renamed to/replaced by 'zope-configuration'"; # Converted to throw 2025-10-29