summary refs log tree commit diff
diff options
context:
space:
mode:
authortoastal <toastal@posteo.net>2023-07-31 10:43:51 +0700
committertoastal <toastal@posteo.net>2023-08-21 19:43:22 +0700
commitd687c82885fd22b4bb2df59161847b0a5f57394e (patch)
treed3c69b29bdeec2a448a336844fc5f53c2d61ed4a
parentc5d067d0f23a3412312f036a315bd3e2a8970e9b (diff)
downloadnixpkgs-d687c82885fd22b4bb2df59161847b0a5f57394e.tar
nixpkgs-d687c82885fd22b4bb2df59161847b0a5f57394e.tar.gz
nixpkgs-d687c82885fd22b4bb2df59161847b0a5f57394e.tar.bz2
nixpkgs-d687c82885fd22b4bb2df59161847b0a5f57394e.tar.lz
nixpkgs-d687c82885fd22b4bb2df59161847b0a5f57394e.tar.xz
nixpkgs-d687c82885fd22b4bb2df59161847b0a5f57394e.tar.zst
nixpkgs-d687c82885fd22b4bb2df59161847b0a5f57394e.zip
zfsUnstable: 2.1.12 → 2.1.13-unstable-2023-08-02
https://github.com/openzfs/zfs/commits/zfs-2.1.13-staging

With anecdote from a NixOS user that it’s working
https://github.com/openzfs/zfs/pull/15125

…working for me as well as I built+booted from this commit.
-rw-r--r--pkgs/os-specific/linux/zfs/unstable.nix11
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
index 832eb66c02e..1bb882de712 100644
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@@ -12,18 +12,21 @@ in
 callPackage ./generic.nix args {
   # check the release notes for compatible kernels
   kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM
-    then kernel.kernelOlder "6.4"
+    then kernel.kernelOlder "6.5"
     else kernel.kernelOlder "6.2";
 
-  latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1;
+  latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM
+    then 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.1.13-unstable-2023-08-02";
+  rev = "245850b66c1e93ec19744ca55aae143d007d2c32";
 
-  sha256 = "eYUR5d4gpTrlFu6j1uL83DWL9uPGgAUDRdSEb73V5i4=";
+  sha256 = "TtgKV02W8OfU6hssULF/IoFXAPHBTvTKXn5hJ/RGAc0=";
 
   isUnstable = true;
 }