Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zfs_2_2: 2.2.5 -> 2.2.6 #339696

Merged
merged 1 commit into from
Sep 5, 2024
Merged

zfs_2_2: 2.2.5 -> 2.2.6 #339696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/zfs/2_2.nix
View file
Open in desktop
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
View file
Open in desktop
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") ''
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has broken the 2.1 build, btw.

/nix/store/ffr5qkpiyl0bdz15w1b8hmqnclw6938h-stdenv-linux/setup: line 229: cd: /nix/store/hn1s5py5wfinj0k1wq7ghhzwv19ahc72-zfs-kernel-2.1.15-6.6.49/share/bash-completion/completions: No such file or directory

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, this is not conditional on buildUser. In fact, I actually think the line above it isn't even necessary in 2.2.*. Will add this to my zfs fixes pr: #340165

(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
View file
Open in desktop
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=";
}