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

[Backport release-24.05] zfs{2_2,unstable}: 2.2.4 -> 2.2.5 #340074

Merged
merged 3 commits into from
Sep 6, 2024
Merged

[Backport release-24.05] zfs{2_2,unstable}: 2.2.4 -> 2.2.5 #340074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6161f0c
zfs: move maintainer adamcstephens to 2.2 only
adamcstephens Jul 19, 2024
33cd2eb
zfs_2_2: 2.2.4 -> 2.2.5
amarshall Aug 6, 2024
0d62076
zfs-unstable: 2.2.4-unstable-2024-07-15 -> 2.2.5
amarshall Aug 6, 2024
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
9 changes: 6 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
@@ -1,6 +1,7 @@
{ callPackage
, kernel ? null
, stdenv
, lib
, linuxKernel
, nixosTests
, ...
Expand All @@ -14,17 +15,19 @@ 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.kernelOlder "6.9";
kernelCompatible = kernel.kernelOlder "6.10";

latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_6;

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

tests = [
nixosTests.zfs.installer
nixosTests.zfs.series_2_2
];

hash = "sha256-SSp/1Tu1iGx5UDcG4j0k2fnYxK05cdE8gzfSn8DU5Z4=";
maintainers = with lib.maintainers; [ adamcstephens amarshall ];

hash = "sha256-BkwcNPk+jX8CXp5xEVrg4THof7o/5j8RY2SY6+IPNTg=";
}
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/zfs/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ let
, isUnstable ? false
, latestCompatibleLinuxPackages
, kernelCompatible ? null
, maintainers ? (with lib.maintainers; [ amarshall adamcstephens ])
, maintainers ? (with lib.maintainers; [ amarshall ])
, tests
}@innerArgs:

Expand Down
8 changes: 4 additions & 4 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 @@ -14,21 +14,21 @@ callPackage ./generic.nix args {
# this attribute is the correct one for this package.
kernelModuleAttribute = "zfs_unstable";
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelOlder "6.9";
kernelCompatible = kernel.kernelOlder "6.11";

latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_6;
latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_10;

# 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.2.4";
version = "2.2.5";
# rev = "";

isUnstable = true;
tests = [
nixosTests.zfs.unstable
];

hash = "sha256-SSp/1Tu1iGx5UDcG4j0k2fnYxK05cdE8gzfSn8DU5Z4=";
hash = "sha256-BkwcNPk+jX8CXp5xEVrg4THof7o/5j8RY2SY6+IPNTg=";
}
Loading