summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2021-12-22 15:19:49 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2021-12-22 15:19:49 +0100
commite056884069b462e3674aced35f42108d1ff1f49f (patch)
treee5cd2e3d6374f121de8d761809b18d59d56b173a
parentd186ac4e074c046c39d51b899a643eb44268e8e2 (diff)
downloadnixos-e056884069b462e3674aced35f42108d1ff1f49f.tar
nixos-e056884069b462e3674aced35f42108d1ff1f49f.tar.gz
nixos-e056884069b462e3674aced35f42108d1ff1f49f.tar.bz2
nixos-e056884069b462e3674aced35f42108d1ff1f49f.tar.xz
nixos-e056884069b462e3674aced35f42108d1ff1f49f.zip
bump
-rw-r--r--flake.lock12
-rw-r--r--overlays/zfs.nix21
2 files changed, 6 insertions, 27 deletions
diff --git a/flake.lock b/flake.lock
index 685865db..b438e94b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -46,11 +46,11 @@
46 ] 46 ]
47 }, 47 },
48 "locked": { 48 "locked": {
49 "lastModified": 1639644962, 49 "lastModified": 1640126586,
50 "narHash": "sha256-KapSYcM2r0PyQCAKg5J6rrXkXmw4cItR3jEckH/pAfo=", 50 "narHash": "sha256-Brja0wQZFSl+hduOcBfE/oVPs0QattbILSMHC7/9fEg=",
51 "owner": "nix-community", 51 "owner": "nix-community",
52 "repo": "home-manager", 52 "repo": "home-manager",
53 "rev": "42ba7b630437ab04b9d97b0745194cd913481051", 53 "rev": "1b03a8ab7af9385b70b7d7c319c4a31a58c5cfa5",
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": 1639659259, 65 "lastModified": 1640173269,
66 "narHash": "sha256-Af802PCpkgOkv/6jCbBMS+4v+nlnOQj71fyz+jYAUXg=", 66 "narHash": "sha256-/fzNf9IcaLdGb7LRJ9HTJYDEwlzHKhs02mj2bPJByhU=",
67 "owner": "NixOS", 67 "owner": "NixOS",
68 "repo": "nixpkgs", 68 "repo": "nixpkgs",
69 "rev": "162d6dd876a87b9883b79201b6a56f1f9b4d9a7f", 69 "rev": "d4c6319803ecfa09d86b8e136722fad7566675d6",
70 "type": "github" 70 "type": "github"
71 }, 71 },
72 "original": { 72 "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 @@
1final: prev:
2let
3 overrides = {
4 "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY=" = { self }: {
5 broken = !(self.kernel.kernelAtLeast "3.10" && self.kernel.kernelOlder "5.16");
6 latestCompatibleLinuxPackages = final.linuxPackages_5_15;
7 };
8 };
9in {
10 linuxKernel = prev.linuxKernel // {
11 packagesFor = kernel_: (prev.linuxKernel.packagesFor kernel_).extend (self: super: rec {
12 zfsUnstable = super.zfsUnstable.overrideAttrs (oldAttrs: {
13 meta = oldAttrs.meta // (overrides.${oldAttrs.src.outputHash} or (_: {})) { inherit self; };
14 });
15 zfsStable = super.zfsUnstable.overrideAttrs (oldAttrs: {
16 meta = oldAttrs.meta // (overrides.${oldAttrs.src.outputHash} or (_: {})) { inherit self; };
17 });
18 zfs = zfsStable;
19 });
20 };
21}