From e056884069b462e3674aced35f42108d1ff1f49f Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 22 Dec 2021 15:19:49 +0100 Subject: bump --- flake.lock | 12 ++++++------ overlays/zfs.nix | 21 --------------------- 2 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 overlays/zfs.nix diff --git a/flake.lock b/flake.lock index 685865db..b438e94b 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1639644962, - "narHash": "sha256-KapSYcM2r0PyQCAKg5J6rrXkXmw4cItR3jEckH/pAfo=", + "lastModified": 1640126586, + "narHash": "sha256-Brja0wQZFSl+hduOcBfE/oVPs0QattbILSMHC7/9fEg=", "owner": "nix-community", "repo": "home-manager", - "rev": "42ba7b630437ab04b9d97b0745194cd913481051", + "rev": "1b03a8ab7af9385b70b7d7c319c4a31a58c5cfa5", "type": "github" }, "original": { @@ -62,11 +62,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1639659259, - "narHash": "sha256-Af802PCpkgOkv/6jCbBMS+4v+nlnOQj71fyz+jYAUXg=", + "lastModified": 1640173269, + "narHash": "sha256-/fzNf9IcaLdGb7LRJ9HTJYDEwlzHKhs02mj2bPJByhU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "162d6dd876a87b9883b79201b6a56f1f9b4d9a7f", + "rev": "d4c6319803ecfa09d86b8e136722fad7566675d6", "type": "github" }, "original": { diff --git a/overlays/zfs.nix b/overlays/zfs.nix deleted file mode 100644 index 7291e2e4..00000000 --- a/overlays/zfs.nix +++ /dev/null @@ -1,21 +0,0 @@ -final: prev: -let - overrides = { - "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY=" = { self }: { - broken = !(self.kernel.kernelAtLeast "3.10" && self.kernel.kernelOlder "5.16"); - latestCompatibleLinuxPackages = final.linuxPackages_5_15; - }; - }; -in { - linuxKernel = prev.linuxKernel // { - packagesFor = kernel_: (prev.linuxKernel.packagesFor kernel_).extend (self: super: rec { - zfsUnstable = super.zfsUnstable.overrideAttrs (oldAttrs: { - meta = oldAttrs.meta // (overrides.${oldAttrs.src.outputHash} or (_: {})) { inherit self; }; - }); - zfsStable = super.zfsUnstable.overrideAttrs (oldAttrs: { - meta = oldAttrs.meta // (overrides.${oldAttrs.src.outputHash} or (_: {})) { inherit self; }; - }); - zfs = zfsStable; - }); - }; -} -- cgit v1.2.3