From a84a25c3ae077754d5571623cb3f34b60fa29d4e Mon Sep 17 00:00:00 2001 From: Yureka Date: Sat, 4 Mar 2023 00:38:17 +0100 Subject: [PATCH 1/3] lkl: downgrade to 5.15 --- pkgs/applications/virtualization/lkl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index 0247cd433b048..f9b5b7f626953 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -6,15 +6,15 @@ stdenv.mkDerivation rec { pname = "lkl"; - version = "2023-01-27"; + version = "2022-08-08"; outputs = [ "dev" "lib" "out" ]; src = fetchFromGitHub { owner = "lkl"; repo = "linux"; - rev = "b00f0fbcd5ae24636a9315fea3af32f411cf93be"; - sha256 = "sha256-GZpnTVdcnS5uAUHsVre539+0Qlv36Fui0WGjOPwvWrE="; + rev = "ffbb4aa67b3e0a64f6963f59385a200d08cb2d8b"; + sha256 = "sha256-24sNREdnhkF+P+3P0qEh2tF1jHKF7KcbFSn/rPK2zWs="; }; nativeBuildInputs = [ bc bison flex python3 ]; From dc01a822821a033f188987a4a861cfe4381914ba Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 4 Mar 2023 11:01:44 +0300 Subject: [PATCH 2/3] lkl: add note for future update attempts --- pkgs/applications/virtualization/lkl/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index f9b5b7f626953..c7503e7896808 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -6,6 +6,11 @@ stdenv.mkDerivation rec { pname = "lkl"; + + # NOTE: pinned to the last known version that doesn't have a hang in cptofs. + # Please verify `nix build -f nixos/release-combined.nix nixos.ova` works + # before attempting to update again. + # ref: https://github.com/NixOS/nixpkgs/pull/219434 version = "2022-08-08"; outputs = [ "dev" "lib" "out" ]; From 32bc50dc369e3c0ee6e7516b6766c4a3cfe2a498 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 4 Mar 2023 11:05:10 +0300 Subject: [PATCH 3/3] lkl: add raitobezarius to maintainers (as requested on Matrix) --- pkgs/applications/virtualization/lkl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index c7503e7896808..839022a8d5512 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -77,6 +77,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/lkl/linux/"; platforms = platforms.linux; # Darwin probably works too but I haven't tested it license = licenses.gpl2; - maintainers = with maintainers; [ copumpkin ]; + maintainers = with maintainers; [ copumpkin raitobezarius ]; }; }