diff --git a/systems/rescue-iso/default.nix b/systems/rescue-iso/default.nix index 277947e..1e49891 100644 --- a/systems/rescue-iso/default.nix +++ b/systems/rescue-iso/default.nix @@ -21,34 +21,26 @@ boot = let - version = "6.12-rc4"; + version = "6.12-rc1"; # version = "6.12-rc3"; kernelPatches = pkgs.callPackage "${inputs.nixpkgs}/pkgs/os-specific/linux/kernel/patches.nix" { }; # ref = "6efbea77b390604a7be7364583e19cd2d6a1291b"; - # ref = "bc6d2d10418e1bfdb95b16f5dd4cca42d5dec766"; - # ref = "822d4a94d6c27a518e63aec37ec0a2393419537b"; - ref = "7fcd631599f15f9f23d4dd49ac792de59cac6d38"; - linux_mainline = - { buildLinux - , fetchzip - , ... - } @ args: - buildLinux { - version = version; - src = fetchzip { - # url = "https://git.kernel.org/torvalds/t/linux-${ref}.tar.gz"; - # hash = "sha256-xp3a/+Vzwb6l/FcFhFIxbZbhk7S1WKt2W67k4v4swjI="; - # url = "https://github.com/koverstreet/bcachefs/archive/${ref}.tar.gz"; - url = "https://github.com/vault81/linux-bcachefs/archive/${ref}.tar.gz"; - hash = "sha256-/Y+rop6QX+Sr3eUwVBBGVKoYiTT4ai7k92SK/s03vYM="; - }; - modDirVersion = lib.versions.pad 3 version; - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - extraMeta.branch = "master"; + ref = "bc6d2d10418e1bfdb95b16f5dd4cca42d5dec766"; + linux_mainline = { buildLinux, fetchzip, ... } @ args: buildLinux { + version = version; + src = fetchzip { + # url = "https://git.kernel.org/torvalds/t/linux-${ref}.tar.gz"; + # hash = ""; + url = "https://github.com/koverstreet/bcachefs/archive/${ref}.tar.gz"; + hash = "sha256-tq0dXKVtW1R+Yenv7HG4Qqc1P49OzcJgICpoZLkA/K4="; }; + modDirVersion = lib.versions.pad 3 version; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + extraMeta.branch = "master"; + }; linuxMainlinePkg = pkgs.callPackage linux_mainline { }; linuxMainlinePkgs = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linuxMainlinePkg); in