Merge branch 'master' into staging-next

nixos/tests/forgejo.nix

···
       meta.maintainers = with lib.maintainers; [
         bendlas
         emilylange
+        tebriel
       ];
 
       nodes = {

pkgs/applications/editors/emacs/default.nix

···
       withPgtk = true;
     };
 
-    emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs;
+    emacs29-macport = callPackage (self.sources.emacs29-macport) (
+      inheritedArgs
+      // {
+        srcRepo = true;
+      }
+    );
   }
 )

pkgs/applications/editors/emacs/macport-noescape-noop/CoreFoundation/CFBase.h

···
+#if !defined(__COREFOUNDATION_CFBASE__)
+
+#include_next <CoreFoundation/CFBase.h>
+
+#undef CF_NOESCAPE
+#define CF_NOESCAPE
+
+#endif

pkgs/applications/editors/emacs/macport_noescape_noop.h

···
-#ifndef NOESCAPE_NOOP_H_
-#define NOESCAPE_NOOP_H_
-
-// First, do some work to get definitions for *_WIDTH. Normally, Emacs would
-// have these defined by headers in-tree, but clang's headers clash with those.
-// Due to how include paths work, we have to include clang headers if we want to
-// mess with CoreFoundation definitions.
-#pragma push_macro("__STDC_VERSION__")
-// Make the preprocessor think that we're on C2x. The macros we want are gated
-// on it.
-#undef __STDC_VERSION__
-#define __STDC_VERSION__ 202000L
-// Include limits.h first, as stdint.h includes it.
-#include <limits.h>
-
-// XX: clang's stdint.h is shy and won't give us its defs unless it thinks it's
-// in freestanding mode.
-#undef __STDC_HOSTED__
-#include <stdint.h>
-#define __STDC_HOSTED__ 1
-
-#pragma pop_macro("__STDC_VERSION__")
-
-// Now, pull in the header that defines CF_NOESCAPE.
-#include <CoreFoundation/CFBase.h>
-
-// Redefine CF_NOESCAPE as empty.
-#undef CF_NOESCAPE
-#define CF_NOESCAPE
-
-#endif // NOESCAPE_NOOP_H_

pkgs/applications/editors/emacs/make-emacs.nix

···
   libtiff,
   libwebp,
   libxml2,
-  llvmPackages_14,
   m17n_lib,
   mailcap,
   mailutils,
···
   ++ lib.optionals (stdenv.cc ? cc.lib.libgcc) [
     "${lib.getLib stdenv.cc.cc.lib.libgcc}/lib"
   ];
-
-  inherit (if variant == "macport" then llvmPackages_14.stdenv else stdenv)
-    mkDerivation
-    ;
 in
-mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname =
     pname
     + (
···
     // lib.optionalAttrs (variant == "macport") {
       # Fixes intermittent segfaults when compiled with LLVM >= 7.0.
       # See https://github.com/NixOS/nixpkgs/issues/127902
-      NIX_CFLAGS_COMPILE = "-include ${./macport_noescape_noop.h}";
+      NIX_CFLAGS_COMPILE = "-isystem ${./macport-noescape-noop}";
     };
 
   enableParallelBuilding = true;

pkgs/applications/virtualization/virt-top/default.nix

···
   libxml2,
   pkg-config,
   getopt,
+  gettext,
 }:
 
 stdenv.mkDerivation rec {
···
     ]
     ++ [ libxml2 ];
 
-  prePatch = ''
+  postPatch = ''
     substituteInPlace ocaml-dep.sh.in --replace-fail '#!/bin/bash' '#!${stdenv.shell}'
     substituteInPlace ocaml-link.sh.in --replace-fail '#!/bin/bash' '#!${stdenv.shell}'
