From 544e12c33faa81c308db2b3eecca4ebdf47350d4 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Fri, 14 Jun 2024 22:17:49 +0200 Subject: [PATCH] pin kernel to 6.7.7 --- flake.lock | 8 ++++---- flake.nix | 3 ++- hosts/epyc.nix | 7 ++++--- modules/users/keys/luj.keys | 2 ++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index be91cc1..fa60420 100644 --- a/flake.lock +++ b/flake.lock @@ -336,17 +336,17 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1717796960, - "narHash": "sha256-BKjQ9tQdsuoROrojHZb7KTAv95WprqCkNFvuzatfEo0=", + "lastModified": 1709742294, + "narHash": "sha256-8iPomMqw7grXVsugMJhsnHdbre8LnXOQUtHtMXRaWqc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8e0a5f16b7bf7f212be068dd302c49888c6ad68f", + "rev": "56051fbe049bf39adc1f08eb51740c226a4c3b90", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05-small", "repo": "nixpkgs", + "rev": "56051fbe049bf39adc1f08eb51740c226a4c3b90", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 779165c..0641f45 100644 --- a/flake.nix +++ b/flake.nix @@ -10,8 +10,9 @@ flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05-small"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + # contains kernel 6.7.7, do not update + nixpkgs.url = "github:NixOS/nixpkgs/56051fbe049bf39adc1f08eb51740c226a4c3b90"; nixos-hardware.url = "github:NixOS/nixos-hardware"; nur.url = "github:nix-community/NUR"; diff --git a/hosts/epyc.nix b/hosts/epyc.nix index 10a8d07..ca9526f 100644 --- a/hosts/epyc.nix +++ b/hosts/epyc.nix @@ -27,18 +27,19 @@ in # TODO: there's a critical bug on 6.8+ where btrfs won't mount the rootfs at all. # Do not upgrade until it is fixed. Ping Raito when needed. - # boot.kernelPackages = pkgs.linuxPackage_latest; + boot.kernelPackages = pkgs.linuxPackages_6_7; # Open public access to our PostgreSQL. services.postgresql.enable = true; services.postgresql.enableTCPIP = true; services.postgresql.authentication = '' - host hydra-nixos-org hydra_ro ::/0 trust + host hydra-nixos-org hydra_ro ::/0 trust ''; networking.firewall.allowedTCPPorts = [ 5432 ]; nix.buildMachines = [ - { hostName = "localhost"; + { + hostName = "localhost"; systems = [ "x86_64-linux" "riscv64-linux" diff --git a/modules/users/keys/luj.keys b/modules/users/keys/luj.keys index 2536b0e..2fecf5a 100644 --- a/modules/users/keys/luj.keys +++ b/modules/users/keys/luj.keys @@ -11,3 +11,5 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILKIDLmQQ+P+jE4zVRpdVp8fmYEe4nzPDqYZt6A4eyIi ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAkj2xsN7Qt/Ew2QO+HiF2yOjXPRucZ3SbIdPDLJoh22 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDMBW7rTtfZL9wtrpCVgariKdpN60/VeAzXkh9w3MwbO ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCUt5I3IgONzYsMOFnRXtvR/uLXlIs6oWsCmh6YGgnpGD4M9lFdoYAOeC1faQUnP66sNs6AoacrGlPZ1UkVUqYEoIr2hiNCDRzzLCQ2J/sSaw7Hv0PKT7MWMo8R076M3TrdunCchBJI1noez3waM9aL4b/iYVhxym28ET55QrWjyMQfZL9PXzOKZatNVcK8AmdtSbI+pFrm/tTZPa321drm9PHOo9CL+lG4YmVZcXa0bVfVtk1GXlWwNpCj2ExLmbF1rRpAa05khfnbg3sBSklwf5NRXj11KneodKRF81ji7MtBhIIfoEXSYht7yspdkkS9e9mv16VGV+2ziM8zG3MK/iUq7fg5ksN54D3DNrd9iI5WjQZsLUrK0ypxO2NtvupWGYt3rCyKA/QvynbxOWFp6cy3Evej142hsfbiOcPIgCtGdHIBevp+KmPxkHBqsJPBqb3Y7nOMT1/ggDMtvHZEZJjEI2D2RjZNEXGbq63OPAqEkgmecW0cXlrjLEGhF2E= +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIADCpuBL/kSZShtXD6p/Nq9ok4w1DnlSoxToYgdOvUqo +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC0yxKgDt5IsroNxjqRYpbt7F3m8kewrnFql9PRSQgUMoAmLjIdtaNolfTGwPnb+mkhfh1wac7+SdoFilVAWfxdcBpkt6smou0EG4ek6nRQDV+MceZb/Yaroj6qDZ0XdSnirCIXvVSLAs+z+rwRNVP/vPr+PZc7eRCjeTWZftjIAF0XPL09raDIpdZZKrWKOk7ieWV1NedEf72HvD720mmyEpR2z8iFKcVbZlVmC1KAnfozpX22nk+i9LLuwpFWdb8cDpObuu7OoGVPvX5h0TxI+6vH+9+u657G0AyHyJrBdbMzJDFdRolWYCzUo5G+2deBlY1VMJ36oNx17xkd4vBh