63 lines
2.3 KiB
Diff
63 lines
2.3 KiB
Diff
From 5bae92a7155b885619cbab9d3ddae91aa59e91cc Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
|
Date: Tue, 4 Oct 2022 14:18:13 +0200
|
|
Subject: [PATCH] =?UTF-8?q?zfs:=202.1.5=20=E2=86=92=202.1.6?=
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
---
|
|
pkgs/os-specific/linux/zfs/default.nix | 18 +++++++++---------
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
|
|
index 5e92e63553d0c..080a198b0f408 100644
|
|
--- a/pkgs/os-specific/linux/zfs/default.nix
|
|
+++ b/pkgs/os-specific/linux/zfs/default.nix
|
|
@@ -16,7 +16,7 @@
|
|
, enablePython ? true
|
|
|
|
# for determining the latest compatible linuxPackages
|
|
-, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15
|
|
+, linuxPackages_5_19 ? pkgs.linuxKernel.packages.linux_5_19
|
|
}:
|
|
|
|
let
|
|
@@ -216,28 +216,28 @@ in {
|
|
# to be adapted
|
|
zfsStable = common {
|
|
# check the release notes for compatible kernels
|
|
- kernelCompatible = kernel.kernelOlder "5.19";
|
|
- latestCompatibleLinuxPackages = linuxPackages_5_15;
|
|
+ kernelCompatible = kernel.kernelOlder "5.20";
|
|
+ latestCompatibleLinuxPackages = linuxPackages_5_19;
|
|
|
|
# this package should point to the latest release.
|
|
- version = "2.1.5";
|
|
+ version = "2.1.6";
|
|
|
|
- sha256 = "sha256-a9rmuPO8R8UfxdHvwjfFuYRGn97a1MPmLZRvr3l0swE=";
|
|
+ sha256 = "sha256-gd5WlNtnoSiVj4sKUGf0WhR7Z1GPebwu3Z1mkNsoC/I=";
|
|
};
|
|
|
|
zfsUnstable = common {
|
|
# check the release notes for compatible kernels
|
|
- kernelCompatible = kernel.kernelOlder "5.19";
|
|
- latestCompatibleLinuxPackages = linuxPackages_5_15;
|
|
+ kernelCompatible = kernel.kernelOlder "5.20";
|
|
+ latestCompatibleLinuxPackages = linuxPackages_5_19;
|
|
|
|
# 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.5";
|
|
+ version = "2.1.6";
|
|
# rev = "0000000000000000000000000000000000000000";
|
|
|
|
- sha256 = "sha256-a9rmuPO8R8UfxdHvwjfFuYRGn97a1MPmLZRvr3l0swE=";
|
|
+ sha256 = "sha256-gd5WlNtnoSiVj4sKUGf0WhR7Z1GPebwu3Z1mkNsoC/I=";
|
|
|
|
isUnstable = true;
|
|
};
|