tristan/nix
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Revert "wip: Update rescue-iso & add rescue-kexec:"

Browse source 
This reverts commit 729c2ee9b5.
This commit is contained in:
Tristan D. 2024-11-03 14:15:16 +01:00
parent 729c2ee9b5
commit 2384e6978d
Signed by: tristan
SSH key fingerprint: SHA256:3RU4RLOoM8oAjFU19f1W6t8uouZbA7GWkaSW6rjp1k8
1 changed files with 16 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
systems/rescue-iso/default.nix
View file

@ -21,34 +21,26 @@
boot = boot =
let let
version = "6.12-rc4"; version = "6.12-rc1";
# version = "6.12-rc3"; # version = "6.12-rc3";
kernelPatches = pkgs.callPackage "${inputs.nixpkgs}/pkgs/os-specific/linux/kernel/patches.nix" { }; kernelPatches = pkgs.callPackage "${inputs.nixpkgs}/pkgs/os-specific/linux/kernel/patches.nix" { };
# ref = "6efbea77b390604a7be7364583e19cd2d6a1291b"; # ref = "6efbea77b390604a7be7364583e19cd2d6a1291b";
# ref = "bc6d2d10418e1bfdb95b16f5dd4cca42d5dec766"; ref = "bc6d2d10418e1bfdb95b16f5dd4cca42d5dec766";
# ref = "822d4a94d6c27a518e63aec37ec0a2393419537b"; linux_mainline = { buildLinux, fetchzip, ... } @ args: buildLinux {
ref = "7fcd631599f15f9f23d4dd49ac792de59cac6d38"; version = version;
linux_mainline = src = fetchzip {
{ buildLinux # url = "https://git.kernel.org/torvalds/t/linux-${ref}.tar.gz";
, fetchzip # hash = "";
, ... url = "https://github.com/koverstreet/bcachefs/archive/${ref}.tar.gz";
} @ args: hash = "sha256-tq0dXKVtW1R+Yenv7HG4Qqc1P49OzcJgICpoZLkA/K4=";
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";
}; };
modDirVersion = lib.versions.pad 3 version;
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
extraMeta.branch = "master";
};
linuxMainlinePkg = pkgs.callPackage linux_mainline { }; linuxMainlinePkg = pkgs.callPackage linux_mainline { };
linuxMainlinePkgs = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linuxMainlinePkg); linuxMainlinePkgs = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linuxMainlinePkg);
in in