Skip to content

Commit

Permalink
zfs_2_2: 2.2.5 -> 2.2.6
Browse files Browse the repository at this point in the history
- This release brings official support for Kernel 6.10
- Also update zfs_unstable as it would otherwise lag behind
- Upstream now links `zpool` completion, so only do so on older zfs
  (since we still need to support 2.1.x)

Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.2.6
  • Loading branch information
amarshall committed Sep 5, 2024
1 parent 12228ff commit 636134b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/zfs/2_2.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ callPackage ./generic.nix args {
# this attribute is the correct one for this package.
kernelModuleAttribute = "zfs_2_2";
# check the release notes for compatible kernels
kernelCompatible = kernel: kernel.kernelOlder "6.10";
kernelCompatible = kernel: kernel.kernelOlder "6.11";

# this package should point to the latest release.
version = "2.2.5";
version = "2.2.6";

tests = [
nixosTests.zfs.installer
Expand All @@ -26,5 +26,5 @@ callPackage ./generic.nix args {

maintainers = with lib.maintainers; [ adamcstephens amarshall ];

hash = "sha256-BkwcNPk+jX8CXp5xEVrg4THof7o/5j8RY2SY6+IPNTg=";
hash = "sha256-wkgoYg6uQOHVq8a9sJXzO/QXJ6q28l7JXWkC+BFvOb0=";
}
1 change: 1 addition & 0 deletions pkgs/os-specific/linux/zfs/generic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ let
# Add Bash completions.
install -v -m444 -D -t $out/share/bash-completion/completions contrib/bash_completion.d/zfs
'' + optionalString (lib.versionOlder version "2.2.6") ''
(cd $out/share/bash-completion/completions; ln -s zfs zpool)
'';

Expand Down
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/zfs/unstable.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ callPackage ./generic.nix args {
# 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.2.5";
version = "2.2.6";
# rev = "";

tests = [
nixosTests.zfs.unstable
];

hash = "sha256-BkwcNPk+jX8CXp5xEVrg4THof7o/5j8RY2SY6+IPNTg=";
hash = "sha256-wkgoYg6uQOHVq8a9sJXzO/QXJ6q28l7JXWkC+BFvOb0=";
}

0 comments on commit 636134b

Please sign in to comment.