alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #178632 from Madouura/dev/zfs

Browse source 
zfs: 2.1.4 -> 2.1.5
This commit is contained in:
Florian Klink 2022-06-24 11:54:17 +07:00 committed by GitHub
parent b83b1763a6 8cfcee74b1
commit 477964801a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
View file

@ -262,6 +262,12 @@
and require manual remediation.
</para>
</listitem>
<listitem>
<para>
<literal>zfs</literal> was updated from 2.1.4 to 2.1.5,
enabling it to be used with Linux kernel 5.18.
</para>
</listitem>
<listitem>
<para>
memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2.

2
nixos/doc/manual/release-notes/rl-2211.section.md
View file

@ -102,6 +102,8 @@ Use `configure.packages` instead.
- Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation.
- `zfs` was updated from 2.1.4 to 2.1.5, enabling it to be used with Linux kernel 5.18.
- memtest86+ was updated from 5.00-coreboot-002 to 6.00-beta2. It is now the upstream version from https://www.memtest.org/, as coreboot's fork is no longer available.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

18
pkgs/os-specific/linux/zfs/default.nix
View file

@ -16,7 +16,7 @@
, enablePython ? true
# for determining the latest compatible linuxPackages
, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15
, linuxPackages_5_18 ? pkgs.linuxKernel.packages.linux_5_18
}:
let
@ -216,28 +216,28 @@ in {
# to be adapted
zfsStable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelOlder "5.18";
latestCompatibleLinuxPackages = linuxPackages_5_15;
kernelCompatible = kernel.kernelOlder "5.19";
latestCompatibleLinuxPackages = linuxPackages_5_18;
# this package should point to the latest release.
version = "2.1.4";
version = "2.1.5";
sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4=";
sha256 = "sha256-a9rmuPO8R8UfxdHvwjfFuYRGn97a1MPmLZRvr3l0swE=";
};
zfsUnstable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelOlder "5.18";
latestCompatibleLinuxPackages = linuxPackages_5_15;
kernelCompatible = kernel.kernelOlder "5.19";
latestCompatibleLinuxPackages = linuxPackages_5_18;
# 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.4";
version = "2.1.5";
# rev = "0000000000000000000000000000000000000000";
sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4=";
sha256 = "sha256-a9rmuPO8R8UfxdHvwjfFuYRGn97a1MPmLZRvr3l0swE=";
isUnstable = true;
};