Merge staging-next into staging

2026-10-03 13:30:36 +00:00 · 2026-01-18 08:12:09 +00:00
parent 3eb48ccb31 e0e84bb8fc
commit f0c230ffb8
231 changed files with 1290 additions and 1183 deletions
--- a/nixos/doc/manual/release-notes/rl-2605.section.md
+++ b/nixos/doc/manual/release-notes/rl-2605.section.md
@@ -67,6 +67,8 @@ of pulling the upstream container image from Docker Hub. If you want the old beh

 - `services.cgit` before always had the git-http-backend and its "export all" setting enabled, which sidestepped any access control configured in cgit's settings. Now you have to make a decision and either enable or disable `services.cgit.gitHttpBackend.checkExportOkFiles` (or disable the git-http-backend).

+- `rocmPackages_6` has been removed. `rocmPackages` has been updated to ROCm 7.x. Out of tree packages may rely on obsolete hipblas APIs or compile time constant warp size and need to be updated.
+
 - The Bash implementation of the `nixos-rebuild` program is removed. All switchable systems now use the Python rewrite. Any prior usage of `system.rebuild.enableNg` must now be removed. If you have any outstanding issues with the new implementation, please open an issue on GitHub.

 - `services.desktopManager.gnome` no longer installs the Geary e-mail client since it is not part of the GNOME [core applications](https://apps.gnome.org/) list. Geary's position in the default favorite apps section has been replaced by GNOME Text Editor. To keep it installed, add `programs.geary.enable = true;` to your configuration.
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,8 +1,8 @@
 {
-  x86_64-linux = "/nix/store/x30lnlgk1s16rynrfslbf8phr6h6rqf2-nix-2.31.2";
-  i686-linux = "/nix/store/ix94q6rrdg6cr4893cjpzdbmibhlm0dv-nix-2.31.2";
-  aarch64-linux = "/nix/store/xnybj9lk0kwvmr2va253avanq7m3cpyg-nix-2.31.2";
-  riscv64-linux = "/nix/store/33as1vqp8mq36nr5bb5gr7ziw1nf4q1v-nix-riscv64-unknown-linux-gnu-2.31.2";
-  x86_64-darwin = "/nix/store/b9dvary8rcljj7ajv1x64hwwch4cvyvp-nix-2.31.2";
-  aarch64-darwin = "/nix/store/lvv1j8qbrvlnl3aagcjrhf42d458zgb5-nix-2.31.2";
+  x86_64-linux = "/nix/store/mxn3vxpvk2b42kgd08aw4bn27qhf434w-nix-2.31.3";
+  i686-linux = "/nix/store/b7d35ifww9683l74ydkb0qhrq6lqcisi-nix-2.31.3";
+  aarch64-linux = "/nix/store/ysz7dwmy4zd1zm3wzx5dh9g999xv7pbm-nix-2.31.3";
+  riscv64-linux = "/nix/store/avfv2lqbnphj2ap8y5ihg1l0sqhpjll7-nix-riscv64-unknown-linux-gnu-2.31.3";
+  x86_64-darwin = "/nix/store/s8lcl6nrd5ia7nr4zx9mg720i9f8qm37-nix-2.31.3";
+  aarch64-darwin = "/nix/store/vfjzbcl3kf9jjwh0g2x03cvz2x5hg8py-nix-2.31.3";
 }
--- a/nixos/modules/services/display-managers/ly.nix
+++ b/nixos/modules/services/display-managers/ly.nix
@@ -45,6 +45,8 @@ let
    xauth_cmd = lib.optionalString xcfg.enable "${pkgs.xorg.xauth}/bin/xauth";
    x_cmd = lib.optionalString xcfg.enable xserverWrapper;
    setup_cmd = dmcfg.sessionData.wrapper;
+    brightness_up_cmd = "${lib.getExe pkgs.brightnessctl} -q -n s +10%";
+    brightness_down_cmd = "${lib.getExe pkgs.brightnessctl} -q -n s 10%-";
  };

  finalConfig = defaultConfig // cfg.settings;
--- a/nixos/modules/system/boot/resolved.nix
+++ b/nixos/modules/system/boot/resolved.nix
@@ -10,11 +10,13 @@ let
  inherit (utils.systemdUtils.unitOptions) unitOption;

  inherit (lib)
+    concatStringsSep
+    elem
+    isList
    literalExpression
    mkIf
    mkMerge
    mkOption
-    mkOptionDefault
    mkOrder
    mkRenamedOptionModule
    mkRemovedOptionModule
@@ -26,7 +28,25 @@ let

  dnsmasqResolve = config.services.dnsmasq.enable && config.services.dnsmasq.resolveLocalQueries;

-  resolvedConf = settingsToSections cfg.settings;
+  transformSettings =
+    settings:
+    lib.mapAttrs (
+      key: value:
+      # concat lists for options that should result in space-separated values
+      if
+        elem key [
+          "DNS"
+          "Domains"
+          "FallbackDNS"
+        ]
+        && isList value
+      then
+        concatStringsSep " " value
+      else
+        value
+    ) settings;
+
+  resolvedConf = settingsToSections (transformSettings cfg.settings);
 in
 {
  imports = [
@@ -60,22 +80,56 @@ in
  options = {
    services.resolved = {
      enable = lib.mkEnableOption "the Systemd DNS resolver daemon (systemd-resolved)";
+
      settings.Resolve = mkOption {
        description = ''
          Settings option for systemd-resolved.
          See {manpage}`resolved.conf(5)` for all available options.
        '';
-        # Remember to keep this in sync to the actual settings at the bottom of the page.
-        defaultText = literalExpression ''
-          {
-            DNS = config.networking.nameservers;
-            DNSOverTLS = false;
-            DNSSEC = false;
-            Domains = config.networking.search;
-            LLMNR = true;
-          }
-        '';
-        type = types.attrsOf unitOption;
+        default = { };
+        type = types.submodule {
+          freeformType = types.attrsOf unitOption;
+          options = {
+            DNS = mkOption {
+              type = unitOption;
+              default = config.networking.nameservers;
+              defaultText = literalExpression "config.networking.nameservers";
+              description = ''
+                List of IP addresses to query as recursive DNS resolvers.
+              '';
+            };
+
+            DNSOverTLS = mkOption {
+              type = unitOption;
+              default = false;
+              description = ''
+                Whether to use TLS encryption for DNS queries. Requires
+                nameservers that support DNS-over-TLS.
+              '';
+            };
+
+            DNSSEC = mkOption {
+              type = unitOption;
+              default = false;
+              description = ''
+                Whether to validate DNSSEC for DNS lookups.
+              '';
+            };
+
+            Domains = mkOption {
+              type = unitOption;
+              default = config.networking.search;
+              defaultText = literalExpression "config.networking.search";
+              example = [
+                "scope.example.com"
+                "example.com"
+              ];
+              description = ''
+                List of search domains used to complete unqualified name lookups.
+              '';
+            };
+          };
+        };
      };

    };
@@ -101,15 +155,6 @@ in
        }
      ];

-      # If updating any of these attrs, also update the defaultText above.
-      services.resolved.settings.Resolve = {
-        DNS = config.networking.nameservers;
-        DNSOverTLS = mkOptionDefault false;
-        DNSSEC = mkOptionDefault false;
-        Domains = mkOptionDefault config.networking.search;
-        LLMNR = mkOptionDefault true;
-      };
-
      users.users.systemd-resolve.group = "systemd-resolve";

      # add resolve to nss hosts database if enabled and nscd enabled
--- a/nixos/modules/system/boot/systemd/fido2.nix
+++ b/nixos/modules/system/boot/systemd/fido2.nix
@@ -24,7 +24,7 @@ in
      '')
    ];
    boot.initrd.systemd.storePaths = [
-      "${pkgs.systemd}/lib/udev/fido_id"
+      "${cfg.package}/lib/udev/fido_id"
      "${cfg.package}/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so"
      "${pkgs.libfido2}/lib/libfido2.so.1"
    ];
--- a/nixos/tests/dwl.nix
+++ b/nixos/tests/dwl.nix
@@ -23,6 +23,9 @@
      services.displayManager.defaultSession = lib.mkForce "dwl";

      programs.dwl.enable = true;
+
+      # Need to switch to a different GPU driver than the default one (-vga std) so that dwl works on aarch64-linux
+      virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
    };

  testScript = ''
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -110,11 +110,11 @@
    "vendorHash": null
  },
  "bpg_proxmox": {
-    "hash": "sha256-d0v0a4t0sPkGQ9LGK7p5XZmuZBuBeLcWHBoslFu9Qs8=",
+    "hash": "sha256-eRed1lShDIpQRCC/JvqT5uYbDU+mgpMfEPiSQFoV1QA=",
    "homepage": "https://registry.terraform.io/providers/bpg/proxmox",
    "owner": "bpg",
    "repo": "terraform-provider-proxmox",
-    "rev": "v0.92.0",
+    "rev": "v0.93.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-+UWPbNHoV3TdeMZdY0ZOLBe1/Dej37hHORatC9Kol58="
  },
