Merge staging-next into staging

pkgs/os-specific/linux/kernel/common-config.nix

@@ -32,8 +32,11 @@ let
   forceRust = features.rust or false;
   kernelSupportsRust = lib.versionAtLeast version "6.7";
 
-  # Currently not enabling Rust by default, as upstream requires rustc 1.81
-  defaultRust = false;
+  # Currently only enabling Rust by default on kernel 6.12+,
+  # which actually has features that use Rust that we want,
+  # and only on x86_64, because of a nixpkgs rustc issue:
+  # https://github.com/NixOS/nixpkgs/pull/315121#issuecomment-2135805876
+  defaultRust = lib.versionAtLeast version "6.12" && stdenv.hostPlatform.isx86_64;
   withRust = (forceRust || defaultRust) && kernelSupportsRust;
 
   options = {

pkgs/servers/monitoring/grafana/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, removeReferencesTo
+{ lib, stdenv, buildGo122Module, fetchFromGitHub, removeReferencesTo
 , tzdata, wire
 , yarn, nodejs, python3, cacert
 , jq, moreutils
@@ -6,7 +6,8 @@
 , faketty
 }:
 
-buildGoModule rec {
+# TODO: Go back to using buildGoModule when upgrading to grafana 11.3.
+buildGo122Module rec {
   pname = "grafana";
   version = "11.2.1";