From 1bd37279da38d4f3631f6e28e651e760f7f5d2d2 Mon Sep 17 00:00:00 2001
From: Molly Miller <mm@flyingcircus.io>
Date: Tue, 3 Sep 2024 10:20:48 +0200
Subject: [PATCH] nixpkgs: switch channel for downgraded kernel version

Kernel 5.15.165 has a bug in the virto_net driver which causes network
performance issues, so switch to a feature branch which has been
downgraded to 5.15.164.

PL-132971
---
 flake.lock            | 22 +++++++++++-----------
 flake.nix             |  2 +-
 release/versions.json |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/flake.lock b/flake.lock
index ccdbe75d8..2bb2cf5ae 100644
--- a/flake.lock
+++ b/flake.lock
@@ -155,11 +155,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1722555600,
-        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+        "lastModified": 1725234343,
+        "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+        "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
         "type": "github"
       },
       "original": {
@@ -350,14 +350,14 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1722555339,
-        "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
+        "lastModified": 1725233747,
+        "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
       },
       "original": {
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
+        "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
       }
     },
     "nixpkgs-regression": {
@@ -410,16 +410,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1724858933,
-        "narHash": "sha256-F/S6sVz00ljxgPAu9C6r7BbkmfkLy0KihEdvRCobFTY=",
+        "lastModified": 1725351330,
+        "narHash": "sha256-/TWnMQLv73+pcuNiL2DI1m9bgZuItPGDrDANJ4EzY2A=",
         "owner": "flyingcircusio",
         "repo": "nixpkgs",
-        "rev": "ac9a8c52e1e69847cef1d41c9661034dc3909149",
+        "rev": "8dbeac8e250a79d33ae1eb9ec3d9bba294b7a3a4",
         "type": "github"
       },
       "original": {
         "owner": "flyingcircusio",
-        "ref": "nixos-24.05",
+        "ref": "PL-132971-downgrade-kernel-5.15",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index cb5345154..cc1d7b700 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,7 +23,7 @@
   description = "Flying Circus NixOS platform (dev/release tooling)";
 
   inputs = {
-    nixpkgs.url = "github:flyingcircusio/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:flyingcircusio/nixpkgs/PL-132971-downgrade-kernel-5.15";
     nixos-mailserver = {
       url = "gitlab:flyingcircus/nixos-mailserver/nixos-24.05?host=gitlab.flyingcircus.io";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/release/versions.json b/release/versions.json
index 2e7859f97..3bd952568 100644
--- a/release/versions.json
+++ b/release/versions.json
@@ -8,9 +8,9 @@
     "url": "https://gitlab.flyingcircus.io/flyingcircus/nixos-mailserver.git/"
   },
   "nixpkgs": {
-    "hash": "sha256-F/S6sVz00ljxgPAu9C6r7BbkmfkLy0KihEdvRCobFTY=",
+    "hash": "sha256-/TWnMQLv73+pcuNiL2DI1m9bgZuItPGDrDANJ4EzY2A=",
     "owner": "flyingcircusio",
     "repo": "nixpkgs",
-    "rev": "ac9a8c52e1e69847cef1d41c9661034dc3909149"
+    "rev": "8dbeac8e250a79d33ae1eb9ec3d9bba294b7a3a4"
   }
 }