@@ -1175,13 +1175,13 @@
    "vendorHash": "sha256-f3b4NULINH8XworCn46fiz4GmBM31ROdAJy1j4GKkx4="
  },
  "scaleway_scaleway": {
-    "hash": "sha256-TekcGTYzpqFUVv0NYRGi71rgMD0okQpMPiPI8869cog=",
+    "hash": "sha256-3p/g43WkVI3T2e2xSm/hwzu9aFqivszUtVcPsFSsx1o=",
    "homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
    "owner": "scaleway",
    "repo": "terraform-provider-scaleway",
-    "rev": "v2.66.0",
+    "rev": "v2.67.1",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-2uqoiUdU8hVHm8Mc0dkS/qAuqZkhVVTKwf++CobRGtw="
+    "vendorHash": "sha256-rT8ScPPnrbUBviiK03U96K5vvVEbcLra3MGSJ8+SYyE="
  },
  "scottwinkler_shell": {
    "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",
--- a/pkgs/build-support/make-impure-test.nix
+++ b/pkgs/build-support/make-impure-test.nix
@@ -92,7 +92,7 @@ let

    ${prepareRunCommands}

-    sudo nix-build --option extra-sandbox-paths '${sandboxPathsList}' ${lib.escapeShellArgs nixFlags} -A ${testPath} "$@"
+    sudo --preserve-env=NIXPKGS_ALLOW_UNFREE nix-build --option extra-sandbox-paths '${sandboxPathsList}' ${lib.escapeShellArgs nixFlags} -A ${testPath} "$@"
  '';
 in
 # The main output is the run script, inject the derivation for the actual test
--- a/pkgs/by-name/as/astro-language-server/package.nix
+++ b/pkgs/by-name/as/astro-language-server/package.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "astro-language-server";
-  version = "2.16.2";
+  version = "2.16.3";

  src = fetchFromGitHub {
    owner = "withastro";
    repo = "astro";
    rev = "@astrojs/language-server@${finalAttrs.version}";
-    hash = "sha256-ZH+g1pnasVvbNVg3Id6/rlwqjIr7qRgitqOSilgpX64=";
+    hash = "sha256-ONpSW6VMoiW1Q0Aa5Dp1pZx3LAQ2Kzv5YHKxHOxbXdo=";
  };

  # https://pnpm.io/filtering#--filter-package_name-1
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
      ;
    pnpm = pnpm_10;
    fetcherVersion = 2;
-    hash = "sha256-M2Xef5yTEQCLPzzx7WGQYplTrND+DPMy1hyEuahK+kM=";
+    hash = "sha256-Kqw4W3ZWRHWNnJYLGks9IHjCYAYEIigskwb//yKvb6c=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/bl/blender/hiprt-3-compat.patch
+++ b/pkgs/by-name/bl/blender/hiprt-3-compat.patch
@@ -0,0 +1,72 @@
+diff --git a/extern/hipew/include/hiprtew.h b/extern/hipew/include/hiprtew.h
+index d245cb76..952ed805 100644
+--- a/extern/hipew/include/hiprtew.h
+++ b/extern/hipew/include/hiprtew.h
+@@ -157,7 +157,7 @@ typedef hiprtError (thiprtDestroyGlobalStackBuffer)( hiprtContext context, hiprt
+ 
+ typedef hiprtError(thiprtDestroyFuncTable)(hiprtContext context,
+                                            hiprtFuncTable funcTable);
+-typedef void(thiprtSetLogLevel)( hiprtLogLevel level );
+typedef hiprtError(thiprtSetLogLevel)( hiprtContext context, hiprtLogLevel level );
+ 
+ /* Function declarations. */
+ extern thiprtCreateContext *hiprtCreateContext;
+diff --git a/extern/hipew/src/hipew.c b/extern/hipew/src/hipew.c
+index e72ccde6..138e1efc 100644
+--- a/extern/hipew/src/hipew.c
+++ b/extern/hipew/src/hipew.c
+@@ -241,13 +241,13 @@ static int hipewHipInit(void) {
+   /* ROCm 6 changes paths from /opt/rocm/hip/lib to /opt/rocm/lib, so
+    * search for libraries there. */
+ 
+-  const char* hip_paths[] = { "libamdhip64.so",
+  const char* hip_paths[] = { "libamdhip64.so.7",
+                            "/opt/rocm/lib/libamdhip64.so.7",
+                            "/opt/rocm/hip/lib/libamdhip64.so.7",
+                             "libamdhip64.so.6",
+                             "/opt/rocm/lib/libamdhip64.so.6",
+                             "/opt/rocm/hip/lib/libamdhip64.so.6",
+-                            "libamdhip64.so.7",
+-                            "/opt/rocm/lib/libamdhip64.so.7",
+-                            "/opt/rocm/hip/lib/libamdhip64.so.7",
+                            "libamdhip64.so",
+                              NULL };
+ #endif
+   static int initialized = 0;
+diff --git a/intern/cycles/device/hiprt/device_impl.cpp b/intern/cycles/device/hiprt/device_impl.cpp
+index c251a8d0..b54bc36c 100644
+--- a/intern/cycles/device/hiprt/device_impl.cpp
+++ b/intern/cycles/device/hiprt/device_impl.cpp
+@@ -104,10 +104,10 @@ HIPRTDevice::HIPRTDevice(const DeviceInfo &info,
+   }
+ 
+   if (LOG_IS_ON(LOG_LEVEL_TRACE)) {
+-    hiprtSetLogLevel(hiprtLogLevelInfo | hiprtLogLevelWarn | hiprtLogLevelError);
+    hiprtSetLogLevel(hiprt_context, hiprtLogLevelInfo | hiprtLogLevelWarn | hiprtLogLevelError);
+   }
+   else {
+-    hiprtSetLogLevel(hiprtLogLevelNone);
+    hiprtSetLogLevel(hiprt_context, hiprtLogLevelNone);
+   }
+ }
+ 
+diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
+index bcaf4e16..aa6a3d17 100644
+--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
+@@ -93,13 +93,13 @@ set(SRC_KERNEL_DEVICE_HIPRT_HEADERS
+ set(SRC_KERNEL_DEVICE_HIPRT_SDK
+   hiprt/impl/Aabb.h
+   hiprt/impl/BvhNode.h
+-  hiprt/impl/Geometry.h
+  hiprt/impl/Header.h
+   hiprt/impl/hiprt_device_impl.h
+   hiprt/impl/hiprt_kernels_bitcode.h
+   hiprt/impl/Instance.h
+  hiprt/impl/Obb.h
+   hiprt/impl/QrDecomposition.h
+   hiprt/impl/Quaternion.h
+-  hiprt/impl/Scene.h
+   hiprt/impl/Transform.h
+   hiprt/impl/Triangle.h
+ )
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -126,6 +126,9 @@ stdenv'.mkDerivation (finalAttrs: {
    hash = "sha256-fNnQRfGfNc7rbk8npkcYtoAqRjJc6MaV4mqtSJxd0EM=";
  };

+  # Minimal backport of hiprt 3.x support from https://projects.blender.org/blender/blender/pulls/144889
+  patches = lib.optional rocmSupport ./hiprt-3-compat.patch;
+
  postPatch =
    (lib.optionalString stdenv.hostPlatform.isDarwin ''
      : > build_files/cmake/platform/platform_apple_xcode.cmake
--- a/pkgs/by-name/cd/cdncheck/package.nix
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -6,13 +6,13 @@

 buildGoModule (finalAttrs: {
  pname = "cdncheck";
-  version = "1.2.18";
+  version = "1.2.19";

  src = fetchFromGitHub {
    owner = "projectdiscovery";
    repo = "cdncheck";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-RFA/5fCh9csa6nYoVmuZ5vs6JCaTVFUuEz0E8w7Rb/s=";
+    hash = "sha256-gb+M/y1MADwCR9gz1+mSXbvE3sSV8FKTDSz+Y9U2gfU=";
  };

  vendorHash = "sha256-Tc8qrML7u5qE0zVe7JCL1BM0KbhJSwnjhnd2gX5YUaA=";
--- a/pkgs/by-name/cl/clashmi/package.nix
+++ b/pkgs/by-name/cl/clashmi/package.nix
@@ -24,11 +24,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "clashmi";
-  version = "1.0.15.191";
+  version = "1.0.16.204";

  src = fetchurl {
    url = "https://github.com/KaringX/clashmi/releases/download/v${finalAttrs.version}/clashmi_${finalAttrs.version}_linux_amd64.deb";
-    hash = "sha256-P23H3OUIcDhVQ7dOLbB2uyZnbxh+6zurGeg0/wpPeHk=";
+    hash = "sha256-IOCrk4dl9BYf8rzhgXmRAaFP4pzsJMx6i2zTg/NpOCQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/co/colobot/package.nix
+++ b/pkgs/by-name/co/colobot/package.nix
@@ -19,6 +19,7 @@
  doxygen,
  python3,
  callPackage,
+  fetchpatch,
 }:

 let
@@ -37,6 +38,15 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-QhNHtAG+hKq7qJhKWCJcP4ejm5YDOU8pyYtitJppVlU=";
  };

+  patches = [
+    (fetchpatch {
+      url = "https://github.com/colobot/colobot/commit/1561854b03500d39955c66971c9c98de1937d7e6.patch";
+      relative = "colobot-app/src";
+      extraPrefix = "src/app/";
+      hash = "sha256-TVd/TsmFb1qQILUJr6E1zdFl/bQkREYKC/cm2I3M/iw=";
+    })
+  ];
+
  nativeBuildInputs = [
    cmake
    xmlstarlet
--- a/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix
+++ b/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage {
  pname = "cosmic-ext-applet-weather";
-  version = "0-unstable-2025-12-03";
+  version = "0-unstable-2026-01-17";

  src = fetchFromGitHub {
    owner = "cosmic-utils";
    repo = "cosmic-ext-applet-weather";
-    rev = "289d866abaaeaf51e9b7074b7731bcd6e5ea4b55";
-    hash = "sha256-LeUzDjUiDt3lQiQQvDB9RlSC1F4IyXTE4lc17eQd+Sw=";
+    rev = "142666f73c702036438408758ea86ec22d63611b";
+    hash = "sha256-K4flguR6pknhFCpwHQ+4OtSAtPBjUag1g/uUnCNM3Pw=";
  };

-  cargoHash = "sha256-1lIWzCqpIxk+FWA/84yN/x10Se2xRTZ7KEqAWVgfFgU=";
+  cargoHash = "sha256-LcTUIhAWitLFz23TasfSJt6tOAAAJDiHxfTcxBX2/Bg=";

  nativeBuildInputs = [
    libcosmicAppHook
--- a/pkgs/by-name/cu/cups-zj-58/package.nix
+++ b/pkgs/by-name/cu/cups-zj-58/package.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation {
    --replace-fail "cmake_minimum_required ( VERSION 3.0 )" "cmake_minimum_required ( VERSION 3.10 )"
  '';

+  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+
  installPhase = ''
    install -D ppd/zj80.ppd $out/share/cups/model/zjiang/zj80.ppd
    install -D ppd/zj58.ppd $out/share/cups/model/zjiang/zj58.ppd
--- a/pkgs/by-name/de/deface/package.nix
+++ b/pkgs/by-name/de/deface/package.nix
@@ -11,8 +11,6 @@ python3.pkgs.buildPythonApplication rec {
  version = "1.5.0";
  pyproject = true;

-  disabled = python3.pythonOlder "3.8";
-
  src = fetchFromGitHub {
    owner = "ORB-HD";
    repo = "deface";
--- a/pkgs/by-name/dt/dt-schema/package.nix
+++ b/pkgs/by-name/dt/dt-schema/package.nix
@@ -1,5 +1,4 @@
 {
-  lib,
  python3,
 }:

@@ -16,22 +15,10 @@ let
          hash = "sha256-D4ZEN6uLYHa6ZwdFPvj5imoNUSqA6T+KvbZ29zfstg0=";
        };

-        propagatedBuildInputs =
-          with self;
-          (
-            [
-              attrs
-              pyrsistent
-            ]
-            ++ lib.optionals (pythonOlder "3.8") [
-              importlib-metadata
-              typing-extensions
-            ]
-            ++ lib.optionals (pythonOlder "3.9") [
-              importlib-resources
-              pkgutil-resolve-name
-            ]
-          );
+        propagatedBuildInputs = with self; [
+          attrs
+          pyrsistent
+        ];
      });
    };
  };
--- a/pkgs/by-name/em/email/package.nix
+++ b/pkgs/by-name/em/email/package.nix
@@ -40,6 +40,10 @@ stdenv.mkDerivation {
    })
  ];

+  # opt out of GCC 15's stricter C standards
+  # https://github.com/NixOS/nixpkgs/issues/475479
+  env.NIX_CFLAGS_COMPILE = toString [ "-std=gnu17" ];
+
  buildInputs = [ openssl ];

  unpackPhase = ''
--- a/pkgs/by-name/fo/forgejo-runner/package.nix
+++ b/pkgs/by-name/fo/forgejo-runner/package.nix
@@ -49,17 +49,17 @@ let
 in
 buildGoModule rec {
  pname = "forgejo-runner";
-  version = "12.5.2";
+  version = "12.5.3";

  src = fetchFromGitea {
    domain = "code.forgejo.org";
    owner = "forgejo";
    repo = "runner";
    rev = "v${version}";
-    hash = "sha256-aL79wMzoqt1rqaOQyV28HSeZwjL3k60AyQOhOT/+BRY=";
+    hash = "sha256-qCk2GvPWKIQfEjYtx2Uc7GcVDehUu0/u4LP88FxoA9A=";
  };

-  vendorHash = "sha256-XNUhlGkW8bZ1cjODD6QIyRmmNdQ4Tq/hP2FToYfTq2k=";
+  vendorHash = "sha256-pGLZmSW7MKEy/K+njgcPv5a+7Qtf8mqUI4OwKhfEZXY=";

  nativeBuildInputs = [ makeWrapper ];

--- a/pkgs/by-name/fr/fresh-editor/package.nix
+++ b/pkgs/by-name/fr/fresh-editor/package.nix
@@ -11,16 +11,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "fresh";
-  version = "0.1.75";
+  version = "0.1.77";

  src = fetchFromGitHub {
    owner = "sinelaw";
    repo = "fresh";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-c/zpPvPOlbZvmSGb+DqPV9HA+ic8/9TYv9MgI8d4Bgs=";
+    hash = "sha256-+ESguKlMUB2gm9zNee35wKdZmKLhLcPFa3Z7n4KNpVQ=";
  };

-  cargoHash = "sha256-o6/ER521tpmn8hkMDEw1ykgYuFpG1DTkFbw95NGYqGo=";
+  cargoHash = "sha256-MrFVolkqGRESPNPsQPDZGvHNVYyB9+ok4GANgIfBbZU=";

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

--- a/pkgs/by-name/ga/gancio/package.nix
+++ b/pkgs/by-name/ga/gancio/package.nix
@@ -4,10 +4,11 @@
  fetchFromGitLab,
  fetchYarnDeps,

+  yarn,
  yarnConfigHook,
  yarnBuildHook,
  yarnInstallHook,
-  nodejs,
+  nodejs_22,
  pkg-config,

  vips,
@@ -17,6 +18,15 @@
  nix-update-script,
 }:

+let
+  # The latest nodejs is always used in yarn, leading to build issues when it's
+  # different from the pinned one.
+  nodejs = nodejs_22;
+  yarnConfigHook' = yarnConfigHook.override {
+    yarn = yarn.override { inherit nodejs; };
+  };
+in
+
 stdenv.mkDerivation (finalAttrs: {
  pname = "gancio";
  version = "1.28.2";
@@ -35,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
  };

  nativeBuildInputs = [
-    yarnConfigHook
+    yarnConfigHook'
    yarnBuildHook
    yarnInstallHook
    nodejs
--- a/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix
+++ b/pkgs/by-name/ga/gancio/plugin-telegram-bridge/default.nix
@@ -3,12 +3,22 @@
  stdenv,
  fetchFromGitLab,
  fetchYarnDeps,
+  yarn,
  yarnConfigHook,
  yarnInstallHook,
-  nodejs,
+  nodejs_22,
  nix-update-script,
 }:

+let
+  # The latest nodejs is always used in yarn, leading to build issues when it's
+  # different from the pinned one.
+  nodejs = nodejs_22;
+  yarnConfigHook' = yarnConfigHook.override {
+    yarn = yarn.override { inherit nodejs; };
+  };
+in
+
 stdenv.mkDerivation rec {
  pname = "gancio-plugin-telegram-bridge";
  version = "1.0.6";
@@ -32,7 +42,7 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [
-    yarnConfigHook
+    yarnConfigHook'
    yarnInstallHook
    nodejs
  ];
--- a/pkgs/by-name/ga/gancio/plugins.nix
+++ b/pkgs/by-name/ga/gancio/plugins.nix
@@ -1,4 +1,4 @@
-{ callPackage, nodejs }:
+{ callPackage }:
 {
-  telegram-bridge = callPackage ./plugin-telegram-bridge { inherit nodejs; };
+  telegram-bridge = callPackage ./plugin-telegram-bridge { };
 }
--- a/pkgs/by-name/gf/gforth/boot-forth.nix
+++ b/pkgs/by-name/gf/gforth/boot-forth.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation {
    sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig";
  };

+  patches = [
+    # Newer GCC rejects casting between function pointers omitting parameters
+    ./function-pointers.patch
+  ];
+
  buildInputs = [ m4 ];

  configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--build=x86_64-apple-darwin" ];
--- a/pkgs/by-name/gf/gforth/function-pointers.patch
+++ b/pkgs/by-name/gf/gforth/function-pointers.patch
@@ -0,0 +1,26 @@
+diff --git a/engine/signals.c b/engine/signals.c
+index b522f19..7f89bcd 100644
+--- a/engine/signals.c
+++ b/engine/signals.c
+@@ -399,7 +399,7 @@ void install_signal_handlers(void)
+ #endif
+   };
+   int i;
+-  void (*throw_handler)() = die_on_signal ? graceful_exit : signal_throw;
+  void (*throw_handler)(int) = die_on_signal ? graceful_exit : signal_throw;
+ #ifdef SIGSTKSZ 
+   stack_t sigstack;
+   int sas_retval=-1;
+diff --git a/engine/support.c b/engine/support.c
+index 021fa22..069c32f 100644
+--- a/engine/support.c
+++ b/engine/support.c
+@@ -79,7 +79,7 @@ char *tilde_cstr(Char *from, UCell size, int clear)
+ {
+   char *s1,*s2;
+   int s1_len, s2_len;
+-  struct passwd *getpwnam (), *user_entry;
+  struct passwd *getpwnam (const char *), *user_entry;
+ 
+   if (size<1 || from[0]!='~')
+     return cstr(from, size, clear);
--- a/pkgs/by-name/gf/gforth/package.nix
+++ b/pkgs/by-name/gf/gforth/package.nix
@@ -17,13 +17,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "gforth";
-  version = "0.7.9_20251001";
+  version = "0.7.9_20251203";

  src = fetchFromGitHub {
    owner = "forthy42";
    repo = "gforth";
    rev = finalAttrs.version;
-    hash = "sha256-u9snXcFa/YYvITgMBY8FRYyyLFhHCP6hWA5ljwdKGLk=";
+    hash = "sha256-d1LU6FGnGOzL5Tdl0VLkYzHH+pUevGNCNwIqudS8emg=";
  };

  patches = [ ./use-nproc-instead-of-fhs.patch ];
--- a/pkgs/by-name/go/gogdl/package.nix
+++ b/pkgs/by-name/go/gogdl/package.nix
@@ -18,8 +18,6 @@ python3Packages.buildPythonApplication rec {
    hash = "sha256-pK6JeTJeBq9qVfflNSYs3s4HuD0Kz6k9DDUVHL81FV0=";
  };

-  disabled = python3Packages.pythonOlder "3.8";
-
  propagatedBuildInputs = with python3Packages; [
    setuptools
    requests
--- a/pkgs/by-name/go/gogh/package.nix
+++ b/pkgs/by-name/go/gogh/package.nix
@@ -25,13 +25,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "gogh";
-  version = "362";
+  version = "364";

  src = fetchFromGitHub {
    owner = "Gogh-Co";
    repo = "Gogh";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-FlMf7CzdGcGor+wi293CW2PT14O1VRzQbbxnNMmwFqk=";
+    hash = "sha256-DVaUmpXWGb+bIdGZqXbiAsiuGTrwvPJdxCyA4g82LFA=";
  };

  postPatch = ''
--- a/pkgs/by-name/gp/gprolog/package.nix
+++ b/pkgs/by-name/gp/gprolog/package.nix
@@ -4,44 +4,52 @@
  fetchurl,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "gprolog";
  version = "1.5.0";

  src = fetchurl {
    urls = [
-      "mirror://gnu/gprolog/gprolog-${version}.tar.gz"
-      "http://www.gprolog.org/gprolog-${version}.tar.gz"
+      "mirror://gnu/gprolog/gprolog-${finalAttrs.version}.tar.gz"
+      "http://www.gprolog.org/gprolog-${finalAttrs.version}.tar.gz"
+      "https://github.com/didoudiaz/gprolog/archive/refs/tags/v${finalAttrs.version}.tar.gz"
    ];
-    sha256 = "sha256-ZwZCtDwPqifr1olh77F+vnB2iPkbaAlWbd1gYTlRLAE=";
+    hash = "sha256-ZwZCtDwPqifr1olh77F+vnB2iPkbaAlWbd1gYTlRLAE=";
  };

+  __structuredAttrs = true;
+  enableParallelBuilding = true;
+
  hardeningDisable = lib.optional stdenv.hostPlatform.isi686 "pic";

  patchPhase = ''
-    sed -i -e "s|/tmp/make.log|$TMPDIR/make.log|g" src/Pl2Wam/check_boot
+    sed -i -e "s|/tmp/make.log|$TMPDIR/make.log|g" Pl2Wam/check_boot
  '';

-  preConfigure = ''
-    cd src
-    configureFlagsArray=(
-      "--with-install-dir=$out"
-      "--without-links-dir"
-      "--with-examples-dir=$out/share/gprolog-${version}/examples"
-      "--with-doc-dir=$out/share/gprolog-${version}/doc"
-    )
-  '';
+  sourceRoot = "gprolog-${finalAttrs.version}/src";

-  postInstall = ''
-    mv -v $out/[A-Z]* $out/gprolog.ico $out/share/gprolog-${version}/
-  '';
+  configureFlags = [
+    "--without-links-dir"
+    "--with-install-dir=${placeholder "out"}"
+    "--with-examples-dir=${placeholder "out"}/share/gprolog-${finalAttrs.version}/examples"
+    "--with-doc-dir=${placeholder "out"}/share/gprolog-${finalAttrs.version}/doc"
+    "--htmldir=${placeholder "out"}/share/gprolog-${finalAttrs.version}/doc"
+    "--with-c-flags=-std=gnu17"
+  ];

  doCheck = true;

+  postInstall = ''
+    mv -v $out/[A-Z]* $out/gprolog.ico $out/share/gprolog-${finalAttrs.version}
+  '';
+
  meta = {
    homepage = "https://www.gnu.org/software/gprolog/";
    description = "GNU Prolog, a free Prolog compiler with constraint solving over finite domains";
-    license = lib.licenses.lgpl3Plus;
+    license = with lib.licenses; [
+      lgpl3Plus # and/or
+      gpl2Plus
+    ];

    longDescription = ''
      GNU Prolog is a free Prolog compiler with constraint solving
@@ -67,6 +75,6 @@ stdenv.mkDerivation rec {
      declarativity of logic programming.
    '';

-    platforms = lib.platforms.unix;
+    platforms = lib.platforms.all;
  };
-}
+})
--- a/pkgs/by-name/ha/hardinfo2/package.nix
+++ b/pkgs/by-name/ha/hardinfo2/package.nix
@@ -51,13 +51,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "hardinfo2";
-  version = "2.2.13";
+  version = "2.2.16";

  src = fetchFromGitHub {
    owner = "hardinfo2";
    repo = "hardinfo2";
    tag = "release-${finalAttrs.version}";
-    hash = "sha256-HRP8xjiwhlNHjW4D8y74Pshpn7bksmN5j4jhfF6KOYo=";
+    hash = "sha256-n/Rf/XKsATx3OEzYSjl+2Yzk7WSiaBkbOveA9+xR6fc=";
  };

  patches = [
--- a/pkgs/by-name/he/herbstluftwm/package.nix
+++ b/pkgs/by-name/he/herbstluftwm/package.nix
@@ -78,7 +78,11 @@ stdenv.mkDerivation rec {
      url = "https://github.com/herbstluftwm/herbstluftwm/commit/1a6e8ee24eac671569f54bfec22ab47ff285a52c.patch";
      hash = "sha256-srulWJQ9zTR4Kdxo40AdHND4nexDe2PDSR69yWsOpVA=";
    })
-
+    # Fix build with GCC 15 (missing #include <stdint.h>), can be removed with the next release (>0.9.5)
+    (fetchpatch {
+      url = "https://github.com/herbstluftwm/herbstluftwm/commit/8ff75588a750704ae06ad59b843eb88138c95653.patch";
+      hash = "sha256-mrViVcW3jZes1QMn5It0t2WfLfwl/WNF6k9yz1fm/Gs=";
+    })
  ];

  postPatch = ''
--- a/pkgs/by-name/hy/hydralauncher/package.nix
+++ b/pkgs/by-name/hy/hydralauncher/package.nix
@@ -6,10 +6,10 @@
 }:
 let
  pname = "hydralauncher";
-  version = "3.8.0";
+  version = "3.8.1";
  src = fetchurl {
    url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage";
-    hash = "sha256-8dRnGr9nVu+GNIVcH90iPDF0VoMibiKqL6dGRdmZl94=";
+    hash = "sha256-GLoGdZ/UWtkWt4WjjhmupQzPQTMuQI+7jb7IjSCcvo0=";
  };

  appimageContents = appimageTools.extractType2 { inherit pname src version; };
--- a/pkgs/by-name/im/imgp/package.nix
+++ b/pkgs/by-name/im/imgp/package.nix
@@ -8,7 +8,6 @@ python3Packages.buildPythonApplication rec {
  pname = "imgp";
  version = "2.9";
  pyproject = true;
-  disabled = python3Packages.pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "jarun";
--- a/pkgs/by-name/in/inlyne/package.nix
+++ b/pkgs/by-name/in/inlyne/package.nix
@@ -11,6 +11,7 @@
  wayland,
  libGL,
  openssl,
+  oniguruma,
 }:

 rustPlatform.buildRustPackage rec {
@@ -42,8 +43,12 @@ rustPlatform.buildRustPackage rec {
    wayland
    libxkbcommon
    openssl
+    oniguruma
  ];

+  # use system oniguruma since the bundled one fails to build with gcc15
+  env.RUSTONIG_SYSTEM_LIBONIG = 1;
+
  checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
    # time out on darwin
    "--skip=interpreter::tests::centered_image_with_size_align_and_link"
--- a/pkgs/by-name/jj/jjui/package.nix
+++ b/pkgs/by-name/jj/jjui/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "jjui";
-  version = "0.9.9";
+  version = "0.9.10";

  src = fetchFromGitHub {
    owner = "idursun";
    repo = "jjui";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-kBhEX6k/1vVhSqKeUcIQp6sOpKDnJfgUNKOTzbjG/VI=";
+    hash = "sha256-Hsuyf5VcSZcNi2gmubXS47uRarL17oPEtorisY75bbM=";
  };

  vendorHash = "sha256-jte0g+aUiGNARLi8DyfsX6wYYJnodHnILzmid6KvMiA=";
--- a/pkgs/by-name/le/legendary-gl/package.nix
+++ b/pkgs/by-name/le/legendary-gl/package.nix
@@ -26,8 +26,6 @@ python3Packages.buildPythonApplication {
    filelock
  ];

-  disabled = python3Packages.pythonOlder "3.8";
-
  # no tests
  doCheck = false;

--- a/pkgs/by-name/li/linyaps/package.nix
+++ b/pkgs/by-name/li/linyaps/package.nix
@@ -1,6 +1,5 @@
 {
  fetchFromGitHub,
-  fetchpatch,
  lib,
  stdenv,
  cmake,
@@ -10,10 +9,11 @@
  linyaps-box,
  cli11,
  curl,
+  elfutils,
  gpgme,
  gtest,
  libarchive,
-  libelf,
+  libcap,
  libsodium,
  libsysprof-capture,
  nlohmann_json,
@@ -24,7 +24,6 @@
  uncrustify,
  xz,
  yaml-cpp,
-  replaceVars,
  bash,
  binutils,
  coreutils,
@@ -39,13 +38,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "linyaps";
-  version = "1.10.0";
+  version = "1.11.0";

  src = fetchFromGitHub {
    owner = "OpenAtom-Linyaps";
    repo = finalAttrs.pname;
    tag = finalAttrs.version;
-    hash = "sha256-C5rP6r3V+hxTjM+kmXjS4MnuL6P5wxSVP9nNmlQbcB8=";
+    hash = "sha256-qPHDAwEQVnHLWGioEfgz11ZWhlEBJynap3a0hgfL050=";
  };

  patches = [
@@ -53,6 +52,9 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  postPatch = ''
+    substituteInPlace apps/ll-cli/src/main.cpp \
+      --replace-fail "ociRuntimeCLI, { BINDIR }" "ociRuntimeCLI, { \"${lib.getBin linyaps-box}/bin\" }"
+
    substituteInPlace apps/ll-init/CMakeLists.txt \
      --replace-fail "target_link_options(\''${LL_INIT_TARGET} PRIVATE -static -static-libgcc" \
                     "target_link_options(\''${LL_INIT_TARGET} PRIVATE -static -static-libgcc -L${stdenv.cc.libc.static}/lib"
@@ -68,10 +70,11 @@ stdenv.mkDerivation (finalAttrs: {
  buildInputs = [
    cli11
    curl
+    elfutils
    gpgme
    gtest
    libarchive
-    libelf
+    libcap
    libsodium
    libsysprof-capture
    nlohmann_json
@@ -92,6 +95,10 @@ stdenv.mkDerivation (finalAttrs: {
    qt6Packages.wrapQtAppsHook
  ];

+  cmakeFlags = [
+    (lib.cmakeBool "CPM_LOCAL_PACKAGES_ONLY" true)
+  ];
+
  postInstall = ''
    # move to the right location for systemd.packages option
    # https://github.com/NixOS/nixpkgs/blob/85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054/nixos/modules/system/boot/systemd.nix#L605
--- a/pkgs/by-name/ls/lsp-ai/package.nix
+++ b/pkgs/by-name/ls/lsp-ai/package.nix
@@ -4,6 +4,7 @@
  fetchFromGitHub,
  pkg-config,
  cmake,
+  oniguruma,
  openssl,
  zlib,
  perl,
@@ -56,10 +57,14 @@ rustPlatform.buildRustPackage rec {
  ];

  buildInputs = [
+    oniguruma
    openssl
    zlib
  ];

+  # use system oniguruma since the bundled one fails to build with gcc15
+  env.RUSTONIG_SYSTEM_LIBONIG = 1;
+
  cargoBuildFlags = [ "-p lsp-ai" ];

  passthru.updateScript = gitUpdater {
--- a/pkgs/by-name/ma/magma/magma-hipblas-v2-buildflags.patch
+++ b/pkgs/by-name/ma/magma/magma-hipblas-v2-buildflags.patch
@@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fc61af7..b2b594e 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -303,7 +303,7 @@ if (MAGMA_ENABLE_HIP)
+     set(GPU_ARCH_FLAGS ${DEVCCFLAGS})
+ 
+     #add_compile_options(${GPU_ARCH_FLAGS})
+-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__HIP_PLATFORM_AMD__" )
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__HIP_PLATFORM_AMD__ -DHIPBLAS_V2" )
+     option(ROCM_CORE "Location of the rocm-core package")
+     execute_process(COMMAND "${CMAKE_SOURCE_DIR}/tools/get-rocm-version.sh" "${ROCM_CORE}" OUTPUT_VARIABLE ROCM_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+     message(STATUS "ROCM_VERSION=${ROCM_VERSION}")
+diff --git a/Makefile b/Makefile
+index 44880ab..afaab45 100644
+--- a/Makefile
+++ b/Makefile
+@@ -846,7 +846,7 @@ ifeq ($(BACKEND),cuda)
+ d_ext := cu
+ else ifeq ($(BACKEND),hip)
+ d_ext := cpp
+-CXXFLAGS += -D__HIP_PLATFORM_AMD__
+CXXFLAGS += -D__HIP_PLATFORM_AMD__ -DHIPBLAS_V2
+ CXXFLAGS += -DROCM_VERSION=$(shell ./tools/get-rocm-version.sh)
+ endif
+ 
--- a/pkgs/by-name/ma/magma/package.nix
+++ b/pkgs/by-name/ma/magma/package.nix
@@ -4,8 +4,8 @@
  cmake,
  cudaPackages,
  cudaSupport ? config.cudaSupport,
+  fetchFromGitHub,
  fetchpatch,
-  fetchurl,
  gfortran,
  gpuTargets ? [ ], # Non-CUDA targets, that is HIP
  rocmPackages,
@@ -13,6 +13,7 @@
  lib,
  libpthreadstubs,
  ninja,
+  perl,
  python3,
  config,
  # At least one back-end has to be enabled,
@@ -115,9 +116,11 @@ stdenv.mkDerivation (finalAttrs: {
  pname = "magma";
  version = "2.9.0";

-  src = fetchurl {
-    url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${finalAttrs.version}.tar.gz";
-    hash = "sha256-/3f9Nyaz3+w7+1V5CwZICqXMOEOWwts1xW/a5KgsZBw=";
+  src = fetchFromGitHub {
+    owner = "icl-utk-edu";
+    repo = "magma";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ZV50id9qiCrc1K87812Lvv1tmeU/6vhpxFCz8nj61wM=";
  };

  # Magma doesn't have anything which could be run under doCheck, but it does build test suite executables.
@@ -134,6 +137,24 @@ stdenv.mkDerivation (finalAttrs: {
      url = "https://github.com/icl-utk-edu/magma/commit/2fecaf3f0c811344363f713669c1fe30f6879acd.patch";
      hash = "sha256-Dfzq2gqoLSByCLWV5xvY/lXZeVa/yQ67lDSoIAa9jUU=";
    })
+  ]
+  ++ lib.optionals rocmSupport [
+    # TODO: Drop both these patches on next magma release
+    (fetchpatch {
+      # ROCm 7.0 compat: use HIPBLAS_V2 types and APIs
+      # Requires building from git w/ make generate call. If applied to release tarball
+      # pre-generated hipified code will remain unpatched
+      name = "magma-ROCm-7.0-compat.patch";
+      url = "https://github.com/icl-utk-edu/magma/commit/02ecee0ccc56cce85194fdda18c9e0614797b2f9.patch";
+      hash = "sha256-vm58X30ZR02sOMsKrvxEcEF27tJYuuyZZrz+GGFNz5Q=";
+      excludes = [
+        "testing/testing_ztrsv_batched.cpp"
+        "CMakeLists.txt"
+        "Makefile"
+      ];
+    })
+    # Vendored patch with CMakeLists.txt and Makefile hunks from above commit (context differs)
+    ./magma-hipblas-v2-buildflags.patch
  ];

  postPatch = ''
@@ -147,12 +168,25 @@ stdenv.mkDerivation (finalAttrs: {
    autoPatchelfHook
    cmake
    ninja
+    perl # for make generate
    gfortran
  ]
  ++ lists.optionals cudaSupport [
    cudaPackages.cuda_nvcc
  ];

+  # README Step 0: generate precision variants and CMake.src.{hip|cuda} when building from git
+  # GPU_TARGET is a dummy value; CMake vars control target selection and `make generate`
+  # does not use the target setting, but the main makefile errors without it
+  preConfigure = ''
+    cat > make.inc <<EOF
+    BACKEND = ${if rocmSupport then "hip" else "cuda"}
+    FORT = true
+    GPU_TARGET = ${if rocmSupport then "gfx900" else "sm_90"}
+    EOF
+    make -j$NIX_BUILD_CORES generate
+  '';
+
  buildInputs = [
    libpthreadstubs
    lapack
@@ -183,6 +217,7 @@ stdenv.mkDerivation (finalAttrs: {
  env.CFLAGS = "-DADD_" + lib.optionalString rocmSupport " -fopenmp";
  env.CXXFLAGS = finalAttrs.env.CFLAGS;
  env.FFLAGS = "-DADD_";
+  env.ROCM_PATH = lib.optionalString rocmSupport rocmPackages.clr;

  cmakeFlags = [
    (strings.cmakeFeature "GPU_TARGET" gpuTargetString)
@@ -199,10 +234,6 @@ stdenv.mkDerivation (finalAttrs: {
    (strings.cmakeFeature "MIN_ARCH" minArch) # Disarms magma's asserts
  ]
  ++ lists.optionals rocmSupport [
-    # Can be removed once https://github.com/icl-utk-edu/magma/pull/27 is merged
-    # Can't easily apply the PR as a patch because we rely on the tarball with pregenerated
-    # hipified files ∴ fetchpatch of the PR will apply cleanly but fail to build
-    (strings.cmakeFeature "ROCM_CORE" "${rocmPackages.clr}")
    (strings.cmakeFeature "CMAKE_C_COMPILER" "${rocmPackages.clang}/bin/clang")
    (strings.cmakeFeature "CMAKE_CXX_COMPILER" "${rocmPackages.clang}/bin/clang++")
  ];
--- a/pkgs/by-name/ma/mapproxy/package.nix
+++ b/pkgs/by-name/ma/mapproxy/package.nix
@@ -9,7 +9,6 @@ python3Packages.buildPythonApplication rec {
  pname = "mapproxy";
  version = "5.1.1";
  pyproject = true;
-  disabled = python3Packages.pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "mapproxy";
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,21 +1,21 @@
 {
-  "version": "3.180.0",
+  "version": "3.181.0",
  "assets": {
    "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_linux_x86_64",
-      "hash": "sha256-hpmuMhN2HS+4zPlTOh87A1UQvlxVKlzqHKKDm1VBLhg="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.181.0/mirrord_linux_x86_64",
+      "hash": "sha256-hLTPM7TMoXL1AlPPLYrqCpE3JrfeOISK4RKekQg2GzY="
    },
    "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_linux_aarch64",
-      "hash": "sha256-dGe0r7ckuKkMzVkGyWaYR2PVkDtGRRhC3ievXzKs5dU="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.181.0/mirrord_linux_aarch64",
+      "hash": "sha256-LyJxTLWP2TZpGeKVQEhMILBpxik5LuT96en9272Ff0k="
    },
    "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_mac_universal",
-      "hash": "sha256-YxDaYQyh9C64bSqqkIWX4zEKadps+jqnXJA1BGdtxzw="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.181.0/mirrord_mac_universal",
+      "hash": "sha256-E0F6i/irdOKizI558XX9gh9YQ6T9d7H2SKwh4AjzSCk="
    },
    "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.180.0/mirrord_mac_universal",
-      "hash": "sha256-YxDaYQyh9C64bSqqkIWX4zEKadps+jqnXJA1BGdtxzw="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.181.0/mirrord_mac_universal",
+      "hash": "sha256-E0F6i/irdOKizI558XX9gh9YQ6T9d7H2SKwh4AjzSCk="
    }
  }
 }
--- a/pkgs/by-name/mo/monophony/package.nix
+++ b/pkgs/by-name/mo/monophony/package.nix
@@ -12,14 +12,14 @@
 }:
 python3Packages.buildPythonApplication rec {
  pname = "monophony";
-  version = "4.3.0";
+  version = "4.3.1";
  pyproject = true;

  src = fetchFromGitLab {
    owner = "zehkira";
    repo = "monophony";
    tag = "v${version}";
-    hash = "sha256-w2ev/fpswaNcutxg2zMwrtFkulMbbG7BUm3L8qlnZKk=";
+    hash = "sha256-Jp2RwfTcOb4xALIMc4DAQX+fWdqPE+TWv5qRgdSopbM=";
  };

  sourceRoot = "${src.name}/source";
--- a/pkgs/by-name/mu/music-assistant/package.nix
+++ b/pkgs/by-name/mu/music-assistant/package.nix
@@ -47,14 +47,14 @@ assert

 python.pkgs.buildPythonApplication rec {
  pname = "music-assistant";
-  version = "2.7.3";
+  version = "2.7.5";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "music-assistant";
    repo = "server";
    tag = version;
-    hash = "sha256-6D3B88wjfVHvNhNrTDOu77eAkherOqdBVafUhht7okA=";
+    hash = "sha256-iWdOGdmPJO7Pjdn8UjuSOhWnRGBFjmARFsuHmP6IP58=";
  };

  patches = [
--- a/pkgs/by-name/mu/music-assistant/providers.nix
+++ b/pkgs/by-name/mu/music-assistant/providers.nix
@@ -1,7 +1,7 @@
 # Do not edit manually, run ./update-providers.py

 {
-  version = "2.7.3";
+  version = "2.7.5";
  providers = {
    airplay = ps: [
    ];
@@ -134,6 +134,7 @@
    sendspin =
      ps: with ps; [
        aiosendspin
+        av
      ];
    siriusxm = ps: [
    ]; # missing sxm
--- a/pkgs/by-name/ni/ni/package.nix
+++ b/pkgs/by-name/ni/ni/package.nix
@@ -12,19 +12,19 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "ni";
-  version = "28.1.0";
+  version = "28.2.0";

  src = fetchFromGitHub {
    owner = "antfu-collective";
    repo = "ni";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-D6TzDyT3HIULeHL/ACkOcVQ/g7pAw8jONnWfwJgWyx4=";
+    hash = "sha256-QRatGm8e12mYtCPpeZwz4adtl6PTPUXTRlge6UKqiqI=";
  };

  pnpmDeps = fetchPnpmDeps {
    inherit (finalAttrs) pname version src;
    fetcherVersion = 2;
-    hash = "sha256-eSnrR2Cik24wEbSObabJSzZOGfl6XzQrEyDB7Ea2hg8=";
+    hash = "sha256-n/iqROsdVwLZEAHU3G6Hkl2wrwnwJv7BUMzJif9bYRM=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/op/opensplat/package.nix
+++ b/pkgs/by-name/op/opensplat/package.nix
@@ -12,15 +12,16 @@
  cxxopts,
  nix-update-script,
  config,
-  # Upstream has rocm/hip support, too. anyone?
  cudaSupport ? config.cudaSupport,
  cudaPackages,
+  rocmSupport ? config.rocmSupport,
+  rocmPackages,
  autoAddDriverRunpath,
  fetchpatch2,
 }:
 let
  version = "1.1.4";
-  torch = python3.pkgs.torch.override { inherit cudaSupport; };
+  torch = python3.pkgs.torch.override { inherit cudaSupport rocmSupport; };
  # Using a normal stdenv with cuda torch gives
  # ld: /nix/store/k1l7y96gv0nc685cg7i3g43i4icmddzk-python3.11-torch-2.2.1-lib/lib/libc10.so: undefined reference to `std::ios_base_library_init()@GLIBCXX_3.4.32'
  stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv;
@@ -43,10 +44,32 @@ stdenv'.mkDerivation {
    })
  ];

+  postPatch = lib.optionalString rocmSupport ''
+        # ROCm CMake targets must be available before find_package(Torch)
+        # because Torch's Caffe2Targets.cmake references them in torch_hip_library
+        substituteInPlace CMakeLists.txt \
+          --replace-fail "find_package(Torch REQUIRED)" \
+            "find_package(hip REQUIRED)
+    find_package(hiprtc REQUIRED)
+    find_package(hipblas REQUIRED)
+    find_package(hipfft REQUIRED)
+    find_package(hiprand REQUIRED)
+    find_package(hipsparse REQUIRED)
+    find_package(hipsolver REQUIRED)
+    find_package(hipblaslt REQUIRED)
+    find_package(rocblas REQUIRED)
+    find_package(rocsolver REQUIRED)
+    find_package(miopen REQUIRED)
+    find_package(Torch REQUIRED)"
+  '';
+
  nativeBuildInputs = [
    cmake
    ninja
  ]
+  ++ lib.optionals rocmSupport [
+    rocmPackages.clr
+  ]
  ++ lib.optionals cudaSupport [
    cudaPackages.cuda_nvcc
    autoAddDriverRunpath
@@ -61,16 +84,39 @@ stdenv'.mkDerivation {
    torch
    opencv
  ]
+  ++ lib.optionals rocmSupport [
+    rocmPackages.clr
+    rocmPackages.hipblas
+    rocmPackages.hipfft
+    rocmPackages.hiprand
+    rocmPackages.hipsparse
+    rocmPackages.hipsolver
+    rocmPackages.hipblaslt
+    rocmPackages.rocblas
+    rocmPackages.rocsolver
+    rocmPackages.rocsolver
+    rocmPackages.miopen
+  ]
  ++ lib.optionals cudaSupport [
    cudaPackages.cuda_cudart
  ];

-  env.TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" python3.pkgs.torch.cudaCapabilities}";
+  env =
+    lib.optionalAttrs cudaSupport {
+      TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" python3.pkgs.torch.cudaCapabilities}";
+      NIX_LDFLAGS = "-L${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs"; # fixes -lcuda not found
+    }
+    // lib.optionalAttrs rocmSupport {
+      HIPFLAGS = "-I${lib.getInclude rocmPackages.rocthrust}/include -I${lib.getInclude rocmPackages.rocprim}/include";
+    };

  cmakeFlags = [
    (lib.cmakeBool "CMAKE_SKIP_RPATH" true)
    (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS")
  ]
+  ++ lib.optionals rocmSupport [
+    (lib.cmakeFeature "GPU_RUNTIME" "HIP")
+  ]
  ++ lib.optionals cudaSupport [
    (lib.cmakeFeature "GPU_RUNTIME" "CUDA")
    (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}/")
@@ -87,7 +133,10 @@ stdenv'.mkDerivation {
      # vendored+modified gsplat
      lib.licenses.asl20
    ];
-    maintainers = [ lib.maintainers.jcaesar ];
+    maintainers = [
+      lib.maintainers.jcaesar
+      lib.maintainers.LunNova
+    ];
    platforms = lib.platforms.linux ++ lib.optionals (!cudaSupport) lib.platforms.darwin;
  };
 }
--- a/pkgs/by-name/ox/oxlint/package.nix
+++ b/pkgs/by-name/ox/oxlint/package.nix
@@ -12,16 +12,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "oxlint";
-  version = "1.38.0";
+  version = "1.39.0";

  src = fetchFromGitHub {
    owner = "oxc-project";
    repo = "oxc";
    tag = "oxlint_v${finalAttrs.version}";
-    hash = "sha256-kMCGKbc7qaY0KUOR+67mLvKW4J5CuvYUmC6Aj9xlzSk=";
+    hash = "sha256-Sg9NtXRuQ0ZruK8a8k5EkeDOJ9v6uzpNzEQ/FY56ioY=";
  };

-  cargoHash = "sha256-cesj9jwWHIFxpFV62QDgYl22EUE8qVjIbb2nRObAyLo=";
+  cargoHash = "sha256-sgIarCuUmSTAVPVr82rp4dQwzDMWESIbGgkCYEExz6o=";

  nativeBuildInputs = [
    cmake
--- a/pkgs/by-name/pd/pdm/package.nix
+++ b/pkgs/by-name/pd/pdm/package.nix
@@ -33,8 +33,6 @@ python.pkgs.buildPythonApplication rec {
  version = "2.26.2";
  pyproject = true;

-  disabled = python.pkgs.pythonOlder "3.8";
-
  src = fetchFromGitHub {
    owner = "pdm-project";
    repo = "pdm";
--- a/pkgs/by-name/pg/pg_activity/package.nix
+++ b/pkgs/by-name/pg/pg_activity/package.nix
@@ -8,7 +8,6 @@ python3Packages.buildPythonApplication rec {
  pname = "pg_activity";
  version = "3.6.1";
  pyproject = true;
-  disabled = python3Packages.pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "dalibo";
--- a/pkgs/by-name/po/portablemc/package.nix
+++ b/pkgs/by-name/po/portablemc/package.nix
@@ -50,8 +50,6 @@ python3Packages.buildPythonApplication rec {
  version = "4.4.1";
  pyproject = true;

-  disabled = python3Packages.pythonOlder "3.8";
-
  src = fetchFromGitHub {
    owner = "mindstorm38";
    repo = "portablemc";
--- a/pkgs/by-name/py/pyfa/package.nix
+++ b/pkgs/by-name/py/pyfa/package.nix
@@ -11,7 +11,7 @@
  copyDesktopItems,
 }:
 let
-  version = "2.65.2";
+  version = "2.65.4";
 in
 python3Packages.buildPythonApplication rec {
  inherit version;
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
    owner = "pyfa-org";
    repo = "Pyfa";
    tag = "v${version}";
-    hash = "sha256-W3HQ6x9WXYXCczVj+3MBhEnkoDgJUJ6oZal1N4iDjdg=";
+    hash = "sha256-dBJmtKZD2MvQjLhz2Jcn/ldAEbo0wllXDItQu5pyrW8=";
  };

  desktopItems = [
--- a/pkgs/by-name/ra/rapid-photo-downloader/package.nix
+++ b/pkgs/by-name/ra/rapid-photo-downloader/package.nix
@@ -36,35 +36,32 @@ python3Packages.buildPythonApplication rec {
    setuptools
  ];

-  dependencies =
-    with python3Packages;
-    [
-      ifuse
-      libimobiledevice
-      # Python dependencies
-      pyqt5
-      pygobject3
-      gphoto2
-      pyzmq
-      tornado
-      psutil
-      pyxdg
-      arrow
-      python-dateutil
-      easygui
-      babel
-      colour
-      pillow
-      pymediainfo
-      sortedcontainers
-      requests
-      colorlog
-      pyprind
-      setuptools
-      show-in-file-manager
-      tenacity
-    ]
-    ++ lib.optional (pythonOlder "3.8") importlib-metadata;
+  dependencies = with python3Packages; [
+    ifuse
+    libimobiledevice
+    # Python dependencies
+    pyqt5
+    pygobject3
+    gphoto2
+    pyzmq
+    tornado
+    psutil
+    pyxdg
+    arrow
+    python-dateutil
+    easygui
+    babel
+    colour
+    pillow
+    pymediainfo
+    sortedcontainers
+    requests
+    colorlog
+    pyprind
+    setuptools
+    show-in-file-manager
+    tenacity
+  ];

  postPatch = ''
    # Drop broken version specifier
--- a/pkgs/by-name/re/regal/package.nix
+++ b/pkgs/by-name/re/regal/package.nix
@@ -6,16 +6,16 @@

 buildGoModule rec {
  name = "regal";
-  version = "0.37.0";
+  version = "0.38.1";

  src = fetchFromGitHub {
    owner = "open-policy-agent";
    repo = "regal";
    rev = "v${version}";
-    hash = "sha256-zAp4v1bKz+q+29jlhEccl7o9RWLA+Hn3Kp/UGBQlmA8=";
+    hash = "sha256-/WGZCwT9VJ5zjEmL4PZqPymaUJFaWzjbgq2KMBfl6uQ=";
  };

-  vendorHash = "sha256-yvUvv8EL3WrsyBnzaGQK4DR+O5Ner9ehkZYCMnfRwRU=";
+  vendorHash = "sha256-b7Q9eqq/lDykIQ0tkwBWk2ukAoScBTApfwoE2Ubm5iQ=";

  # Only build the main binary, exclude build/lsp/main.go
  subPackages = [ "." ];
--- a/pkgs/by-name/re/remind/package.nix
+++ b/pkgs/by-name/re/remind/package.nix
@@ -16,14 +16,14 @@

 tcl.mkTclDerivation rec {
  pname = "remind";
-  version = "06.02.01";
+  version = "06.02.02";

  src = fetchFromGitea {
    domain = "git.skoll.ca";
    owner = "Skollsoft-Public";
    repo = "Remind";
    rev = version;
-    hash = "sha256-bdR0uLPUGAaB5w4BNPaPOuI9Eg3utyETlUlLIQmcxMs=";
+    hash = "sha256-SkQT651LjHCZJRtb4Itbzqhq9x5p05jYUam1XiYT4os=";
  };

  propagatedBuildInputs = lib.optionals withGui [
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -16,18 +16,18 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "ruff";
-  version = "0.14.11";
+  version = "0.14.13";

  src = fetchFromGitHub {
    owner = "astral-sh";
    repo = "ruff";
    tag = finalAttrs.version;
-    hash = "sha256-W8BYc0m/3WsguchDweUapreLrNp47jzkuldI5yEWgvA=";
+    hash = "sha256-ComgiY6fvM2f3Ul8kTgykyktvxEHL85X5C1Tudi5ZB4=";
  };

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

-  cargoHash = "sha256-0axyrkSHjBPhv40LvdcRDUqC+j0mUL/VzpgL/I0R5/o=";
+  cargoHash = "sha256-Vd9y9VQF7d62tjHJ0ikWlvV7+KDs4q61ld9yoJWaqpY=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/by-name/si/siyuan/package.nix
+++ b/pkgs/by-name/si/siyuan/package.nix
@@ -36,20 +36,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "siyuan";
-  version = "3.5.3";
+  version = "3.5.4-dev2";

  src = fetchFromGitHub {
    owner = "siyuan-note";
    repo = "siyuan";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-YAd7XVJLs66CAhb5ro8o5GrT5AhVpp/RHOpl1XkBBHU=";
+    hash = "sha256-D3vpbtGNeDP+PZIOUGYufZo0ZTq9/eZsesizNuvAHdE=";
  };

  kernel = buildGoModule {
    name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
    inherit (finalAttrs) src;
    sourceRoot = "${finalAttrs.src.name}/kernel";
-    vendorHash = "sha256-2O8gk6Y6odlMldUfanPf5MIiczfd5lH/yMX0IbIEVvc=";
+    vendorHash = "sha256-/VLI51s3CQSzaLhiO673chXgqDml2l0zVXGFvhiVbAs=";

    patches = [
      (replaceVars ./set-pandoc-path.patch {
--- a/pkgs/by-name/sl/slidev-cli/package.nix
+++ b/pkgs/by-name/sl/slidev-cli/package.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "slidev-cli";
-  version = "52.11.2";
+  version = "52.11.3";

  src = fetchFromGitHub {
    owner = "slidevjs";
    repo = "slidev";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-dAGHcnHNSYtIQvcrn/jRbA2GF7YBJkYXbQbjkGtTUa0=";
+    hash = "sha256-Q1nfWxeu0u9/1mxTh+aKqZYMW2IXnT7+dB1ZVfEIMWE=";
  };

  pnpmWorkspaces = [ "@slidev/cli..." ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
      pnpmWorkspaces
      ;
    fetcherVersion = 3;
-    hash = "sha256-rHqrtK6eIqQ6SoZA1CtuUwDbHSZ9HSHikMdNrTtojHs=";
+    hash = "sha256-qdIpC+pDDinStTXVlHbuZZa2s9Sr5Nu9k/OAGxmXSuI=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/sn/snac2/package.nix
+++ b/pkgs/by-name/sn/snac2/package.nix
@@ -10,14 +10,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "snac2";
-  version = "2.87";
+  version = "2.88";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "grunfink";
    repo = "snac2";
    tag = finalAttrs.version;
-    hash = "sha256-CY4YfnIGQs7BcZrDRD8i+8Wq5eC1jbex6UR9bGgMw40=";
+    hash = "sha256-3IqPIIfU4MKXMMpOFYgI0RN+DZE+oTgLGOYIKwfKCsI=";
  };

  buildInputs = [
--- a/pkgs/by-name/sq/sqlfluff/package.nix
+++ b/pkgs/by-name/sq/sqlfluff/package.nix
@@ -22,31 +22,25 @@ python3Packages.buildPythonApplication rec {
  pythonRelaxDeps = [
    "click"
  ];
-  dependencies =
-    with python3Packages;
-    [
-      appdirs
-      cached-property
-      chardet
-      click
-      colorama
-      configparser
-      diff-cover
-      jinja2
-      oyaml
-      pathspec
-      platformdirs
-      pytest
-      regex
-      tblib
-      toml
-      tqdm
-      typing-extensions
-    ]
-    ++ lib.optionals (pythonOlder "3.8") [
-      backports.cached-property
-      importlib_metadata
-    ];
+  dependencies = with python3Packages; [
+    appdirs
+    cached-property
+    chardet
+    click
+    colorama
+    configparser
+    diff-cover
+    jinja2
+    oyaml
+    pathspec
+    platformdirs
+    pytest
+    regex
+    tblib
+    toml
+    tqdm
+    typing-extensions
+  ];

  nativeCheckInputs = with python3Packages; [
    hypothesis
--- a/pkgs/by-name/st/stac-validator/package.nix
+++ b/pkgs/by-name/st/stac-validator/package.nix
@@ -8,7 +8,6 @@ python3Packages.buildPythonPackage rec {
  pname = "stac-validator";
  version = "3.10.2";
  pyproject = true;
-  disabled = python3Packages.pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "stac-utils";
--- a/pkgs/by-name/tc/tcpdump/package.nix
+++ b/pkgs/by-name/tc/tcpdump/package.nix
@@ -9,11 +9,11 @@

 stdenv.mkDerivation rec {
  pname = "tcpdump";
-  version = "4.99.5";
+  version = "4.99.6";

  src = fetchurl {
    url = "https://www.tcpdump.org/release/tcpdump-${version}.tar.gz";
-    hash = "sha256-jHWFbgCt3urfcNrWfJ/z3TaFNrK4Vjq/aFTXx2TNOts=";
+    hash = "sha256-WDmSGg9n19j6PazZzUHkTInMuGfoptshbWJijH/RSwk=";
  };

  postPatch = ''
--- a/pkgs/by-name/tn/tnef/package.nix
+++ b/pkgs/by-name/tn/tnef/package.nix
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
+  fetchpatch,
  autoreconfHook,
 }:

@@ -16,6 +17,15 @@ stdenv.mkDerivation rec {
    sha256 = "104g48mcm00bgiyzas2vf86331w7bnw7h3bc11ib4lp7rz6zqfck";
  };

+  patches = [
+    # Fix gcc-15 build failure: https://github.com/verdammelt/tnef/pull/49
+    (fetchpatch {
+      name = "gcc-15.patch";
+      url = "https://github.com/verdammelt/tnef/commit/86bfa75cfacbe71c8d5282fa0065981b4544c5ad.patch";
+      hash = "sha256-iWQop57riqwDLVi5Ba5s4f34lGXgvKO3ZMTgWbAoRIY=";
+    })
+  ];
+
  doCheck = true;

  nativeBuildInputs = [ autoreconfHook ];
--- a/pkgs/by-name/wt/wttrbar/package.nix
+++ b/pkgs/by-name/wt/wttrbar/package.nix
@@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "wttrbar";
-  version = "0.13.0";
+  version = "0.13.1";

  src = fetchFromGitHub {
    owner = "bjesus";
    repo = "wttrbar";
    tag = finalAttrs.version;
-    hash = "sha256-TYWbC9TMHRWLPQ199SMbg2ROVVCFYbZDqB54IAbeTUQ=";
+    hash = "sha256-TDjEIrxFkh6d0x89LxaiarsP0BIzP5+rxu3YCdXIQ2U=";
  };

-  cargoHash = "sha256-yqfg/tDLCEwkgSAD2B63y7tVNx7RLblfD2yvywPzbz0=";
+  cargoHash = "sha256-yiShp9k5oiGAtj59jGDEFsQKujDFajO+Nwq0bLh/PtA=";

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ openssl ];
--- a/pkgs/by-name/zl/zluda/package.nix
+++ b/pkgs/by-name/zl/zluda/package.nix
@@ -14,16 +14,15 @@
  stdenv,
 }:

-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "zluda";
-  version = "4-unstable-2025-01-28";
+  version = "6-preview.45";

  src = fetchFromGitHub {
    owner = "vosen";
    repo = "ZLUDA";
-    # Cargo.lock introduced and major bug fixes in this commit
-    rev = "df5a96d935b014f88e30af4abc487882b0b54a76";
-    hash = "sha256-T2pCZZzZbCLI01YSF0VguKtL3EDEdIoUyH4C9ccaCi8=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-796OuIM5a0saE0v1QHHAGRjUPT+YAIfUuEtAruMn8Mk=";
    fetchSubmodules = true;
  };

@@ -35,6 +34,7 @@ rustPlatform.buildRustPackage rec {
    rocmPackages.rocsolver
    rocmPackages.rocblas
    rocmPackages.hipblas
+    rocmPackages.hipblaslt
    rocmPackages.rocm-cmake
    rocmPackages.hipfft
    zlib
@@ -50,7 +50,10 @@ rustPlatform.buildRustPackage rec {
    clang
  ];

-  cargoHash = "sha256-hDQWjzkx7YdkgSmNKTzCa2VhBFvn6P9QANV9hJ7UiT8=";
+  cargoHash = "sha256-YNBeweZ/vfXGfM0lrZbAh71z6Rb0+B7nOuO8VL2BmCo=";
+
+  # Tests require a GPU and segfault in the sandbox
+  doCheck = false;

  # xtask doesn't support passing --target, but nix hooks expect the folder structure from when it's set
  env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.cargoShortTarget;
@@ -80,10 +83,10 @@ rustPlatform.buildRustPackage rec {
  meta = {
    description = "CUDA on non-Nvidia GPUs";
    homepage = "https://github.com/vosen/ZLUDA";
-    changelog = "https://github.com/vosen/ZLUDA/releases/tag/${src.rev}";
+    changelog = "https://github.com/vosen/ZLUDA/releases/tag/${finalAttrs.src.rev}";
    license = lib.licenses.mit;
    maintainers = [
      lib.maintainers.errnoh
    ];
  };
-}
+})
--- a/pkgs/development/ocaml-modules/owl-base/default.nix
+++ b/pkgs/development/ocaml-modules/owl-base/default.nix
@@ -2,17 +2,27 @@
  lib,
  buildDunePackage,
  fetchurl,
+  fetchpatch,
+  applyPatches,
 }:

-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
  pname = "owl-base";
  version = "1.2";

-  duneVersion = "3";
+  src = applyPatches {
+    src = fetchurl {
+      url = "https://github.com/owlbarn/owl/releases/download/${finalAttrs.version}/owl-${finalAttrs.version}.tbz";
+      hash = "sha256-OBei5DkZIsiiIltOM8qV2mgJJGmU5r8pGjAMgtjKxsU=";
+    };

-  src = fetchurl {
-    url = "https://github.com/owlbarn/owl/releases/download/${version}/owl-${version}.tbz";
-    hash = "sha256-OBei5DkZIsiiIltOM8qV2mgJJGmU5r8pGjAMgtjKxsU=";
+    patches = [
+      # Compatibility with GCC 15
+      (fetchpatch {
+        url = "https://github.com/owlbarn/owl/commit/3e66ccb0b1d21b73fa703f3d3f416ec0107860a4.patch";
+        hash = "sha256-0bV0ogTvtDoO8kEvE5QcJFRWqOJ1qiXGjXY9Ekp30M0=";
+      })
+    ];
  };

  minimalOCamlVersion = "4.10";
@@ -25,4 +35,4 @@ buildDunePackage rec {
    maintainers = [ lib.maintainers.bcdarwin ];
    license = lib.licenses.mit;
  };
-}
+})
--- a/pkgs/development/python-modules/accupy/default.nix
+++ b/pkgs/development/python-modules/accupy/default.nix
@@ -3,14 +3,12 @@
  stdenv,
  buildPythonPackage,
  fetchFromGitHub,
-  pythonOlder,
  setuptools,
  mpmath,
  numpy,
  pybind11,
  pyfma,
  eigen,
-  importlib-metadata,
  pytestCheckHook,
  matplotlib,
  dufte,
@@ -40,8 +38,7 @@ buildPythonPackage rec {
    mpmath
    numpy
    pyfma
-  ]
-  ++ lib.optional (pythonOlder "3.8") importlib-metadata;
+  ];

  nativeCheckInputs = [
    perfplot
--- a/pkgs/development/python-modules/aiolifx-themes/default.nix
+++ b/pkgs/development/python-modules/aiolifx-themes/default.nix
@@ -11,9 +11,9 @@
  pythonOlder,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "aiolifx-themes";
-  version = "1.0.2";
+  version = "1.0.3";
  pyproject = true;

  disabled = pythonOlder "3.12";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "Djelibeybi";
    repo = "aiolifx-themes";
-    tag = "v${version}";
-    hash = "sha256-uJQWKgmlNwuvIXfK6fFHngaSncgaDJJ36vkOLGWB/lY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Y92ze+zrkz+fxQNFFSR5V9sPJMN0/dfIRwT6UhXo0+U=";
  };

  build-system = [ poetry-core ];
@@ -41,8 +41,8 @@ buildPythonPackage rec {
  meta = {
    description = "Color themes for LIFX lights running on aiolifx";
    homepage = "https://github.com/Djelibeybi/aiolifx-themes";
-    changelog = "https://github.com/Djelibeybi/aiolifx-themes/releases/tag/${src.tag}";
+    changelog = "https://github.com/Djelibeybi/aiolifx-themes/releases/tag/${finalAttrs.src.tag}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ lukegb ];
  };
-}
+})
--- a/pkgs/development/python-modules/aiorwlock/default.nix
+++ b/pkgs/development/python-modules/aiorwlock/default.nix
@@ -5,6 +5,7 @@
  pytest-asyncio,
  pytestCheckHook,
  poetry-core,
+  fetchpatch,
 }:

 buildPythonPackage rec {
@@ -21,6 +22,15 @@ buildPythonPackage rec {

  build-system = [ poetry-core ];

+  patches = [
+    # Fix cross-event-loop race condition in lock acquisition
+    # https://github.com/aio-libs/aiorwlock/pull/503
+    (fetchpatch {
+      url = "https://github.com/aio-libs/aiorwlock/commit/05608d401e4a68c69c6b9f421dd20535a9dbe523.patch?full_index=1";
+      hash = "sha256-97c6Li6nq7ViNvUIdPL8f/ATOSsmiAMaJeBFj+jPJcM=";
+    })
+  ];
+
  nativeCheckInputs = [
    pytest-asyncio
    pytestCheckHook
--- a/pkgs/development/python-modules/aiosendspin/default.nix
+++ b/pkgs/development/python-modules/aiosendspin/default.nix
@@ -20,16 +20,22 @@

 buildPythonPackage rec {
  pname = "aiosendspin";
-  version = "1.2.0";
+  version = "2.1.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "Sendspin";
    repo = "aiosendspin";
    tag = version;
-    hash = "sha256-3vTEfXeFqouPswRKST/9U7yg9ah7J9m2KAMoxaBZNR0=";
+    hash = "sha256-9VhNtfXH2r/cGkscz51PIK2/66pPOGv0S0IpO0wFvO4=";
  };

+  # https://github.com/Sendspin/aiosendspin/blob/1.2.0/pyproject.toml#L7
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'version = "0.0.0"' 'version = "${version}"'
+  '';
+
  build-system = [
    setuptools
  ];
--- a/pkgs/development/python-modules/aiosmtpd/default.nix
+++ b/pkgs/development/python-modules/aiosmtpd/default.nix
@@ -8,7 +8,6 @@
  pytestCheckHook,
  pythonOlder,
  setuptools,
-  typing-extensions,

  # for passthru.tests
  django,
@@ -32,8 +31,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    atpublic
    attrs
-  ]
-  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ];

  nativeCheckInputs = [
    pytest-mock
--- a/pkgs/development/python-modules/aiosql/default.nix
+++ b/pkgs/development/python-modules/aiosql/default.nix
@@ -1,5 +1,6 @@
 {
  lib,
+  stdenv,
  buildPythonPackage,
  fetchFromGitHub,
  pg8000,
@@ -50,6 +51,14 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "aiosql" ];

+  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
+    # Tests that require port binding fail in darwin sandbox
+    # port_for.exceptions.PortForException: Can't select a port
+    "tests/test_pg8000.py"
+    "tests/test_apsycopg3.py"
+    "tests/test_psycopg3.py"
+  ];
+
  meta = {
    description = "Simple SQL in Python";
    homepage = "https://nackjicholson.github.io/aiosql/";
--- a/pkgs/development/python-modules/amaranth/default.nix
+++ b/pkgs/development/python-modules/amaranth/default.nix
@@ -1,14 +1,11 @@
 {
  lib,
  buildPythonPackage,
-  pythonOlder,
  fetchFromGitHub,
  pdm-backend,
  jschon,
  pyvcd,
  jinja2,
-  importlib-resources,
-  importlib-metadata,
  git,

  # for tests
@@ -43,9 +40,7 @@ buildPythonPackage rec {
    jschon
    jinja2
    pyvcd
-  ]
-  ++ lib.optional (pythonOlder "3.9") importlib-resources
-  ++ lib.optional (pythonOlder "3.8") importlib-metadata;
+  ];

  nativeCheckInputs = [
    pytestCheckHook
--- a/pkgs/development/python-modules/anywidget/default.nix
+++ b/pkgs/development/python-modules/anywidget/default.nix
@@ -4,10 +4,8 @@
  fetchPypi,
  pytestCheckHook,
  writableTmpDirAsHomeHook,
-  pythonOlder,
  hatch-jupyter-builder,
  hatchling,
-  importlib-metadata,
  ipykernel,
  ipywidgets,
  psygnal,
@@ -43,8 +41,7 @@ buildPythonPackage rec {
    ipywidgets
    psygnal
    typing-extensions
-  ]
-  ++ lib.optional (pythonOlder "3.8") importlib-metadata;
+  ];

  nativeCheckInputs = [
    pytestCheckHook
--- a/pkgs/development/python-modules/automate-home/default.nix
+++ b/pkgs/development/python-modules/automate-home/default.nix
@@ -8,7 +8,6 @@
  hiredis,
  pytestCheckHook,
  pythonAtLeast,
-  pythonOlder,
  pytz,
  pyyaml,
  setuptools,
@@ -20,7 +19,7 @@ buildPythonPackage rec {
  pyproject = true;

  # Typing issue
-  disabled = pythonOlder "3.8" || pythonAtLeast "3.12";
+  disabled = pythonAtLeast "3.12";

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/avro/default.nix
+++ b/pkgs/development/python-modules/avro/default.nix
@@ -1,10 +1,8 @@
 {
  lib,
  buildPythonPackage,
-  pythonOlder,
  setuptools,
  fetchPypi,
-  typing-extensions,
  pytest7CheckHook,
 }:

@@ -20,8 +18,6 @@ buildPythonPackage rec {

  build-system = [ setuptools ];

-  dependencies = lib.optionals (pythonOlder "3.8") [ typing-extensions ];
-
  nativeCheckInputs = [ pytest7CheckHook ];

  disabledTests = [
--- a/pkgs/development/python-modules/aws-lambda-builders/default.nix
+++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix
@@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "aws-lambda-builders";
-  version = "1.59.0";
+  version = "1.61.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "awslabs";
    repo = "aws-lambda-builders";
    tag = "v${version}";
-    hash = "sha256-US8NHNEvYlYJMurXjvlySIdKIgKjAwIws8PmnPF0J6Q=";
+    hash = "sha256-NdVZrc6996dlV0jSWuZH/dLQdJnXO+BQb8hk3G0oXmw=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/aws-xray-sdk/default.nix
+++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix
@@ -7,13 +7,11 @@
  django,
  fetchFromGitHub,
  httpx,
-  importlib-metadata,
  jsonpickle,
  pymysql,
  pytest-asyncio_0,
  pynamodb,
  pytestCheckHook,
-  pythonOlder,
  requests,
  setuptools,
  sqlalchemy,
@@ -40,8 +38,7 @@ buildPythonPackage rec {
    jsonpickle
    requests
    wrapt
-  ]
-  ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  ];

  nativeCheckInputs = [
    aiohttp
--- a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix
@@ -2,12 +2,10 @@
  lib,
  buildPythonPackage,
  fetchPypi,
-  pythonOlder,
  azure-common,
  azure-mgmt-core,
  isodate,
  setuptools,
-  typing-extensions,
 }:

 buildPythonPackage rec {
@@ -28,8 +26,7 @@ buildPythonPackage rec {
    azure-common
    azure-mgmt-core
    isodate
-  ]
-  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ];

  # no tests included
  doCheck = false;
--- a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix
@@ -5,8 +5,6 @@
  azure-common,
  azure-mgmt-core,
  isodate,
-  pythonOlder,
-  typing-extensions,
 }:

 buildPythonPackage rec {
@@ -24,8 +22,7 @@ buildPythonPackage rec {
    isodate
    azure-common
    azure-mgmt-core
-  ]
-  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ];

  pythonNamespaces = [ "azure.mgmt" ];

--- a/pkgs/development/python-modules/azure-mgmt-maps/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-maps/default.nix
@@ -5,8 +5,6 @@
  buildPythonPackage,
  fetchPypi,
  isodate,
-  pythonOlder,
-  typing-extensions,
  msrest,
 }:

@@ -25,8 +23,7 @@ buildPythonPackage rec {
    azure-common
    azure-mgmt-core
    msrest
-  ]
-  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ];

  pythonNamespaces = [ "azure.mgmt" ];

--- a/pkgs/development/python-modules/azure-mgmt-redis/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix
@@ -5,8 +5,6 @@
  buildPythonPackage,
  fetchPypi,
  isodate,
-  pythonOlder,
-  typing-extensions,
 }:

 buildPythonPackage rec {
@@ -24,8 +22,7 @@ buildPythonPackage rec {
    isodate
    azure-common
    azure-mgmt-core
-  ]
-  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ];

  # Module has no tests
  doCheck = false;
--- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
@@ -6,8 +6,6 @@
  msrest,
  azure-common,
  azure-mgmt-core,
-  typing-extensions,
-  pythonOlder,
 }:

 buildPythonPackage rec {
@@ -27,8 +25,7 @@ buildPythonPackage rec {
    msrest
    azure-common
    azure-mgmt-core
-  ]
-  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ];

  # has no tests
  doCheck = false;
--- a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix
+++ b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix
@@ -2,9 +2,7 @@
  lib,
  buildPythonPackage,
  fetchPypi,
-  pythonOlder,
  setuptools-scm,
-  importlib-metadata,
 }:

 buildPythonPackage rec {
@@ -20,8 +18,6 @@ buildPythonPackage rec {

  nativeBuildInputs = [ setuptools-scm ];

-  propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
-
  # no tests
  doCheck = false;

--- a/pkgs/development/python-modules/backports-strenum/default.nix
+++ b/pkgs/development/python-modules/backports-strenum/default.nix
@@ -5,7 +5,6 @@
  poetry-core,
  pytestCheckHook,
  pythonAtLeast,
-  pythonOlder,
 }:

 buildPythonPackage rec {
@@ -13,7 +12,7 @@ buildPythonPackage rec {
  version = "1.3.1";
  pyproject = true;

-  disabled = pythonOlder "3.8" || pythonAtLeast "3.11";
+  disabled = pythonAtLeast "3.11";

  src = fetchFromGitHub {
    owner = "clbarnes";
--- a/pkgs/development/python-modules/catalogue/default.nix
+++ b/pkgs/development/python-modules/catalogue/default.nix
@@ -3,10 +3,7 @@
  buildPythonPackage,
  fetchPypi,
  pytestCheckHook,
-  pythonOlder,
  setuptools,
-  typing-extensions,
-  zipp,
 }:

 buildPythonPackage rec {
@@ -21,11 +18,6 @@ buildPythonPackage rec {

  nativeBuildInputs = [ setuptools ];

-  propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
-    typing-extensions
-    zipp
-  ];
-
  nativeCheckInputs = [ pytestCheckHook ];

  pythonImportsCheck = [ "catalogue" ];
--- a/pkgs/development/python-modules/cli-ui/default.nix
+++ b/pkgs/development/python-modules/cli-ui/default.nix
@@ -2,7 +2,6 @@
  lib,
  fetchFromGitHub,
  pytestCheckHook,
-  pythonOlder,
  poetry-core,
  colorama,
  tabulate,
@@ -14,8 +13,6 @@ buildPythonPackage rec {
  version = "0.19.0";
  pyproject = true;

-  disabled = pythonOlder "3.8.1";
-
  src = fetchFromGitHub {
    owner = "your-tools";
    repo = "python-cli-ui";
--- a/pkgs/development/python-modules/django-configurations/default.nix
+++ b/pkgs/development/python-modules/django-configurations/default.nix
@@ -7,9 +7,7 @@
  django,
  django-cache-url,
  fetchPypi,
-  importlib-metadata,
  mock,
-  pythonOlder,
  setuptools-scm,
 }:

@@ -25,7 +23,7 @@ buildPythonPackage rec {

  buildInputs = [ setuptools-scm ];

-  propagatedBuildInputs = [ django ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  propagatedBuildInputs = [ django ];

  nativeCheckInputs = [
    mock
--- a/pkgs/development/python-modules/django/4.nix
+++ b/pkgs/development/python-modules/django/4.nix
@@ -5,7 +5,6 @@
  fetchFromGitHub,
  fetchpatch,
  pythonAtLeast,
-  pythonOlder,
  replaceVars,

  # build
@@ -48,7 +47,7 @@ buildPythonPackage rec {
  version = "4.2.27";
  pyproject = true;

-  disabled = pythonOlder "3.8" || pythonAtLeast "3.13";
+  disabled = pythonAtLeast "3.13";

  src = fetchFromGitHub {
    owner = "django";
--- a/pkgs/development/python-modules/dufte/default.nix
+++ b/pkgs/development/python-modules/dufte/default.nix
@@ -2,8 +2,6 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
-  pythonOlder,
-  importlib-metadata,
  matplotlib,
  numpy,
  pytestCheckHook,
@@ -27,8 +25,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    matplotlib
    numpy
-  ]
-  ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  ];

  preCheck = ''
    export HOME=$(mktemp -d)
--- a/pkgs/development/python-modules/evaluate/default.nix
+++ b/pkgs/development/python-modules/evaluate/default.nix
@@ -2,12 +2,10 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
-  pythonOlder,
  datasets,
  dill,
  fsspec,
  huggingface-hub,
-  importlib-metadata,
  multiprocess,
  numpy,
  packaging,
@@ -44,8 +42,7 @@ buildPythonPackage rec {
    fsspec
    huggingface-hub
    packaging
-  ]
-  ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  ];

  # most tests require internet access.
  doCheck = false;
--- a/pkgs/development/python-modules/exdown/default.nix
+++ b/pkgs/development/python-modules/exdown/default.nix
@@ -3,9 +3,7 @@
  buildPythonPackage,
  isPy27,
  fetchPypi,
-  pythonOlder,
  setuptools,
-  importlib-metadata,
  pytestCheckHook,
 }:

@@ -24,8 +22,6 @@ buildPythonPackage rec {

  nativeBuildInputs = [ setuptools ];

-  propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
-
  nativeCheckInputs = [ pytestCheckHook ];

  pythonImportsCheck = [ "exdown" ];
--- a/pkgs/development/python-modules/fake-useragent/default.nix
+++ b/pkgs/development/python-modules/fake-useragent/default.nix
@@ -2,7 +2,6 @@
  lib,
  fetchFromGitHub,
  buildPythonPackage,
-  importlib-metadata,
  importlib-resources,
  setuptools,
  pythonOlder,
@@ -27,9 +26,7 @@ buildPythonPackage rec {

  build-system = [ setuptools ];

-  dependencies =
-    lib.optionals (pythonOlder "3.10") [ importlib-resources ]
-    ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  dependencies = lib.optionals (pythonOlder "3.10") [ importlib-resources ];

  nativeCheckInputs = [ pytestCheckHook ];

--- a/pkgs/development/python-modules/ffmpy/default.nix
+++ b/pkgs/development/python-modules/ffmpy/default.nix
@@ -3,8 +3,6 @@
  stdenv,
  buildPythonPackage,
  fetchFromGitHub,
-  fetchpatch2,
-  pythonOlder,
  uv-build,
  pytestCheckHook,
  go,
@@ -16,8 +14,6 @@ buildPythonPackage rec {
  version = "0.6.2";
  pyproject = true;

-  disabled = pythonOlder "3.8.1";
-
  src = fetchFromGitHub {
    owner = "Ch00k";
    repo = "ffmpy";
--- a/pkgs/development/python-modules/flask-mongoengine/default.nix
+++ b/pkgs/development/python-modules/flask-mongoengine/default.nix
@@ -7,10 +7,8 @@
  flask-wtf,
  markupsafe,
  mongoengine,
-  pythonOlder,
  setuptools,
  setuptools-scm,
-  typing-extensions,
  wtforms,
 }:

@@ -38,8 +36,7 @@ buildPythonPackage rec {
    flask
    flask-wtf
    mongoengine
-  ]
-  ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ];

  optional-dependencies = {
    wtf = [
--- a/pkgs/development/python-modules/gentools/default.nix
+++ b/pkgs/development/python-modules/gentools/default.nix
@@ -2,10 +2,8 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
-  importlib-metadata,
  poetry-core,
  pytestCheckHook,
-  pythonOlder,
 }:

 buildPythonPackage rec {
@@ -22,8 +20,6 @@ buildPythonPackage rec {

  nativeBuildInputs = [ poetry-core ];

-  propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
-
  nativeCheckInputs = [ pytestCheckHook ];

  pythonImportsCheck = [ "gentools" ];
--- a/pkgs/development/python-modules/gptcache/default.nix
+++ b/pkgs/development/python-modules/gptcache/default.nix
@@ -4,7 +4,6 @@
  fetchFromGitHub,
  cachetools,
  numpy,
-  pythonOlder,
  redis,
  redis-om,
  requests,
@@ -15,8 +14,6 @@ buildPythonPackage rec {
  version = "0.1.44";
  format = "setuptools";

-  disabled = pythonOlder "3.8.1";
-
  src = fetchFromGitHub {
    owner = "zilliztech";
    repo = "GPTCache";
--- a/pkgs/development/python-modules/graphql-relay/default.nix
+++ b/pkgs/development/python-modules/graphql-relay/default.nix
@@ -3,14 +3,11 @@
  buildPythonPackage,
  fetchPypi,

-  pythonOlder,
-
  # build
  poetry-core,

  # runtime
  graphql-core,
-  typing-extensions,

  # tests
  pytest-asyncio,
@@ -41,7 +38,7 @@ buildPythonPackage rec {

  nativeBuildInputs = [ poetry-core ];

-  propagatedBuildInputs = [ graphql-core ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  propagatedBuildInputs = [ graphql-core ];

  nativeCheckInputs = [
    pytest-asyncio
--- a/pkgs/development/python-modules/growattserver/default.nix
+++ b/pkgs/development/python-modules/growattserver/default.nix
@@ -6,16 +6,16 @@
  setuptools,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "growattserver";
-  version = "1.7.1";
+  version = "1.8.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "indykoning";
    repo = "PyPi_GrowattServer";
-    tag = version;
-    hash = "sha256-rob2+uXuBD5Gf05rNFFEW210JxrTbWN7knk9Tnz7wOE=";
+    tag = finalAttrs.version;
+    hash = "sha256-2Jgz/wN0k6ni+4PbQwfDg3uMvYxv5N3BVgdARHqQ0Yc=";
  };

  build-system = [ setuptools ];
@@ -30,8 +30,8 @@ buildPythonPackage rec {
  meta = {
    description = "Python package to retrieve information from Growatt units";
    homepage = "https://github.com/indykoning/PyPi_GrowattServer";
-    changelog = "https://github.com/indykoning/PyPi_GrowattServer/releases/tag/${src.tag}";
+    changelog = "https://github.com/indykoning/PyPi_GrowattServer/releases/tag/${finalAttrs.src.tag}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ fab ];
  };
-}
+})
--- a/Show More
+++ b/Show More