zfsUnstable: 2.1.12 -> 2.2.0-rc2

pkgs/os-specific/linux/zfs/generic.nix

@@ -54,7 +54,7 @@ stdenv'.mkDerivation {
     inherit rev sha256;
   };
 
-  patches = [
+  patches = if isUnstable then [] else [
     (fetchpatch {
       name = "musl.patch";
       url = "https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a.patch";
@@ -82,20 +82,24 @@ stdenv'.mkDerivation {
     substituteInPlace ./config/user-systemd.m4    --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"
     substituteInPlace ./config/zfs-build.m4       --replace "\$sysconfdir/init.d"     "$out/etc/init.d" \
                                                   --replace "/etc/default"            "$out/etc/default"
+
+    # ZFS 2.2.0-rc1 compat: these got consolidated, so symlink them.
+    for dir in etc/zfs etc/systemd etc/systemd/system contrib/initramfs/{hooks,scripts,conf.d,conf-hooks.d,scripts/local-top}; do
+      if [ ! -f "./$dir/Makefile.am" ]; then
+        (cd "./$dir" && ln -s ../Makefile.am)
+      fi
+    done
+
     substituteInPlace ./etc/zfs/Makefile.am       --replace "\$(sysconfdir)"          "$out/etc"
 
     substituteInPlace ./contrib/initramfs/hooks/Makefile.am \
       --replace "/usr/share/initramfs-tools/hooks" "$out/usr/share/initramfs-tools/hooks"
     substituteInPlace ./contrib/initramfs/Makefile.am \
       --replace "/usr/share/initramfs-tools" "$out/usr/share/initramfs-tools"
-    substituteInPlace ./contrib/initramfs/scripts/Makefile.am \
-      --replace "/usr/share/initramfs-tools/scripts" "$out/usr/share/initramfs-tools/scripts"
     substituteInPlace ./contrib/initramfs/scripts/local-top/Makefile.am \
       --replace "/usr/share/initramfs-tools/scripts/local-top" "$out/usr/share/initramfs-tools/scripts/local-top"
     substituteInPlace ./contrib/initramfs/scripts/Makefile.am \
       --replace "/usr/share/initramfs-tools/scripts" "$out/usr/share/initramfs-tools/scripts"
-    substituteInPlace ./contrib/initramfs/scripts/local-top/Makefile.am \
-      --replace "/usr/share/initramfs-tools/scripts/local-top" "$out/usr/share/initramfs-tools/scripts/local-top"
     substituteInPlace ./etc/systemd/system/Makefile.am \
       --replace '$(DESTDIR)$(systemdunitdir)' "$out"'$(DESTDIR)$(systemdunitdir)'
 
@@ -104,9 +108,12 @@ stdenv'.mkDerivation {
     substituteInPlace ./contrib/initramfs/conf-hooks.d/Makefile.am \
       --replace "/usr/share/initramfs-tools/conf-hooks.d" "$out/usr/share/initramfs-tools/conf-hooks.d"
 
-    substituteInPlace ./cmd/vdev_id/vdev_id \
-      --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \
-      "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}"
+    # ZFS 2.2.0-rc1 compat: removed vdev_id
+    if [ -f ./cmd/vdev_id/vdev_id ]; then
+      substituteInPlace ./cmd/vdev_id/vdev_id \
+        --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \
+        "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}"
+    fi
   '';
 
   nativeBuildInputs = [ autoreconfHook269 nukeReferences ]
@@ -225,7 +232,7 @@ stdenv'.mkDerivation {
       with lib.systems.inspect.patterns;
       map (p: p // isLinux) [ isx86_32 isx86_64 isPower isAarch64 isSparc ];
 
-    maintainers = with lib.maintainers; [ jcumming jonringer globin raitobezarius ];
+    maintainers = with lib.maintainers; [ jcumming jonringer globin raitobezarius numinit ];
     mainProgram = "zfs";
     # If your Linux kernel version is not yet supported by zfs, try zfsUnstable.
     # On NixOS set the option boot.zfs.enableUnstable.

pkgs/os-specific/linux/zfs/unstable.nix

@@ -15,21 +15,21 @@ callPackage ./generic.nix args {
   #   zfs-2.1.9<=x<=2.1.10 is broken with aarch64-linux-6.2
   #   for future releases, please delete this condition.
   kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM
-    then kernel.kernelOlder "6.4"
+    then kernel.kernelOlder "6.5"
     else kernel.kernelOlder "6.2";
 
   latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM then
-    linuxKernel.packages.linux_6_3
+    linuxKernel.packages.linux_6_4
   else
     linuxKernel.packages.linux_6_1;
 
   # this package should point to a version / git revision compatible with the latest kernel release
   # IMPORTANT: Always use a tagged release candidate or commits from the
   # zfs-<version>-staging branch, because this is tested by the OpenZFS
   # maintainers.
-  version = "2.1.12";
+  version = "2.2.0-rc2";
 
-  sha256 = "eYUR5d4gpTrlFu6j1uL83DWL9uPGgAUDRdSEb73V5i4=";
+  sha256 = "rOgIp8ZvagPM2JVEPTdNInMd1jNsiHtEtGQvC317R0w=";
 
   isUnstable = true;
 }