From 80f4eda582aa6a1baf35398b34ee5e5d8da7f1ed Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 24 Jun 2025 08:56:15 +0200 Subject: ... --- flake.lock | 88 +++++++++++++++++++++---------------------------- hosts/sif/default.nix | 4 ++- modules/llvm_kernel.nix | 59 --------------------------------- system-profiles/zfs.nix | 3 +- 4 files changed, 41 insertions(+), 113 deletions(-) delete mode 100644 modules/llvm_kernel.nix diff --git a/flake.lock b/flake.lock index 5a9e4420..e4c3a97c 100644 --- a/flake.lock +++ b/flake.lock @@ -178,11 +178,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -386,7 +386,7 @@ "leapseconds": { "flake": false, "locked": { - "narHash": "sha256-5ZaoY/bScQS7EGJRHu6vj9XWhbObmxNEaGugaGU7+lg=", + "narHash": "sha256-FJgbafPB48+5sT+7ZB8pajSsfJoISEOoaJ0d/2Ya7o8=", "type": "file", "url": "https://data.iana.org/time-zones/tzdb/leap-seconds.list" }, @@ -402,16 +402,16 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3", + "nixpkgs-stable": "nixpkgs-stable_2", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1750471128, - "narHash": "sha256-oR2yjhAPXZDmfFb4UwBeVQcJBtrUNFwufovzN8sTBVc=", + "lastModified": 1750735687, + "narHash": "sha256-pscxcZpLGcEEJGVjFAM7X77cARABc7M+zVyUN6qsEmU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "13e7a34df7aa4e7d8ec4dd9df9d5a01973f28f49", + "rev": "a581a91b7406a0b9039ef22e37e5166bd3b1a139", "type": "github" }, "original": { @@ -441,11 +441,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1750334747, - "narHash": "sha256-nsD1Z6vVP2Hhdgrd0uYHacre2+NhaH/53TFRXn6pRcs=", + "lastModified": 1750684365, + "narHash": "sha256-BqtoSRCgmutJXnQFZs+KFMNvp3LuX6POIHjXIxWdlTE=", "owner": "YaLTeR", "repo": "niri", - "rev": "e0b0b04b445f7044f383e50104f861e632e1c905", + "rev": "4c02f3bba451747c3f337f4c131b0c7f9ef41bb7", "type": "github" }, "original": { @@ -599,14 +599,17 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1733096140, - "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" } }, "nixpkgs-lib_3": { @@ -661,27 +664,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1750400657, - "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=", + "lastModified": 1750622754, + "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37", + "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1", "type": "github" }, "original": { @@ -691,7 +678,7 @@ "type": "github" } }, - "nixpkgs-stable_4": { + "nixpkgs-stable_3": { "locked": { "lastModified": 1748026580, "narHash": "sha256-rWtXrcIzU5wm/C8F9LWvUfBGu5U5E7cFzPYT1pHIJaQ=", @@ -707,7 +694,7 @@ "type": "github" } }, - "nixpkgs-stable_5": { + "nixpkgs-stable_4": { "locked": { "lastModified": 1678872516, "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", @@ -725,11 +712,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750365781, - "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", + "lastModified": 1750506804, + "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", + "rev": "4206c4cb56751df534751b058295ea61357bbbaa", "type": "github" }, "original": { @@ -837,15 +824,14 @@ "nixpkgs": [ "ca-util", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" + ] }, "locked": { - "lastModified": 1734261738, - "narHash": "sha256-3Lzk+7QyX8v60+km26D3dln7NMSA13vW+KYTkMkds6Q=", + "lastModified": 1749636823, + "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "4c8e75efbbdcc6f9203f64b1f21f8a55d2285264", + "rev": "623c56286de5a3193aa38891a6991b28f9bab056", "type": "github" }, "original": { @@ -860,7 +846,7 @@ "flake-utils": "flake-utils_2", "gitignore": "gitignore_3", "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable_5" + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { "lastModified": 1685361114, @@ -996,7 +982,7 @@ "nixpkgs": "nixpkgs_2", "nixpkgs-eostre": "nixpkgs-eostre", "nixpkgs-pgbackrest": "nixpkgs-pgbackrest", - "nixpkgs-stable": "nixpkgs-stable_4", + "nixpkgs-stable": "nixpkgs-stable_3", "nvfetcher": "nvfetcher", "poetry2nix": "poetry2nix", "prometheus-borg-exporter": "prometheus-borg-exporter", @@ -1146,11 +1132,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1750388715, - "narHash": "sha256-6WMpcn3Ga/L71NiX9SdWw7ZELpNfrFnWJ0Gt2uAHjJg=", + "lastModified": 1750686869, + "narHash": "sha256-FS/rYXd96VBtKNJRTV2xTpTk8CgrYP+lFsFj0+VKgoY=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "03cbb2ee3a9da931bb9a39eb917674297a0b9318", + "rev": "117af56a83e2d1d25016fbd504a2a040babe586a", "type": "github" }, "original": { diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix index a57c454c..467c9e99 100644 --- a/hosts/sif/default.nix +++ b/hosts/sif/default.nix @@ -60,7 +60,7 @@ in { plymouth.enable = true; - kernel.llvm.kernel = pkgs.linuxKernel.kernels.linux_latest; + kernelPackages = pkgs.linuxKernel.packages.linux_latest; kernelPatches = [ { name = "edac-config"; patch = null; @@ -98,6 +98,8 @@ in { server ptbtime2.ptb.de prefer iburst nts server ptbtime3.ptb.de prefer iburst nts server ptbtime4.ptb.de prefer iburst nts + pool ntppool1.time.nl prefer iburst nts + pool ntppool2.time.nl prefer iburst nts authselectmode require minsources 3 diff --git a/modules/llvm_kernel.nix b/modules/llvm_kernel.nix deleted file mode 100644 index 42b8bf95..00000000 --- a/modules/llvm_kernel.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ config, pkgs, lib, ... }: -let - cfg = config.boot.kernel.llvm; -in { - options = { - boot.kernel.llvm = { - enable = lib.mkEnableOption "building linux kernel with clang/LLVM" // { - default = true; - }; - - kernel = lib.mkPackageOption pkgs [ "linuxKernel" "kernels" "linux_default" ] {}; - }; - }; - - config = lib.mkIf cfg.enable { - boot.kernelPackages = - with pkgs; # Cut down on repeated `pkgs.` declarations - let - # Choose whichever LLVM version you please. `llvmPackages` is the - # default version, `llvmPackages_latest` is the latest (at the time of - # writing, LLVM 17.0.6 and 18.1.8 respectively). - llvm = llvmPackages_latest; - # Same deal as LLVM; choose whichever kernel version you like. - # `linux` is the latest LTS, `linux_latest` is the latest stable. - inherit (cfg) kernel; - in - # Generate kernel modules for our custom kernel. - linuxPackagesFor ( - # Override our chosen kernel version with our custom settings. - (kernel.override { - # Set our chosen version of LLVM as our standard environment. - stdenv = overrideCC llvm.stdenv ( - # Tell our C compiler (Clang) to use LLVM bintools--normally GNU - # binutils are used even with Clang as the compiler. - llvm.stdenv.cc.override { - bintools = llvm.bintools; - } - ); - - # Tell Linux that we're compiling with Clang and LLVM. - extraMakeFlags = [ "LLVM=1" ]; - - # If you'd like to edit your kernel configuration, use - # `structuredExtraConfig`. For example, some options available to us - # when compiling with Clang and linking with LLD: - structuredExtraConfig = { - # CFI_CLANG = lib.kernel.yes; - # LTO_CLANG_THIN = lib.kernel.yes; - }; - } - ).overrideAttrs - # Work around another NixOS specific issue where builds with WERROR=y - # are stopped by a benign error. See reference 1 below for details. - # Technically, this fix is only necessary with WERROR=y but the issue - # still causes a warning on builds where WERROR is unset. - { env.NIX_CFLAGS_COMPILE = "-Wno-unused-command-line-argument"; } - ); - }; -} diff --git a/system-profiles/zfs.nix b/system-profiles/zfs.nix index f3147f9e..af9f1c17 100644 --- a/system-profiles/zfs.nix +++ b/system-profiles/zfs.nix @@ -1,8 +1,7 @@ { config, pkgs, lib, ... } : { config = { boot = { - kernelPackages = lib.mkIf (!config.boot.kernel.llvm.enable) pkgs.linuxPackages_6_12; - kernel.llvm.kernel = lib.mkIf config.boot.kernel.llvm.enable pkgs.linux_6_12; + kernelPackages = pkgs.linuxPackages_6_12; zfs.package = pkgs.zfs_2_3; supportedFilesystems.zfs = true; -- cgit v1.2.3