spotlight/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cyclone: Use upstream ZFS

Browse source 
This was not correctly cherry-picked to be committed previously - oops!
This commit is contained in:
Spotlight 2025-05-06 16:34:55 -05:00
parent d021b7ac39
commit 305de5b3aa
Signed by: spotlight
GPG key ID: 874AA355B3209BDC
2 changed files with 5 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -142,11 +142,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1746328495, "lastModified": 1746461020,
"narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae",
"type": "github" "type": "github"
}, },
"original": { "original": {

18
hosts/linux/cyclone/hardware-configuration.nix
View file

@ -22,24 +22,10 @@
# supports kernel 6.14 with no changes necessary. # supports kernel 6.14 with no changes necessary.
# #
# We'll temporarily override it to not mark it as broken. # We'll temporarily override it to not mark it as broken.
kernelPackages = pkgs.linuxPackages_6_14.extend (final: prev: { kernelPackages = pkgs.linuxPackages_6_14;
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/17172.patch";
hash = "sha256-c8YP1a36uwYvvW+h4yT6s3PIKkHq6IMjVal2CcNI4p4=";
})
];
meta.broken = false;
});
});
zfs = { zfs = {
package = pkgs.zfs_unstable.overrideAttrs (oldAttrs: rec { package = pkgs.zfs_unstable;
meta.broken = false;
});
# For reasons unbeknownst to humanity, this drive # For reasons unbeknownst to humanity, this drive
# appeared to keep changing identifiers. # appeared to keep changing identifiers.
# #