From 066731dc3048fa77046bc65a16049e95f77b19b2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 20 Jan 2025 08:57:17 +0000 Subject: [PATCH 1/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/f720e64ec37fa16ebba6354eadf310f81555cc07?narHash=sha256-8hKhPQuMtXfJi%2B4lPvw3FBk/zSJVHeb726Zo0uF1PP8%3D' (2025-01-12) → 'github:nix-community/disko/bf0abfde48f469c256f2b0f481c6281ff04a5db2?narHash=sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk%3D' (2025-01-16) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/bd921223ba7cdac346477d7ea5204d6f4736fcc6?narHash=sha256-deQVtIH4UJueELJqluAICUtX7OosD9paTP%2B5FgbiSwI%3D' (2025-01-14) → 'github:LnL7/nix-darwin/87131f51f8256952d1a306b5521cedc2dc61aa08?narHash=sha256-5T%2BHkouTMGaRm0rh3kgD4Z1O7ONKfgjyoPQH5rSyreU%3D' (2025-01-18) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/271e5bd7c57e1f001693799518b10a02d1123b12?narHash=sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM%3D' (2025-01-12) → 'github:nix-community/nix-index-database/744d330659e207a1883d2da0141d35e520eb87bd?narHash=sha256-lEGgpA4kGafc76%2BAmnz%2Bgh1L/cwUS2pePFlf22WEyh8%3D' (2025-01-19) • Updated input 'nixos-facter-modules': 'github:nix-community/nixos-facter-modules/8c92c91e7cc449796bedf772ec6373f61df38c07?narHash=sha256-zsBwbF7J5cy96%2B9/IoxJVxSB22lSyHpwqWjMSRJB6ZU%3D' (2025-01-14) → 'github:nix-community/nixos-facter-modules/fa11d87b61b2163efbb9aed7b7a5ae0299e5ab9c?narHash=sha256-aY55yiifyo1XPPpbpH0kWlV1g2dNGBlx6622b7OK8ks%3D' (2025-01-15) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/733994ea06585b76621073160e87b0bfac7fc5ae?narHash=sha256-5BlVeikKoJVrUXBdr1kSrcRQ8o20Kl%2BZU2pEzpE5sUw%3D' (2025-01-14) → 'github:NixOS/nixpkgs/e00a8dcebfc6ddc0bf1fdbed745f3384887b9f8f?narHash=sha256-QHIj%2BsTDAAaJTq4KewOVNFI1R0RrBxrHaSembpwx378%3D' (2025-01-20) • Updated input 'sops-nix': 'github:Mic92/sops-nix/553c7cb22fed19fd60eb310423fdc93045c51ba8?narHash=sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk%3D' (2025-01-13) → 'github:Mic92/sops-nix/4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6?narHash=sha256-GXUE9%2BFgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o%3D' (2025-01-17) • Updated input 'srvos': 'github:nix-community/srvos/61cc2047ad1a4c52ef18d117ac8e6ccfc0e38ea5?narHash=sha256-29Mp0xa3jXF33Qu92hd/uPz1HZWBestpEKmgG4RyzCo%3D' (2025-01-13) → 'github:nix-community/srvos/db87013780628b2e8387a3b4ccd3bc7bda0af447?narHash=sha256-B7GZrCLJ2ei3OHZOBddmq0b39/uq2mGzaB4jAhI6w7A%3D' (2025-01-20) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/13c913f5deb3a5c08bb810efd89dc8cb24dd968b?narHash=sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw%3D' (2025-01-06) → 'github:numtide/treefmt-nix/d1ed3b385f8130e392870cfb1dbfaff8a63a1899?narHash=sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc%3D' (2025-01-17) --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 4982df55f..b43caabe4 100644 --- a/flake.lock +++ b/flake.lock @@ -56,11 +56,11 @@ ] }, "locked": { - "lastModified": 1736711425, - "narHash": "sha256-8hKhPQuMtXfJi+4lPvw3FBk/zSJVHeb726Zo0uF1PP8=", + "lastModified": 1737038063, + "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=", "owner": "nix-community", "repo": "disko", - "rev": "f720e64ec37fa16ebba6354eadf310f81555cc07", + "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2", "type": "github" }, "original": { @@ -181,11 +181,11 @@ ] }, "locked": { - "lastModified": 1736819234, - "narHash": "sha256-deQVtIH4UJueELJqluAICUtX7OosD9paTP+5FgbiSwI=", + "lastModified": 1737162735, + "narHash": "sha256-5T+HkouTMGaRm0rh3kgD4Z1O7ONKfgjyoPQH5rSyreU=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "bd921223ba7cdac346477d7ea5204d6f4736fcc6", + "rev": "87131f51f8256952d1a306b5521cedc2dc61aa08", "type": "github" }, "original": { @@ -201,11 +201,11 @@ ] }, "locked": { - "lastModified": 1736652904, - "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=", + "lastModified": 1737257306, + "narHash": "sha256-lEGgpA4kGafc76+Amnz+gh1L/cwUS2pePFlf22WEyh8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "271e5bd7c57e1f001693799518b10a02d1123b12", + "rev": "744d330659e207a1883d2da0141d35e520eb87bd", "type": "github" }, "original": { @@ -216,11 +216,11 @@ }, "nixos-facter-modules": { "locked": { - "lastModified": 1736877249, - "narHash": "sha256-zsBwbF7J5cy96+9/IoxJVxSB22lSyHpwqWjMSRJB6ZU=", + "lastModified": 1736931726, + "narHash": "sha256-aY55yiifyo1XPPpbpH0kWlV1g2dNGBlx6622b7OK8ks=", "owner": "nix-community", "repo": "nixos-facter-modules", - "rev": "8c92c91e7cc449796bedf772ec6373f61df38c07", + "rev": "fa11d87b61b2163efbb9aed7b7a5ae0299e5ab9c", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736881310, - "narHash": "sha256-5BlVeikKoJVrUXBdr1kSrcRQ8o20Kl+ZU2pEzpE5sUw=", + "lastModified": 1737357656, + "narHash": "sha256-QHIj+sTDAAaJTq4KewOVNFI1R0RrBxrHaSembpwx378=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "733994ea06585b76621073160e87b0bfac7fc5ae", + "rev": "e00a8dcebfc6ddc0bf1fdbed745f3384887b9f8f", "type": "github" }, "original": { @@ -351,11 +351,11 @@ ] }, "locked": { - "lastModified": 1736808430, - "narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=", + "lastModified": 1737107480, + "narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8", + "rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6", "type": "github" }, "original": { @@ -371,11 +371,11 @@ ] }, "locked": { - "lastModified": 1736810122, - "narHash": "sha256-29Mp0xa3jXF33Qu92hd/uPz1HZWBestpEKmgG4RyzCo=", + "lastModified": 1737334500, + "narHash": "sha256-B7GZrCLJ2ei3OHZOBddmq0b39/uq2mGzaB4jAhI6w7A=", "owner": "nix-community", "repo": "srvos", - "rev": "61cc2047ad1a4c52ef18d117ac8e6ccfc0e38ea5", + "rev": "db87013780628b2e8387a3b4ccd3bc7bda0af447", "type": "github" }, "original": { @@ -406,11 +406,11 @@ ] }, "locked": { - "lastModified": 1736154270, - "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", + "lastModified": 1737103437, + "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", + "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899", "type": "github" }, "original": { From 435019f4a5066a844e1b7db8c96e791262702714 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 20 Jan 2025 14:29:18 +1000 Subject: [PATCH 2/2] build01, build05: switch to 6.12 kernel --- hosts/build01/default.nix | 4 +++- hosts/build05/default.nix | 4 +++- modules/nixos/common/builder.nix | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hosts/build01/default.nix b/hosts/build01/default.nix index cb7d7b0aa..8fc10afcd 100644 --- a/hosts/build01/default.nix +++ b/hosts/build01/default.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: +{ inputs, pkgs, ... }: { imports = [ inputs.self.nixosModules.cgroups @@ -7,6 +7,8 @@ inputs.srvos.nixosModules.hardware-hetzner-online-amd ]; + boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12; + nix.settings.max-jobs = 24; nixpkgs.hostPlatform.gcc.arch = "znver2"; diff --git a/hosts/build05/default.nix b/hosts/build05/default.nix index c2b70a83b..0a7aa32e8 100644 --- a/hosts/build05/default.nix +++ b/hosts/build05/default.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: +{ inputs, pkgs, ... }: { imports = [ inputs.self.nixosModules.cgroups @@ -7,6 +7,8 @@ inputs.srvos.nixosModules.hardware-hetzner-online-arm ]; + boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12; + nix.settings.max-jobs = 80; nixpkgs.hostPlatform.gcc.arch = "armv8-a"; diff --git a/modules/nixos/common/builder.nix b/modules/nixos/common/builder.nix index 950b29df7..e11d520ac 100644 --- a/modules/nixos/common/builder.nix +++ b/modules/nixos/common/builder.nix @@ -9,7 +9,7 @@ config = lib.mkIf (lib.hasPrefix "build" config.networking.hostName) { nix.gc.automatic = false; - boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_6; + boot.kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_6_6; boot.zfs.package = pkgs.zfs_2_3;