+    substituteInPlace configure.ac --replace-fail 'AC_CONFIG_MACRO_DIR([m4])' 'AC_CONFIG_MACRO_DIRS([m4 ${gettext}/share/gettext/m4])'
   '';
 
   meta = {

pkgs/by-name/ar/arkade/package.nix

···
 
 buildGoModule rec {
   pname = "arkade";
-  version = "0.11.41";
+  version = "0.11.43";
 
   src = fetchFromGitHub {
     owner = "alexellis";
     repo = "arkade";
     rev = version;
-    hash = "sha256-N9NiAsggIJpYe2UfREp5l1srzm+P2LNIQhKJyT7w0rQ=";
+    hash = "sha256-zHKLk9dLZZiH7pH5FR6+uHP9ZteMsAFyrf4V7I+vgSs=";
   };
 
   env.CGO_ENABLED = 0;

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

···
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "clouddrive2";
-  version = "0.9.5";
+  version = "0.9.8";
 
   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-Gsq5rvr0SeGxCRwAeeFRZBPOe32EIa7uO6SAIuinezA=";
-        aarch64-linux = "sha256-M+lCUzoiy/sImBZrOjjeP4eqG3F4wbkMQg9Ho3ELGFo=";
-        x86_64-darwin = "sha256-Uyz1wuHICSq5C+n3ZjPinZznhajd6QR36CZgQBm+QRE=";
-        aarch64-darwin = "sha256-ZQxRHTzLUAhnL1rRLR9l8Ix5XzxeTAds7XAmEgZ9Xmo=";
+        x86_64-linux = "sha256-dla1Mp+frV12v+OkGJwwcTfUKRcWy47tXYx6nWpHMhk=";
+        aarch64-linux = "sha256-GjR0zLGLvfZJMQgq9Hq3NQp7Y8QSXU4kW9cUIe5MxyM=";
+        x86_64-darwin = "sha256-pQjLwahjtw+lgLJbRpgGM4lbAfZCDtgJSVcqS6TDwug=";
+        aarch64-darwin = "sha256-by4reE2OH1Qz+Wn40QMVNZm2JsJHkoZ05OZZEnxGChI=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
   };

pkgs/by-name/fo/forgejo-runner/package.nix

···
       adamcstephens
       emilylange
       christoph-heiss
+      tebriel
     ];
     mainProgram = "forgejo-runner";
   };

pkgs/by-name/fo/forgejo/generic.nix

···
       adamcstephens
       marie
       pyrox0
+      tebriel
     ];
     broken = stdenv.hostPlatform.isDarwin;
     mainProgram = "gitea";

pkgs/by-name/ha/harbor-cli/package.nix

