cyclone: Use kernel 6.15
This commit is contained in:
parent
24336ecdf6
commit
9d640f2dfd
2 changed files with 26 additions and 8 deletions
12
flake.lock
generated
12
flake.lock
generated
|
@ -92,11 +92,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749221014,
|
||||
"narHash": "sha256-mqrpuP/lfyDmta5hJWTwWgdF5lwdiubcGs7oRvcTZ2s=",
|
||||
"lastModified": 1749243446,
|
||||
"narHash": "sha256-P1gumhZN5N9q+39ndePHYrtwOwY1cGx+VoXGl+vTm7A=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "96482a538e6103579d254b139759d0536177370b",
|
||||
"rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -142,11 +142,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1748929857,
|
||||
"narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
|
||||
"lastModified": 1749143949,
|
||||
"narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
|
||||
"rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -22,10 +22,28 @@
|
|||
# supports kernel 6.14 with no changes necessary.
|
||||
#
|
||||
# We'll temporarily override it to not mark it as broken.
|
||||
kernelPackages = pkgs.linuxPackages_6_14;
|
||||
kernelPackages = pkgs.linuxPackages_6_15.extend (final: prev: {
|
||||
zfs_unstable = prev.zfs_unstable.overrideAttrs (oldAttrs: {
|
||||
# Well.. that's partially a lie, it does need
|
||||
# one patch to specify it's compatible.
|
||||
patches = [
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/openzfs/zfs/pull/17371.patch";
|
||||
hash = "sha256-GTfeFz8j8h6nPIAjMOhsF1NQkyMUxYNCEaQp0rylXlo=";
|
||||
})
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/openzfs/zfs/pull/17393.patch";
|
||||
hash = "sha256-1SiM+XImy/8y1A32kv65Kj4kwgA4p8BlOi6qDLwq/+4=";
|
||||
})
|
||||
];
|
||||
meta.broken = false;
|
||||
});
|
||||
});
|
||||
|
||||
zfs = {
|
||||
package = pkgs.zfs_unstable;
|
||||
package = pkgs.zfs_unstable.overrideAttrs (oldAttrs: rec {
|
||||
meta.broken = false;
|
||||
});
|
||||
# For reasons unbeknownst to humanity, this drive
|
||||
# appeared to keep changing identifiers.
|
||||
#
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue