From 871e00591399d420154373f2a72cb681d996b570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Fri, 3 Mar 2023 22:27:21 -0300 Subject: [PATCH] linuxKernel.kernels.linux_testing_bcachefs: 6.1.3-unstable-2023-02-01 -> 6.4.0-unstable-2023-06-28 --- .../linux/kernel/linux-testing-bcachefs.nix | 10 ++++++---- pkgs/top-level/linux-kernels.nix | 12 ++---------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index b6f897b024e..dfe5beb55f6 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -2,10 +2,12 @@ , stdenv , fetchpatch , kernel -, commitDate ? "2023-02-01" -, currentCommit ? "65960c284ad149cc4bfbd64f21e6889c1e3d1c5f" -, diffHash ? "sha256-4wpY3aYZ93OXSU4wmQs9K62nPyIzjKu4RBQTwksmyyk=" - +, commitDate ? "2023-06-28" +# bcachefs-tools stores the expected-revision in: +# https://evilpiepirate.org/git/bcachefs-tools.git/tree/.bcachefs_revision +# but this does not means that it'll be the latest-compatible revision +, currentCommit ? "84f132d5696138bb038d2dc8f1162d2fab5ac832" +, diffHash ? "sha256-RaBWBU7rXjJFb1euFAFBHWCBQAG7npaCodjp/vMYpyw=" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 3f448f4cdeb..9beff067127 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -205,16 +205,8 @@ in { linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix { # Pinned on the last version which Kent's commits can be cleany rebased up. - kernel = buildLinux rec { - version = "6.1.3"; - modDirVersion = lib.versions.pad 3 version; - extraMeta.branch = lib.versions.majorMinor version; - src = fetchurl { - url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - hash = "sha256-bcia56dRPkM8WXxzRu1/9L/RFepDo7XiemvbOMVYAxc="; - }; - }; - kernelPatches = linux_6_1.kernelPatches; + kernel = linux_6_4; + kernelPatches = linux_6_4.kernelPatches; }; linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix {