summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock18
-rw-r--r--overlays/zfs.nix14
2 files changed, 17 insertions, 15 deletions
diff --git a/flake.lock b/flake.lock
index d4e6b951..72147746 100644
--- a/flake.lock
+++ b/flake.lock
@@ -46,11 +46,11 @@
46 ] 46 ]
47 }, 47 },
48 "locked": { 48 "locked": {
49 "lastModified": 1637010045, 49 "lastModified": 1639329010,
50 "narHash": "sha256-EzA+Iu2c8N1i3K8jouZSuyMOOeR1glFZSW9ZgqmPH54=", 50 "narHash": "sha256-k9OXwR06419/s0FAnRalUs24+8EI6GepGaatAXhBc+0=",
51 "owner": "nix-community", 51 "owner": "nix-community",
52 "repo": "home-manager", 52 "repo": "home-manager",
53 "rev": "a7c5b00d44f65efd1e8ace2c02243f179e72283a", 53 "rev": "3d46c011d2cc2c9ca24d9b803e9daf156d9429ea",
54 "type": "github" 54 "type": "github"
55 }, 55 },
56 "original": { 56 "original": {
@@ -62,11 +62,11 @@
62 }, 62 },
63 "nixpkgs": { 63 "nixpkgs": {
64 "locked": { 64 "locked": {
65 "lastModified": 1637072800, 65 "lastModified": 1639384431,
66 "narHash": "sha256-Q7MDJG+DG/gXnZ1dBPuQBNrGUy1R5GD4xnIbKOu8/Mw=", 66 "narHash": "sha256-SDCYK/KofMsS5F+gQWybSDzRW5E3/s0Y53TGyCMVn2Y=",
67 "owner": "NixOS", 67 "owner": "NixOS",
68 "repo": "nixpkgs", 68 "repo": "nixpkgs",
69 "rev": "57c90b8956cd00b35c56b92fcb857116631d5d5d", 69 "rev": "5a32f24cd8c23594aa941f4dce1a5616fc624e0c",
70 "type": "github" 70 "type": "github"
71 }, 71 },
72 "original": { 72 "original": {
@@ -91,11 +91,11 @@
91 ] 91 ]
92 }, 92 },
93 "locked": { 93 "locked": {
94 "lastModified": 1637050424, 94 "lastModified": 1638821683,
95 "narHash": "sha256-8IaY0/Y5g3jJiQzPN0PflKFcFEE1C29DZZ0dF1NIJ6s=", 95 "narHash": "sha256-oyqALhGijy2ZQxFSACrcC+Z8MzYLiomKCr9FQXVZ47U=",
96 "owner": "Mic92", 96 "owner": "Mic92",
97 "repo": "sops-nix", 97 "repo": "sops-nix",
98 "rev": "3c53d012ac77d4bd8428f9c847709e287c897ad9", 98 "rev": "afe00100b16648c1d79e62926caacac561df93a5",
99 "type": "github" 99 "type": "github"
100 }, 100 },
101 "original": { 101 "original": {
diff --git a/overlays/zfs.nix b/overlays/zfs.nix
index aef1287e..1da10050 100644
--- a/overlays/zfs.nix
+++ b/overlays/zfs.nix
@@ -1,11 +1,13 @@
1final: prev: { 1final: prev: {
2 linuxPackages_5_15 = prev.linuxPackages_latest.extend (self: super: { 2 linuxKernel = prev.linuxKernel // {
3 zfsUnstable = prev.zfsUnstable.overrideAttrs (oldAttrs: { 3 packagesFor = kernel_: (prev.linuxKernel.packagesFor kernel_).extend (self: super: {
4 meta = oldAttrs.meta // (assert (oldAttrs.src.outputHash == "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY="); rec { 4 zfsUnstable = super.zfsUnstable.overrideAttrs (oldAttrs: {
5 broken = !(self.kernel.kernelAtLeast "3.10" && self.kernel.kernelOlder "5.16"); 5 meta = oldAttrs.meta // (assert (oldAttrs.src.outputHash == "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY="); rec {
6 # latestCompatibleLinuxPackages = final.linuxPackages_5_15; 6 broken = !(self.kernel.kernelAtLeast "3.10" && self.kernel.kernelOlder "5.16");
7 latestCompatibleLinuxPackages = final.linuxPackages_5_15;
8 });
7 }); 9 });
8 }); 10 });
9 }); 11 };
10 # linuxPackages_latest = final.linuxPackages_5_15; 12 # linuxPackages_latest = final.linuxPackages_5_15;
11} 13}