Merge staging-next into staging

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
 
 - 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.
+
 - The `networking.wireless` module has been security hardened: the `wpa_supplicant` daemon now runs under an unprivileged user with restricted access to the system.
 
   As part of these changes, `/etc/wpa_supplicant.conf` has been deprecated: the NixOS-generated configuration file is now linked to `/etc/wpa_supplicant/nixos.conf` and `/etc/wpa_supplicant/imperative.conf` has been added for imperatively configuring `wpa_supplicant` or when using [allowAuxiliaryImperativeNetworks](#opt-networking.wireless.allowAuxiliaryImperativeNetworks).

nixos/modules/programs/yazi.nix

@@ -27,23 +27,17 @@ in
       type =
         with lib.types;
         submodule {
-          options = (
-            lib.listToAttrs (
-              map (
-                name:
-                lib.nameValuePair name (
-                  lib.mkOption {
-                    inherit (settingsFormat) type;
-                    default = { };
-                    description = ''
-                      Configuration included in `${name}.toml`.
+          options = lib.genAttrs files (
+            name:
+            lib.mkOption {
+              inherit (settingsFormat) type;
+              default = { };
+              description = ''
+                Configuration included in `${name}.toml`.
 
-                      See <https://yazi-rs.github.io/docs/configuration/${name}/> for documentation.
-                    '';
-                  }
-                )
-              ) files
-            )
+                See <https://yazi-rs.github.io/docs/configuration/${name}/> for documentation.
+              '';
+            }
           );
         };
       default = { };

nixos/modules/services/desktop-managers/gnome.nix

@@ -30,7 +30,7 @@ let
 
   defaultFavoriteAppsOverride = ''
     [org.gnome.shell]
-    favorite-apps=[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Nautilus.desktop' ]
+    favorite-apps=[ 'org.gnome.Epiphany.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.TextEditor.desktop', 'org.gnome.Nautilus.desktop' ]
   '';
 
   nixos-background-light = pkgs.nixos-artwork.wallpapers.simple-blue;
@@ -75,6 +75,8 @@ let
   notExcluded =
     pkg: mkDefault (utils.disablePackageByName pkg config.environment.gnome.excludePackages);
 
+  removeExcluded =
+    pkgList: utils.removePackagesByName pkgList config.environment.gnome.excludePackages;
 in
 
 {
@@ -416,9 +418,9 @@ in
 
       services.orca.enable = notExcluded pkgs.orca;
 
-      fonts.packages = utils.removePackagesByName [
+      fonts.packages = removeExcluded [
         pkgs.adwaita-fonts
-      ] config.environment.gnome.excludePackages;
+      ];
 
       # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-48/elements/core/meta-gnome-core-shell.bst
       environment.systemPackages =
@@ -442,13 +444,12 @@ in
             pkgs.xdg-user-dirs-gtk # Used to create the default bookmarks
           ];
         in
-        mandatoryPackages
-        ++ utils.removePackagesByName optionalPackages config.environment.gnome.excludePackages;
+        mandatoryPackages ++ removeExcluded optionalPackages;
     })
 
     # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/gnome-48/elements/core/meta-gnome-core-apps.bst
     (lib.mkIf serviceCfg.core-apps.enable {
-      environment.systemPackages = utils.removePackagesByName [
+      environment.systemPackages = removeExcluded [
         pkgs.baobab
         pkgs.decibels
         pkgs.epiphany
@@ -473,13 +474,12 @@ in
         pkgs.simple-scan
         pkgs.snapshot
         pkgs.yelp
-      ] config.environment.gnome.excludePackages;
+      ];
 
       # Enable default program modules
       # Since some of these have a corresponding package, we only
       # enable that program module if the package hasn't been excluded
       # through `environment.gnome.excludePackages`
-      programs.geary.enable = notExcluded pkgs.geary;
       programs.gnome-disks.enable = notExcluded pkgs.gnome-disk-utility;
       programs.seahorse.enable = notExcluded pkgs.seahorse;
       services.gnome.sushi.enable = notExcluded pkgs.sushi;
@@ -507,7 +507,7 @@ in
     })
 
     (lib.mkIf serviceCfg.games.enable {
-      environment.systemPackages = utils.removePackagesByName [
+      environment.systemPackages = removeExcluded [
         pkgs.aisleriot
         pkgs.atomix
         pkgs.five-or-more
@@ -528,12 +528,12 @@ in
         pkgs.quadrapassel
         pkgs.swell-foop
         pkgs.tali
-      ] config.environment.gnome.excludePackages;
+      ];
     })
 
     # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/gnome-48/elements/core/meta-gnome-core-developer-tools.bst
     (lib.mkIf serviceCfg.core-developer-tools.enable {
-      environment.systemPackages = utils.removePackagesByName [
+      environment.systemPackages = removeExcluded [
         pkgs.dconf-editor
         pkgs.devhelp
         pkgs.d-spy
@@ -544,7 +544,7 @@ in
         # https://github.com/NixOS/nixpkgs/issues/60908
         # pkgs.gnome-boxes
         pkgs.sysprof
-      ] config.environment.gnome.excludePackages;
+      ];
 
       services.sysprof.enable = notExcluded pkgs.sysprof;
     })

pkgs/applications/emulators/libretro/cores/parallel-n64.nix

@@ -18,6 +18,14 @@ mkLibretroCore {
     hash = "sha256-Th8VqENewfTeRTH+lONN7ZTMLQ0G6901q6ZBNMgepL4=";
   };
 
+  patches = [
+    # Fix build with gcc15
+    # Upstream considers this core legacy (for "potato PC") and won't fix.
+    # See: https://github.com/libretro/parallel-n64/issues/797
+    #   /nix/store/...-glibc-2.40-66-dev/include/bits/mathcalls-narrow.h:36:20: error: conflicting types for 'fsqrt'; have 'float(double)'
+    ./patches/parallel-n64-gcc15.patch
+  ];
+
   extraBuildInputs = [
     libGLU
     libGL

pkgs/applications/emulators/libretro/cores/patches/parallel-n64-gcc15.patch

@@ -0,0 +1,62 @@
+From 3a891c0450c4968afbe76c594c22347354bd8834 Mon Sep 17 00:00:00 2001
+From: Moraxyc <i@qaq.li>
+Date: Sat, 3 Jan 2026 13:41:55 +0800
+Subject: [PATCH] Rename fsqrt to _fsqrt to avoid conflict
+
+---
+ mupen64plus-core/src/r4300/hacktarux_dynarec/assemble.h   | 2 +-
+ .../src/r4300/hacktarux_dynarec/hacktarux_dynarec.c       | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/mupen64plus-core/src/r4300/hacktarux_dynarec/assemble.h b/mupen64plus-core/src/r4300/hacktarux_dynarec/assemble.h
+index 8161292..e256dd9 100644
+--- a/mupen64plus-core/src/r4300/hacktarux_dynarec/assemble.h
++++ b/mupen64plus-core/src/r4300/hacktarux_dynarec/assemble.h
+@@ -1650,7 +1650,7 @@ static INLINE void fchs(void)
+ }
+ 
+ 
+-static INLINE void fsqrt(void)
++static INLINE void _fsqrt(void)
+ {
+    put8(0xD9);
+    put8(0xFA);
+diff --git a/mupen64plus-core/src/r4300/hacktarux_dynarec/hacktarux_dynarec.c b/mupen64plus-core/src/r4300/hacktarux_dynarec/hacktarux_dynarec.c
+index 89fb982..2fc70d1 100644
+--- a/mupen64plus-core/src/r4300/hacktarux_dynarec/hacktarux_dynarec.c
++++ b/mupen64plus-core/src/r4300/hacktarux_dynarec/hacktarux_dynarec.c
+@@ -6317,13 +6317,13 @@ void gensqrt_d(void)
+ #ifdef __x86_64__
+    mov_xreg64_m64rel(RAX, (uint64_t *)(&reg_cop1_double[dst->f.cf.fs]));
+    fld_preg64_qword(RAX);
+-   fsqrt();
++   _fsqrt();
+    mov_xreg64_m64rel(RAX, (uint64_t *)(&reg_cop1_double[dst->f.cf.fd]));
+    fstp_preg64_qword(RAX);
+ #else
+    mov_eax_memoffs32((unsigned int *)(&reg_cop1_double[dst->f.cf.fs]));
+    fld_preg32_qword(EAX);
+-   fsqrt();
++   _fsqrt();
+    mov_eax_memoffs32((unsigned int *)(&reg_cop1_double[dst->f.cf.fd]));
+    fstp_preg32_qword(EAX);
+ #endif
+@@ -7301,13 +7301,13 @@ void gensqrt_s(void)
+ #ifdef __x86_64__
+    mov_xreg64_m64rel(RAX, (uint64_t *)(&reg_cop1_simple[dst->f.cf.fs]));
+    fld_preg64_dword(RAX);
+-   fsqrt();
++   _fsqrt();
+    mov_xreg64_m64rel(RAX, (uint64_t *)(&reg_cop1_simple[dst->f.cf.fd]));
+    fstp_preg64_dword(RAX);
+ #else
+    mov_eax_memoffs32((unsigned int *)(&reg_cop1_simple[dst->f.cf.fs]));
+    fld_preg32_dword(EAX);
+-   fsqrt();
++   _fsqrt();
+    mov_eax_memoffs32((unsigned int *)(&reg_cop1_simple[dst->f.cf.fd]));
+    fstp_preg32_dword(EAX);
+ #endif
+-- 
+2.52.0
+

pkgs/by-name/bl/blender/package.nix

@@ -23,7 +23,6 @@
   gettext,
   glew,
   gmp,
-  hipSupport ? false,
   jackaudioSupport ? false,
   jemalloc,
   lib,
@@ -68,7 +67,8 @@
   potrace,
   pugixml,
   python311Packages, # must use python3Packages instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340
-  rocmPackages, # comes with a significantly larger closure size
+  rocmPackages,
+  rocmSupport ? config.rocmSupport,
   rubberband,
   runCommand,
   shaderc,
@@ -95,8 +95,9 @@ let
     (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin;
   vulkanSupport = !stdenv.hostPlatform.isDarwin;
 
-  python3 = python311Packages.python;
-  pyPkgsOpenusd = python311Packages.openusd.override (old: {
+  python3Packages = python311Packages;
+  python3 = python3Packages.python;
+  pyPkgsOpenusd = python3Packages.openusd.override (old: {
     opensubdiv = old.opensubdiv.override { inherit cudaSupport; };
     withOsl = false;
   });
@@ -131,14 +132,14 @@ stdenv'.mkDerivation (finalAttrs: {
       substituteInPlace source/creator/CMakeLists.txt \
         --replace-fail '${"$"}{LIBDIR}/python' \
                   '${python3}' \
-        --replace-fail '${"$"}{LIBDIR}/materialx/' '${python311Packages.materialx}/'
+        --replace-fail '${"$"}{LIBDIR}/materialx/' '${python3Packages.materialx}/'
       substituteInPlace build_files/cmake/platform/platform_apple.cmake \
         --replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlicommon-static.a' \
                   '${lib.getLib brotli}/lib/libbrotlicommon.dylib' \
         --replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlidec-static.a' \
                   '${lib.getLib brotli}/lib/libbrotlidec.dylib'
     '')
-    + (lib.optionalString hipSupport ''
+    + (lib.optionalString rocmSupport ''
       substituteInPlace extern/hipew/src/hipew.c --replace-fail '"/opt/rocm/hip/lib/libamdhip64.so.${lib.versions.major rocmPackages.clr.version}"' '"${rocmPackages.clr}/lib/libamdhip64.so"'
       substituteInPlace extern/hipew/src/hipew.c --replace-fail '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"'
       substituteInPlace extern/hipew/src/hiprtew.cc --replace-fail '"/opt/rocm/lib/libhiprt64.so"' '"${rocmPackages.hiprt}/lib/libhiprt64.so"'
@@ -149,18 +150,18 @@ stdenv'.mkDerivation (finalAttrs: {
   cmakeFlags = [
     "-C../build_files/cmake/config/blender_release.cmake"
 
-    (lib.cmakeFeature "MaterialX_DIR" "${python311Packages.materialx}/lib/cmake/MaterialX")
+    (lib.cmakeFeature "MaterialX_DIR" "${python3Packages.materialx}/lib/cmake/MaterialX")
     (lib.cmakeFeature "PYTHON_INCLUDE_DIR" "${python3}/include/${python3.libPrefix}")
     (lib.cmakeFeature "PYTHON_LIBPATH" "${python3}/lib")
     (lib.cmakeFeature "PYTHON_LIBRARY" "${python3.libPrefix}")
-    (lib.cmakeFeature "PYTHON_NUMPY_INCLUDE_DIRS" "${python311Packages.numpy_1}/${python3.sitePackages}/numpy/core/include")
-    (lib.cmakeFeature "PYTHON_NUMPY_PATH" "${python311Packages.numpy_1}/${python3.sitePackages}")
+    (lib.cmakeFeature "PYTHON_NUMPY_INCLUDE_DIRS" "${python3Packages.numpy_1}/${python3.sitePackages}/numpy/core/include")
+    (lib.cmakeFeature "PYTHON_NUMPY_PATH" "${python3Packages.numpy_1}/${python3.sitePackages}")
     (lib.cmakeFeature "PYTHON_VERSION" "${python3.pythonVersion}")
 
     (lib.cmakeBool "WITH_BUILDINFO" false)
     (lib.cmakeBool "WITH_CPU_CHECK" false)
     (lib.cmakeBool "WITH_CYCLES_CUDA_BINARIES" cudaSupport)
-    (lib.cmakeBool "WITH_CYCLES_DEVICE_HIP" hipSupport)
+    (lib.cmakeBool "WITH_CYCLES_DEVICE_HIP" rocmSupport)
     (lib.cmakeBool "WITH_CYCLES_DEVICE_ONEAPI" false)
     (lib.cmakeBool "WITH_CYCLES_DEVICE_OPTIX" cudaSupport)
     (lib.cmakeBool "WITH_CYCLES_EMBREE" embreeSupport)
@@ -187,7 +188,7 @@ stdenv'.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "OPTIX_ROOT_DIR" "${optix}")
     (lib.cmakeBool "WITH_CYCLES_CUDA_BINARIES" true)
   ]
-  ++ lib.optionals hipSupport [
+  ++ lib.optionals rocmSupport [
     (lib.cmakeFeature "HIPRT_INCLUDE_DIR" "${rocmPackages.hiprt}/include")
     (lib.cmakeBool "WITH_CYCLES_DEVICE_HIPRT" true)
     (lib.cmakeBool "WITH_CYCLES_HIP_BINARIES" true)
@@ -221,7 +222,7 @@ stdenv'.mkDerivation (finalAttrs: {
     cmake
     llvmPackages.llvm.dev
     makeWrapper
-    python311Packages.wrapPython
+    python3Packages.wrapPython
   ]
   ++ lib.optionals cudaSupport [
     addDriverRunpath
@@ -263,13 +264,13 @@ stdenv'.mkDerivation (finalAttrs: {
     potrace
     pugixml
     python3
-    python311Packages.materialx
+    python3Packages.materialx
     rubberband
     zlib
     zstd
   ]
   ++ lib.optional embreeSupport embree
-  ++ lib.optional hipSupport rocmPackages.clr
+  ++ lib.optional rocmSupport rocmPackages.clr
   ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport; })
   ++ (
     if (!stdenv.hostPlatform.isDarwin) then
@@ -316,7 +317,7 @@ stdenv'.mkDerivation (finalAttrs: {
 
   pythonPath =
     let
-      ps = python311Packages;
+      ps = python3Packages;
     in
     [
       ps.materialx
@@ -362,13 +363,13 @@ stdenv'.mkDerivation (finalAttrs: {
 
   passthru = {
     python = python3;
-    pythonPackages = python311Packages;
+    pythonPackages = python3Packages;
 
     withPackages =
       f:
       (callPackage ./wrapper.nix { }).override {
         blender = finalAttrs.finalPackage;
-        extraModules = (f python311Packages);
+        extraModules = (f python3Packages);
       };
 
     tests = {

pkgs/by-name/ca/cantus/package.nix

@@ -12,16 +12,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "cantus";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "CodedNil";
     repo = "cantus";
     tag = version;
-    hash = "sha256-Mox8OGJFbQd3dy/I1O6OjqDa4FAFcZWiS+zOuTwV6js=";
+    hash = "sha256-U8a0LcNlaiLdba4z2LUBQkwrOrE/7S9OIQ4JJw1m4Ck=";
   };
 
-  cargoHash = "sha256-9+2+PkUA+s6v/Mrpo8M1lLemxClVONbbeHtric2z/Jw=";
+  cargoHash = "sha256-mpjcX5xuhsqr3Jxva8Oy1tQvM+29N3LHvym76Bs0uhk=";
 
   nativeBuildInputs = [
     pkg-config

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

@@ -11,16 +11,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "clouddrive2";
-  version = "0.9.18";
+  version = "0.9.21";
 
   src = fetchurl {
     url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
     hash =
       {
-        x86_64-linux = "sha256-FTddo953oYhAwSXTiLWIN2y3BV6Q+cy8sE6dNJKghiU=";
-        aarch64-linux = "sha256-j23/P9CDb+0+gheMMbxE7NyHmnhHmPRWLc9SvD27pRs=";
-        x86_64-darwin = "sha256-YiCkYrDldm5JcAheTCUC/gg1ZgMxMue/bcz1gEjXdy0=";
-        aarch64-darwin = "sha256-CbzA38bkavPGJko0x/JqBxkx5CP7wM6iDEB2aejZrN4=";
+        x86_64-linux = "sha256-Hvu6+5bDrq1qnxc3bCWnERd4CTzaGk8NlO4F75AKNR8=";
+        aarch64-linux = "sha256-2JAGvpwkEzmcElwojZpcujzTpoo+watUR1Xxog6mZRs=";
+        x86_64-darwin = "sha256-9/2x2zen361UxX1yw7c5xlRmLLdwao0yt0j9/By6aJc=";
+        aarch64-darwin = "sha256-lk6QpXPo7bZo4VoVjMxfo4ePZaFww2SJmLp2cIQiJk0=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
   };

pkgs/by-name/da/davinci-resolve/package.nix

@@ -34,7 +34,7 @@ let
   davinci = (
     stdenv.mkDerivation rec {
       pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}";
-      version = "20.3";
+      version = "20.3.1";
 
       nativeBuildInputs = [
         appimageTools.appimage-exec
@@ -56,9 +56,9 @@ let
             outputHashAlgo = "sha256";
             outputHash =
               if studioVariant then
-                "sha256-NaWnlFna/NaYNb4aaO++598mlpMsPFGL6nlXREBSAlI="
+                "sha256-JaP0O+bSc9wd2YTqRwRQo35kdDkq//5WMb+7MtC9S/A="
               else
-                "sha256-hVliyg6BBkY83INF7ZbO8myXX+FjC4RwgipfOH5cFAs=";
+                "sha256-3mZWP58UZYS4U1f9M3TZ9wyto0cGy+KdB+GIJlvCVng=";
 
             impureEnvVars = lib.fetchers.proxyImpureEnvVars;
 

pkgs/by-name/ea/easytier/package.nix

@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "easytier";
-  version = "2.4.5";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "EasyTier";
     repo = "EasyTier";
     tag = "v${version}";
-    hash = "sha256-vGQHrpImPMF44LXVnKRpj47Nr534wTlVZJiBDm4GkGs=";
+    hash = "sha256-XnEfxWDKUTQFWYKtqetI7sLbOmGqw2BqpU5by1ajZGA=";
   };
 
-  cargoHash = "sha256-B9GkvSXyZXTBsnV7wbipjdZ0EkVrL/aw8Ff7uUvfKPo=";
+  cargoHash = "sha256-ueDulcv7DnwvMWYayc3hzBVtldX6gg7fP7YQpdUPq7c=";
 
   nativeBuildInputs = [
     protobuf

pkgs/by-name/en/ensemble-chorus/add-missing-cstdint-includes.patch

@@ -0,0 +1,25 @@
+diff --git a/sources/core/dsp.h b/sources/core/dsp.h
+index 5e3b1c6..b1a4f2d 100644
+--- a/sources/core/dsp.h
++++ b/sources/core/dsp.h
+@@ -5,6 +5,7 @@
+ #pragma once
+
+ #include <jsl/dynarray>
++#include <cstdint>
+
+ namespace dsp {
+
+ uint32_t fastrandom(uint32_t *pseed);
+
+diff --git a/sources/fl/main_controller.h b/sources/fl/main_controller.h
+index 9a7c6b0..e3d4f1a 100644
+--- a/sources/fl/main_controller.h
++++ b/sources/fl/main_controller.h
+@@ -6,6 +6,7 @@
+ 
+ #pragma once
+ #include <memory>
++#include <cstdint>
+ class Message_Queue;
+ struct Basic_Message;

pkgs/by-name/en/ensemble-chorus/package.nix

@@ -29,6 +29,7 @@ stdenv.mkDerivation {
   patches = [
     # fix compile error regarding packed attribute in 3rd party juice library
     ./juice-cxx-packing-fix.diff
+    ./add-missing-cstdint-includes.patch
   ];
 
   nativeBuildInputs = [

pkgs/by-name/en/enzyme/package.nix

@@ -7,13 +7,13 @@
 }:
 llvmPackages.stdenv.mkDerivation rec {
   pname = "enzyme";
-  version = "0.0.223";
+  version = "0.0.234";
 
   src = fetchFromGitHub {
     owner = "EnzymeAD";
     repo = "Enzyme";
     rev = "v${version}";
-    hash = "sha256-J11NVgBT8wOrSEP7lQZMGu5Th0VFrWTzEs0tz8otgcc=";
+    hash = "sha256-FK1/Ezld9U+xWuQ92ekOighDFUJQ0WOweSHHIq+ZyvA=";
   };
 
   postPatch = ''

pkgs/by-name/gu/gurk-rs/package.nix

@@ -1,5 +1,5 @@
 {
-  stdenv,
+  stdenvNoCC,
   lib,
   protobuf,
   rustPlatform,
@@ -10,17 +10,16 @@
   writableTmpDirAsHomeHook,
   versionCheckHook,
   nix-update-script,
-  gurk-rs,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gurk-rs";
   version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "boxdot";
     repo = "gurk-rs";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-1vnyzKissOciLopWzWN2kmraFevYW/w32KVmP8qgUM4=";
   };
 
@@ -38,24 +37,19 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ];
 
   env = {
-    NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
-      "-framework"
-      "AppKit"
-    ];
+    NIX_LDFLAGS = lib.optionalString (
+      with stdenvNoCC.hostPlatform; (isDarwin && isx86_64)
+    ) "-framework AppKit";
     OPENSSL_NO_VENDOR = true;
+    PROTOC = "${lib.getExe pkgsBuildHost.protobuf}";
   };
 
-  PROTOC = "${pkgsBuildHost.protobuf}/bin/protoc";
-
   useNextest = true;
 
   nativeCheckInputs = [ writableTmpDirAsHomeHook ];
 
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
-  versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
 
   passthru.updateScript = nix-update-script { };
 
@@ -66,4 +60,4 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ devhell ];
   };
-}
+})

pkgs/by-name/ho/honggfuzz/package.nix

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   makeWrapper,
   clang,
   llvm,
@@ -22,6 +23,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-/ra6g0qjjC8Lo8/n2XEbwnZ95yDHcGhYd5+TTvQ6FAc=";
   };
 
+  patches = [
+    # [PATCH] mangle: support gcc-15 with __attribute__((nonstring))
+    (fetchpatch2 {
+      url = "https://github.com/google/honggfuzz/commit/4cfa62f4fdb56e3027c1cb3aecf04812e786f0fd.patch?full_index=1";
+      hash = "sha256-79/GZfqTH1o/21P7At5ZPmvcCSYWAsVakSv5dNCT+XI=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace hfuzz_cc/hfuzz-cc.c \
       --replace '"clang' '"${clang}/bin/clang'

pkgs/by-name/ht/httptunnel/package.nix

@@ -16,6 +16,10 @@ stdenv.mkDerivation {
     hash = "sha256-fUaVHE3nxq3fU7DYCvaQTOoMzax/qFH8cMegFLLybNk=";
   };
 
+  # httptunnel makes liberal use of old C features, just selecting an old version
+  # is easier than patching around language updates.
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
   nativeBuildInputs = [
     autoreconfHook
   ];

pkgs/by-name/li/libgdstk/package.nix

@@ -15,14 +15,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libgdstk";
-  version = "0.9.61";
+  version = "0.9.62";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "heitzmann";
     repo = "gdstk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-soU+6EbyOkHGvVq230twiRzywOskhkkXFr5akBpvgBw=";
+    hash = "sha256-NHz9PQMmOnJt09FDwLzy5t9hVbZrJ6Lf19iPYOB5B2A=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/li/libshumate/package.nix

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   gi-docgen,
   meson,
   ninja,
@@ -37,6 +38,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-2q34twATQ4jH6TPgtiNYaqp/L76LOmJZOHUTMDuYduY=";
   };
 
+  patches = [
+    (fetchpatch {
+      # Required for cross-compiled libshumate to get $dev/share/vala/vapi/shumate-1.0.{deps,vapi}
+      # https://gitlab.gnome.org/GNOME/libshumate/-/merge_requests/263
+      url = "https://gitlab.gnome.org/GNOME/libshumate/-/commit/8a8a5013ed69f443b84500b4f745079025863a32.patch";
+      name = "meson-use-find_program-instead-of-dependency-for-vapigen";
+      hash = "sha256-nYLUMLcghnWU/hlCWOHMmFIUdDa7UkX4TP7C4ftZVJM=";
+    })
+  ];
+
   depsBuildBuild = [
     # required to find native gi-docgen when cross compiling
     pkg-config
@@ -89,6 +100,8 @@ stdenv.mkDerivation (finalAttrs: {
     moveToOutput share/doc/libshumate-1.0 "$devdoc"
   '';
 
+  strictDeps = true;
+
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "libshumate";

pkgs/by-name/me/meld/package.nix

@@ -22,13 +22,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "meld";
-  version = "3.23.0";
+  version = "3.23.1";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/meld/${lib.versions.majorMinor version}/meld-${version}.tar.xz";
-    hash = "sha256-mDwqQkDgJaIQnHc4GYcQ6dawY8kQsEgzLRRpDPU4wqY=";
+    hash = "sha256-c/gnkkZjx8a0UadMg4UwTZn+qhPIH04KFx2ll8aENXQ=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/mo/modrinth-app/package.nix

@@ -24,7 +24,7 @@
   pipewire,
   symlinkJoin,
   udev,
-  wrapGAppsHook4,
+  wrapGAppsHook3,
   xorg,
 }:
 
@@ -38,7 +38,7 @@ symlinkJoin {
 
   nativeBuildInputs = [
     glib
-    wrapGAppsHook4
+    wrapGAppsHook3
   ];
 
   buildInputs = [

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

@@ -29,11 +29,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "netatalk";
-  version = "4.3.2";
+  version = "4.4.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-KXe0/RExgvDMGDM3uiPVcB+yvk4N/Ox+5XW01zpzjTo=";
+    hash = "sha256-GMoy3Gwl57o1KFlLeEN58BOIj6mED/xHjNH+9VUTglw=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ni/nix-top/package.nix

@@ -23,13 +23,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "nix-top";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "jerith666";
     repo = "nix-top";
     rev = "v${version}";
-    hash = "sha256-w/TKzbZmMt4CX2KnLwPvR1ydp5NNlp9nNx78jJvhp54=";
+    hash = "sha256-dpH1qfAHt8kDEG1QMFcD67rOhDsWZuaw3WSUZdPx3oQ=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/by-name/nx/nxv/package.nix

@@ -0,0 +1,42 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "nxv";
+  version = "0.1.2";
+
+  src = fetchFromGitHub {
+    owner = "jamesbrink";
+    repo = "nxv";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-tKjb+B65ZrLIJ7aDYGC3kj71iAXoFmAaj5I8+o4EzlM=";
+    fetchSubmodules = true;
+  };
+
+  cargoHash = "sha256-RW3WrG1A/J1xuWWcHOARG6EEmSWWnDeycAtbppY52OI=";
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Find any version of any Nix package instantly";
+    longDescription = ''
+      nxv indexes the entire nixpkgs git history to help you discover
+      when packages were added, which versions existed, and the exact
+      commit to use with `nix shell nixpkgs/<commit>#package`.
+    '';
+    homepage = "https://nxv.urandom.io";
+    changelog = "https://github.com/jamesbrink/nxv/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ yiyu ];
+    mainProgram = "nxv";
+  };
+})

pkgs/by-name/pk/pkgsite/package.nix

@@ -7,16 +7,16 @@
 
 buildGoModule {
   pname = "pkgsite";
-  version = "0-unstable-2025-12-23";
+  version = "0-unstable-2026-01-01";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "1a3bd3c788fea11057a8e696fd274c4c3f3e952c";
-    hash = "sha256-GnjzJhmH9mOBdpc+r3Hco0KFsTp4LMkbTn/oMBthemQ=";
+    rev = "3a74f05acd7522e74e16a35bdf80301dae44cfc9";
+    hash = "sha256-1YTCjaPf6t0Tn/u1ERBxoHeXAIMO4wsPIcODBPJjrlM=";
   };
 
-  vendorHash = "sha256-6wgJNDzUzSCkwzjqGwzpa63+0HoN5PapKxMBFBuu16M=";
+  vendorHash = "sha256-rruIjtXtFZ0MOJkWx4n+7apKGv4Pq6GrOWoQ3o+8KFs=";
 
   subPackages = [ "cmd/pkgsite" ];
 

pkgs/by-name/ra/railway/package.nix

@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "railway";
-  version = "4.12.0";
+  version = "4.16.1";
 
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-ViafZYAQCEfNJZpJgWVHG55+Ylkl3xndqT+zuNUDF04=";
+    hash = "sha256-ylmSsBGmYFLQExwFtI7gFwGmZeuIJy+QXQeCRdL669Y=";
   };
 
-  cargoHash = "sha256-CaB6sobEw+Z/R/zjGNonVhIiuX676P/4SA6nwoWWA7g=";
+  cargoHash = "sha256-Fk+2QRNJr2zFIKHOuEjoZbnwloGPCXP0Ilc26iKNI64=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/si/siyuan/package.nix

@@ -36,20 +36,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "siyuan";
-  version = "3.5.1";
+  version = "3.5.2";
 
   src = fetchFromGitHub {
     owner = "siyuan-note";
     repo = "siyuan";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-7fKvSK3gatEdIHAZuOzL6LdzLz4k97G+ZKpQh39yhbs=";
+    hash = "sha256-Rimb2OfohjTfaqVCZcoGDxpEfXvyp2CLqwqOjqAJjJg=";
   };
 
   kernel = buildGoModule {
     name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/kernel";
-    vendorHash = "sha256-SqPegOTdjd8HrnXNIRUMAbDhKKrFR+xWZUuqblrZ10c=";
+    vendorHash = "sha256-PNFIWH6IL/Zj/eK/5M8ACICOeQi4WEBIh1aY4eyfkn4=";
 
     patches = [
       (replaceVars ./set-pandoc-path.patch {
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     pnpm = pnpm_9;
     fetcherVersion = 1;
-    hash = "sha256-bteZZ9sgYLLvOPSVbqm9E0Hb5x1UdWMu8DtpQHGjbPU=";
+    hash = "sha256-JTfCU5kWR2tvVNFT+PAzqKe8tUk4+uwwVgo85VOntck=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/app";

pkgs/by-name/sr/srb2/package.nix

@@ -66,6 +66,11 @@ stdenv.mkDerivation (finalAttrs: {
     '';
   };
 
+  # Fix build with gcc15 (-std=gnu23)
+  # Note that upstream fixed compatibility with C23 as of commit 639b58c6d718452ef343a0bc927d043bed9e40d6,
+  # so it's likely this can be removed on the next version after 2.2.15.
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
   cmakeFlags = [
     "-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}/share/srb2"
     "-DGME_INCLUDE_DIR=${game-music-emu}/include"

pkgs/by-name/sr/srb2kart/package.nix

@@ -55,6 +55,9 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
   ];
 
+  # Fix build with gcc15 (-std=gnu23)
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
   cmakeFlags = [
     "-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}"
     "-DGME_INCLUDE_DIR=${game-music-emu}/include"

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

@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "VictoriaLogs";
-  version = "1.40.0";
+  version = "1.43.1";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaLogs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-liHpejO6wVr3YEyWhBwakWlDfly7mujVhQn7Sl5Z1kE=";
+    hash = "sha256-Tez8XTOLcuuOOVXt3cgOfRyXldP1b9ox9N9Ddm28E7I=";
   };
 
   vendorHash = null;

pkgs/by-name/vt/vte/package.nix

@@ -39,7 +39,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vte";
-  version = "0.82.2";
+  version = "0.82.3";
 
   outputs = [
     "out"
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz";
-    hash = "sha256-4Slar8RoKztVDxI13CZ5uqD3FXDY7VQ8ABwSg9UwvpE=";
+    hash = "sha256-bcYnj2/uMNB9GgPiujM1sepOjSlWzrWdhhlDEV2TCoU=";
   };
 
   patches = [
@@ -67,12 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://gitlab.gnome.org/GNOME/vte/-/commit/f672ed15a88dd3e25c33aa0a5ef6f6d291a6d5c7.patch";
       hash = "sha256-JdLDild5j7marvR5n2heW9YD00+bwzJIoxDlzO5r/6w=";
     })
-
-    (fetchpatch {
-      name = "qemu-backspace.patch";
-      url = "https://gitlab.gnome.org/GNOME/vte/-/commit/79d5fea437185e52a740130d5a276b83dfdcd558.patch";
-      hash = "sha256-28Cehw5uJuGG7maLGUl1TBwfIwuXpkLKSQ2lXauLlz0=";
-    })
   ];
 
   nativeBuildInputs = [

pkgs/by-name/ya/yazi-unwrapped/package.nix

@@ -8,17 +8,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "yazi";
-  version = "25.12.29";
+  version = "26.1.4";
 
   srcs = builtins.attrValues finalAttrs.passthru.srcs;
 
   sourceRoot = finalAttrs.passthru.srcs.code_src.name;
 
-  cargoHash = "sha256-AoUAAzbooKzaiMy9izYk7MSY/frfEuB9wMcdorXWIQw=";
+  cargoHash = "sha256-P1ijZsY1AYosWVyxdmDX1SN6KZsrlUqJ9cNfyVWV6mI=";
 
   env.YAZI_GEN_COMPLETIONS = true;
   env.VERGEN_GIT_SHA = "Nixpkgs";
-  env.VERGEN_BUILD_DATE = "2025-12-29";
+  env.VERGEN_BUILD_DATE = "2026-1-4";
 
   nativeBuildInputs = [ installShellFiles ];
   buildInputs = [ rust-jemalloc-sys ];
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       owner = "sxyazi";
       repo = "yazi";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-xOltBlD5nU8kMzh7GPoTtkDD8sEDAzTtaR3LRPDWRS0=";
+      hash = "sha256-dNDwlMM+k20c2Lnm+hqUvzu5l3Ip9GeP+nnj4WlDVdw=";
     };
 
     man_src = fetchFromGitHub {

pkgs/development/compilers/zig/hook.nix

@@ -4,6 +4,7 @@
   zig,
   stdenv,
   xcbuild,
+  globalBuildFlags ? [ "-Dcpu=baseline" ],
 }:
 
 makeSetupHook {
@@ -47,10 +48,7 @@ makeSetupHook {
           else
             "-Drelease-safe=true";
       in
-      [
-        "-Dcpu=baseline"
-        releaseType
-      ];
+      globalBuildFlags ++ [ releaseType ];
   };
 
   passthru = { inherit zig; };

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

@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytest-regressions,
+  pytest-timeout,
+  pytestCheckHook,
+  toml,
+  typing-extensions,
+  whey,
+}:
+
+buildPythonPackage rec {
+  pname = "coincidence";
+  version = "0.6.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "python-coincidence";
+    repo = "coincidence";
+    tag = "v${version}";
+    hash = "sha256-ktSuUzAwMych6Y2eJWMUfG1a3mGypg8L20f/105RFXc=";
+  };
+
+  build-system = [ whey ];
+
+  dependencies = [ typing-extensions ];
+
+  nativeCheckInputs = [
+    pytest-regressions
+    pytest-timeout
+    pytestCheckHook
+    toml
+  ];
+
+  pythonImportsCheck = [ "coincidence" ];
+
+  meta = {
+    description = "Helper functions for pytest";
+    homepage = "https://github.com/python-coincidence/coincidence";
+    changelog = "https://github.com/python-coincidence/coincidence/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}

pkgs/development/python-modules/dom-toml/default.nix

@@ -1,35 +1,51 @@
 {
-  buildPythonPackage,
-  fetchPypi,
   lib,
-  flit-core,
-  setuptools,
+  attrs,
+  buildPythonPackage,
   domdf-python-tools,
-  tomli,
+  fetchFromGitHub,
+  flit-core,
+  pytestCheckHook,
+  setuptools,
+  tomli-w,
 }:
+
 buildPythonPackage rec {
   pname = "dom-toml";
-  version = "2.1.0";
+  version = "2.2.0";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit version;
-    pname = "dom_toml";
-    hash = "sha256-XMDdEM4lZtNbwdlKbvFsBilx/wMYxvNwWADWHSB1raw=";
+  src = fetchFromGitHub {
+    owner = "domdfcoding";
+    repo = "dom_toml";
+    tag = "v${version}";
+    hash = "sha256-2kO/6spc+y/ltHf493JkSKI0vGuJu2a29fqsW/EDFxE=";
   };
 
   build-system = [ flit-core ];
 
-  nativeBuildInputs = [ setuptools ];
+  dependencies = [ domdf-python-tools ];
 
-  dependencies = [
-    domdf-python-tools
-    tomli
-  ];
+  optional-dependencies = {
+    all = [
+      attrs
+      tomli-w
+    ];
+    config = [
+      attrs
+      tomli-w
+    ];
+  };
+
+  # Circular dependency whey -> domdf-python-tools -> coincidence
+  doCheck = false;
+
+  pythonImportsCheck = [ "dom_toml" ];
 
   meta = {
     description = "Dom's tools for Tom's Obvious, Minimal Language";
     homepage = "https://github.com/domdfcoding/dom_toml";
+    changelog = "https://github.com/domdfcoding/dom_toml/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ tyberius-prime ];
   };

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

@@ -3,19 +3,17 @@
   buildPythonPackage,
   cython,
   fetchPypi,
-  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "murmurhash";
-  version = "1.0.13";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.6";
+  version = "1.0.15";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-c3JG1B7gD/dLB7C9HwiIvjBNIDzmaOZCyGqmTt4w+Lc=";
+    hash = "sha256-WOKye3hH+eKm7fELR6jI3XCkcF9F3Mt792rq2s9WugE=";
   };
 
   postPatch = ''
@@ -23,6 +21,8 @@ buildPythonPackage rec {
       --replace "'wheel>=0.32.0,<0.33.0'" ""
   '';
 
+  build-system = [ setuptools ];
+
   buildInputs = [ cython ];
 
   # No test
@@ -33,6 +33,7 @@ buildPythonPackage rec {
   meta = {
     description = "Cython bindings for MurmurHash2";
     homepage = "https://github.com/explosion/murmurhash";
+    changelog = "https://github.com/explosion/murmurhash/releases/tag/release-v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ aborsu ];
   };

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

@@ -43,14 +43,14 @@
 
 buildPythonPackage rec {
   pname = "nicegui";
-  version = "3.1.0";
+  version = "3.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zauberzeug";
     repo = "nicegui";
     tag = "v${version}";
-    hash = "sha256-otHPWOdTrlmf2VQUOhr3196MhN6ihk97y5sOEmnXuAw=";
+    hash = "sha256-fZAGqFQQFLFi5jWlQb1SAQnAFEtt2C07vNZXfyUHIa0=";
   };
 
   pythonRelaxDeps = [ "requests" ];

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

@@ -76,6 +76,7 @@ buildPythonPackage rec {
   meta = {
     description = "Simple Python wheel builder for simple projects";
     homepage = "https://github.com/repo-helper/whey";
+    changelog = "https://github.com/repo-helper/whey/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ tyberius-prime ];
   };

pkgs/development/rocm-modules/6/release-attrPaths.json

@@ -18,6 +18,7 @@
     "audiobookshelf",
     "babeldoc",
     "backgroundremover",
+    "blender",
     "btop",
     "btop-cuda",
     "c3d",

pkgs/top-level/aliases.nix

@@ -364,6 +364,7 @@ mapAliases {
   bitwarden_rs-sqlite = throw "'bitwarden_rs-sqlite' has been renamed to/replaced by 'vaultwarden-sqlite'"; # Converted to throw 2025-10-27
   bitwarden_rs-vault = throw "'bitwarden_rs-vault' has been renamed to/replaced by 'vaultwarden-vault'"; # Converted to throw 2025-10-27
   blas-reference = throw "blas-reference has been removed since it has been discontinued as free-standing package. It is now contained within lapack-reference."; # Added 2025-10-21
+  blender-hip = throw "blender-hip has been removed in favor of setting `config.rocmSupport = true` or using `pkgsRocm.blender`"; # Added 2026-01-04
   blender-with-packages = throw "blender-with-packages is deprecated in in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`"; # Converted to throw 2025-10-26
   blockbench-electron = throw "'blockbench-electron' has been renamed to/replaced by 'blockbench'"; # Converted to throw 2025-10-27
   bloomeetunes = throw "bloomeetunes is unmaintained and has been removed"; # Added 2025-08-26

pkgs/top-level/all-packages.nix

@@ -10343,8 +10343,6 @@ with pkgs;
     pinentry = pinentry-curses;
   };
 
-  blender-hip = blender.override { hipSupport = true; };
-
   blucontrol = callPackage ../applications/misc/blucontrol/wrapper.nix {
     inherit (haskellPackages) ghcWithPackages;
   };

pkgs/top-level/python-packages.nix

@@ -2892,6 +2892,8 @@ self: super: with self; {
 
   coinbase-advanced-py = callPackage ../development/python-modules/coinbase-advanced-py { };
 
+  coincidence = callPackage ../development/python-modules/coincidence { };
+
   coincurve = callPackage ../development/python-modules/coincurve { inherit (pkgs) secp256k1; };
 
   coinmetrics-api-client = callPackage ../development/python-modules/coinmetrics-api-client { };