···
 
 buildGoModule (finalAttrs: {
   pname = "harbor-cli";
-  version = "0.0.10";
+  version = "0.0.11";
 
   src = fetchFromGitHub {
     owner = "goharbor";
     repo = "harbor-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KIICM26SYmzySt5oqiFpsEGVw/ORJZ3K11VANWa81lw=";
+    hash = "sha256-Mfy1v6uefaFI059o11/GKaiswXwJJKAH1w6kbzd2Vkk=";
   };
 
-  vendorHash = "sha256-Y2UIQWH78qsw1UE6NgeTm1Tdno78Bg6oxA9GyPLDjkQ=";
+  vendorHash = "sha256-/pBLFEGPewRNi/h5EyUueTyp5iTu2R5wLppiHSF3XxE=";
 
   excludedPackages = [
     "dagger"

pkgs/by-name/op/openxr-loader/package.nix

···
 
 stdenv.mkDerivation rec {
   pname = "openxr-loader";
-  version = "1.1.50";
+  version = "1.1.51";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenXR-SDK-Source";
     tag = "release-${version}";
-    hash = "sha256-/5zw9tj7F0cxhzyIRf8njoYB9moJFYLEjDeqe0OBr34=";
+    hash = "sha256-NEArzegPZNL0zRbnUHrNbNhBtj0IJP+uha1ehzwB7wA=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/po/poetry/package.nix

···
     {
       poetry = self.callPackage ./unwrapped.nix { };
 
+      # Poetry 2.1.4 officially requires virtualenv >=20.26.6, <20.33.0
+      # otherwise will be incompatible with python312
+      # see: https://github.com/python-poetry/poetry/issues/10490
+      virtualenv = super.virtualenv.overridePythonAttrs (old: rec {
+        version = "20.30.0";
+        src = fetchPypi {
+          inherit (old) pname;
+          inherit version;
+          hash = "sha256-gAhjFivKpUUKbk1yEElzDn8trgdyDgkCsOQEC9b5rag=";
+        };
+      });
+
       # The versions of Poetry and poetry-core need to match exactly,
       # and poetry-core in nixpkgs requires a staging cycle to be updated,
       # so apply an override here.

pkgs/by-name/po/poetry/unwrapped.nix

···
   pythonRelaxDeps = [
     "dulwich"
     "keyring"
-    "virtualenv"
   ];
 
   dependencies = [

pkgs/by-name/ti/tigerbeetle/package.nix

···
   platform =
     if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
   hash = builtins.getAttr platform {
-    "universal-macos" = "sha256-Xwjmwpy9xOSXFlGegj6hXMJtIsYJFme2yhptiaZorGU=";
-    "x86_64-linux" = "sha256-VQ9fQh65GIktHW6BWsnQmQnGwg971KkwY8lgvJgw0YY=";
-    "aarch64-linux" = "sha256-nVGJxJlV+a5vpuCj1r3b1geggjwDammKKdp1Je7z4A8=";
+    "universal-macos" = "sha256-XVYnzs9BF35pdB9uKSoX/+DWa8drWls0rtrNO9IZJtE=";
+    "x86_64-linux" = "sha256-rNlAikb/DrFYnE/OEgTPz3G82bQCnySeOp6dZAWxFn4=";
+    "aarch64-linux" = "sha256-wNuy8hq9Zt2UP/4zI/lgkWHv3X/mIKhaKoN8b/WRS2U=";
   };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tigerbeetle";
-  version = "0.16.55";
+  version = "0.16.57";
 
   src = fetchzip {
     url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";

pkgs/development/compilers/llvm/common/libc/default.nix

···
 let
   pname = "libc";
 
-  src' = runCommand "${pname}-src-${version}" { } (''
-    mkdir -p "$out"
-    cp -r ${monorepoSrc}/cmake "$out"
-    cp -r ${monorepoSrc}/runtimes "$out"
-    cp -r ${monorepoSrc}/llvm "$out"
-    cp -r ${monorepoSrc}/compiler-rt "$out"
-    cp -r ${monorepoSrc}/${pname} "$out"
-  '');
+  src' = runCommand "${pname}-src-${version}" { } (
+    ''
+      mkdir -p "$out"
+      cp -r ${monorepoSrc}/cmake "$out"
+      cp -r ${monorepoSrc}/runtimes "$out"
+      cp -r ${monorepoSrc}/llvm "$out"
+      cp -r ${monorepoSrc}/compiler-rt "$out"
+      cp -r ${monorepoSrc}/${pname} "$out"
+    ''
+    + lib.optionalString (lib.versionAtLeast release_version "21") ''
+      cp -r ${monorepoSrc}/third-party "$out"
+    ''
+  );
 in
 stdenv.mkDerivation (finalAttrs: {
   inherit pname version patches;

pkgs/development/compilers/llvm/default.nix

···
     "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
-    "21.1.0-rc3".officialRelease.sha256 = "sha256-quZuqDIm8OrkDJqu7vJKUP8MF1xCuQNFwW9SnKMFoS8=";
+    "21.1.0".officialRelease.sha256 = "sha256-4DLEZuhREHMl2t0f1iqvXSRSE5VBMVxd94Tj4m8Yf9s=";
     "22.0.0-git".gitRelease = {
       rev = "0b42e117c829c6e127ef4b1bd82807ba01853128";
       rev-version = "22.0.0-unstable-2025-08-31";

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

···
     hash = "sha256-T58J/Gi3tHzelr4enbYJi1KmO46QxE5Zlhkc0+EgvRg=";
   };
 
+  patches = [
+    # <https://github.com/librosa/librosa/pull/1977>
+    ./fix-with-numba-0.62.0.patch
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [

pkgs/development/python-modules/librosa/fix-with-numba-0.62.0.patch

···
+From 902bcca8cfc84801cf93a6c3ca59da283072a79f Mon Sep 17 00:00:00 2001
+From: Emily <[e-mail]>
+Date: Wed, 27 Aug 2025 18:58:07 +0100
+Subject: [PATCH] Fix types in beat tracking code
+
+The development version of Numba 0.62.0 is unhappy about `range`
+being applied to floating point values here.
+---
+ librosa/beat.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/librosa/beat.py b/librosa/beat.py
+index 1a19005d..4ed9e945 100644
+--- a/librosa/beat.py
++++ b/librosa/beat.py
+@@ -582,7 +582,7 @@ def __beat_track_dp(localscore, frames_per_beat, tightness, backlink, cumscore):
+         # Search over all possible predecessors to find the best preceding beat
+         # NOTE: to provide time-varying tempo estimates, we replace
+         # frames_per_beat[0] by frames_per_beat[i] in this loop body.
+-        for loc in range(i - np.round(frames_per_beat[tv * i] / 2), i - 2 * frames_per_beat[tv * i] - 1, - 1):
++        for loc in range(i - round(frames_per_beat[tv * i] / 2), int(i - 2 * frames_per_beat[tv * i] - 1), - 1):
+             # Once we're searching past the start, break out
+             if loc < 0:
+                 break
+-- 
+2.50.1
+

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

···
 
   setuptools,
 
+  cmake,
+  ninja,
+
+  llvm_20,
+  libxml2,
+
   # tests
   pytestCheckHook,
-  llvm,
-  libxml2,
 
   withStaticLLVM ? true,
 }:
 
+let
+  llvm = llvm_20;
+in
+
 buildPythonPackage rec {
   pname = "llvmlite";
-  version = "0.44.0";
+  version = "0.45.0rc1";
   pyproject = true;
 
   disabled = isPyPy || pythonAtLeast "3.14";
···
     owner = "numba";
     repo = "llvmlite";
     tag = "v${version}";
-    hash = "sha256-ZIA/JfK9ZP00Zn6SZuPus30Xw10hn3DArHCkzBZAUV0=";
+    hash = "sha256-wMTNtUuslCjopyfF6FAtfJAR0zuWjL8N8G16UKiplN0=";
   };
 
   build-system = [ setuptools ];
 
-  buildInputs = [ llvm ] ++ lib.optionals withStaticLLVM [ libxml2.dev ];
-
-  postPatch = lib.optionalString withStaticLLVM ''
-    substituteInPlace ffi/build.py --replace-fail "--system-libs --libs all" "--system-libs --libs --link-static all"
-  '';
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
 
-  # Set directory containing llvm-config binary
-  env.LLVM_CONFIG = "${llvm.dev}/bin/llvm-config";
+  buildInputs = [ llvm ] ++ lib.optionals withStaticLLVM [ libxml2.dev ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  dontUseCmakeConfigure = true;
+
   # https://github.com/NixOS/nixpkgs/issues/255262
   preCheck = ''
     cd $out
   '';
 
-  __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ "/usr/lib/libm.dylib" ];
+  env.LLVMLITE_SHARED = !withStaticLLVM;
 
   passthru = lib.optionalAttrs (!withStaticLLVM) { inherit llvm; };
 

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

···
   cudatoolkit = cudaPackages.cuda_nvcc;
 in
 buildPythonPackage rec {
-  version = "0.61.2";
+  version = "0.62.0rc1";
   pname = "numba";
   pyproject = true;
 
···
     postFetch = ''
       sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/numba/_version.py
     '';
-    hash = "sha256-Qa2B5pOWrLb/1V3PSyiwS1x9ueXwDKRhDMDecBCAN+8=";
+    hash = "sha256-YnozYetRsrCl5+UvK4y1QQykUqSMshi9vcv/K5A0dts=";
   };
 
   postPatch = ''
···
       --replace-fail \
         "dldir = [" \
         "dldir = [ '${addDriverRunpath.driverLink}/lib', "
-
-    substituteInPlace setup.py \
-      --replace-fail 'max_numpy_run_version = "2.3"' 'max_numpy_run_version = "2.4"'
-    substituteInPlace numba/__init__.py \
-      --replace-fail "numpy_version > (2, 2)" "numpy_version > (2, 3)"
   '';
 
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1";
-
   build-system = [
     setuptools
     numpy
···
 
   buildInputs = lib.optionals cudaSupport [ cudaPackages.cuda_cudart ];
 
-  pythonRelaxDeps = [ "numpy" ];
+  pythonRelaxDeps = [
+    "numpy"
+  ];
 
   dependencies = [
     numpy
     llvmlite
   ];
 
-  patches = [
-    (fetchpatch2 {
-      url = "https://github.com/numba/numba/commit/e2c8984ba60295def17e363a926d6f75e7fa9f2d.patch";
-      includes = [ "numba/core/bytecode.py" ];
-      hash = "sha256-HIVbp3GSmnq6W7zrRIirIbhGjJsFN3PNyHSfAE8fdDw=";
-    })
-  ]
-  ++ lib.optionals cudaSupport [
+  patches = lib.optionals cudaSupport [
     (replaceVars ./cuda_path.patch {
       cuda_toolkit_path = cudatoolkit;
       cuda_toolkit_lib_path = lib.getLib cudatoolkit;
···
     cd $out
   '';
 
-  enabledTestPaths = lib.optionals (!doFullCheck) [
-    # These are the most basic tests. Running all tests is too expensive, and
-    # some of them fail (also differently on different platforms), so it will
-    # be too hard to maintain such a `disabledTests` list.
-    "${python.sitePackages}/numba/tests/test_usecases.py"
-  ];
+  enabledTestPaths =
+    if doFullCheck then
+      null
+    else
+      [
+        # These are the most basic tests. Running all tests is too expensive, and
+        # some of them fail (also differently on different platforms), so it will
+        # be too hard to maintain such a `disabledTests` list.
+        "${python.sitePackages}/numba/tests/test_usecases.py"
+      ];
 
   disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
     # captured stderr: Fatal Python error: Segmentation fault

pkgs/tools/package-management/nix/default.nix

···
       nix_2_30 = addTests "nix_2_30" self.nixComponents_2_30.nix-everything;
 
       nixComponents_2_31 = nixDependencies.callPackage ./modular/packages.nix rec {
-        version = "2.31.0";
+        version = "2.31.1";
         inherit (self.nix_2_30.meta) maintainers teams;
         otherSplices = generateSplicesForNixComponents "nixComponents_2_31";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
           tag = version;
-          hash = "sha256-5JYyijH2q/uQCDIZCCyQEBsZ0VPNP2SS1wgZ4+qeIWM=";
+          hash = "sha256-p7GXuu9OyQ1etTYl5egWIk2Ck7CdpXj80CqkhfE4H0c=";
         };
       };
 

pkgs/top-level/python-packages.nix

···
   llmx = callPackage ../development/python-modules/llmx { };
 
   llvmlite = callPackage ../development/python-modules/llvmlite {
-    # llvmlite always requires a specific version of llvm.
-    llvm = pkgs.llvm_16;
+    inherit (pkgs) cmake ninja;
   };
 
   lm-eval = callPackage ../development/python-modules/lm-eval { };