From e52446bcacf7a6246be055a0970a106831b5a1ce Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 30 Sep 2024 20:41:47 +0300 Subject: [PATCH 1/2] linux/common-config: begin carcinization We now have a compatible rustc to build 6.12 with, which means THE TIME HAS COME PRAISE THE CRAB --- pkgs/os-specific/linux/kernel/common-config.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 0b3da3f22f71..e7c212cb6e6f 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/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 = { From 1859c5139d2ca10d7d10ea8b51e6be4e8a6a44b3 Mon Sep 17 00:00:00 2001 From: Tom Dohrmann Date: Mon, 30 Sep 2024 21:12:19 +0200 Subject: [PATCH 2/2] grafana: fix build Grafana 11.2 doesn't work with Go 1.23, so revert to 1.22. This can be undone once we upgrade to a version containing https://github.com/grafana/grafana/pull/92055, presumably grafana 11.3. --- pkgs/servers/monitoring/grafana/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 89b7cec1023d..26f365463bcb 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/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";