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.

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

zfs_2_3: init at 2.3.0 #373599

Merged
merged 2 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions nixos/tests/zfs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,11 @@ in {
kernelPackages = pkgs.linuxPackages;
};

series_2_3 = makeZfsTest {
zfsPackage = pkgs.zfs_2_3;
kernelPackages = pkgs.linuxPackages;
};

unstable = makeZfsTest rec {
zfsPackage = pkgs.zfs_unstable;
kernelPackages = pkgs.linuxPackages;
Expand Down
33 changes: 33 additions & 0 deletions pkgs/os-specific/linux/zfs/2_3.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
callPackage,
kernel ? null,
stdenv,
lib,
nixosTests,
...
}@args:

let
stdenv' = if kernel == null then stdenv else kernel.stdenv;
in
callPackage ./generic.nix args {
# You have to ensure that in `pkgs/top-level/linux-kernels.nix`
# this attribute is the correct one for this package.
kernelModuleAttribute = "zfs_2_3";
# check the release notes for compatible kernels
kernelCompatible = kernel: kernel.kernelOlder "6.13";

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

tests = {
inherit (nixosTests.zfs) installer series_2_3;
};

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

hash = "sha256-ZWWrVwMP/DSSIxuXp6GuHCD0wiRekHbRXFGaclqd/ns=";
}
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 @@ -21,14 +21,14 @@ 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.3.0-rc5";
version = "2.3.0";
# rev = "";

tests = {
inherit (nixosTests.zfs) unstable;
};

hash = "sha256-gTpj1hYEkx+f/VvvfgeZeqwUhBVQyOIMKic8AaiwYzg=";
hash = "sha256-ZWWrVwMP/DSSIxuXp6GuHCD0wiRekHbRXFGaclqd/ns=";

extraLongDescription = ''
This is "unstable" ZFS, and will usually be a pre-release version of ZFS.
Expand Down
4 changes: 4 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12580,12 +12580,16 @@ with pkgs;
zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix {
configFile = "user";
};
zfs_2_3 = callPackage ../os-specific/linux/zfs/2_3.nix {
configFile = "user";
};
zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix {
configFile = "user";
};
})
zfs_2_1
zfs_2_2
zfs_2_3
zfs_unstable;
zfs = zfs_2_2;

Expand Down
4 changes: 4 additions & 0 deletions pkgs/top-level/linux-kernels.nix
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,10 @@ in {
configFile = "kernel";
inherit pkgs kernel;
};
zfs_2_3 = callPackage ../os-specific/linux/zfs/2_3.nix {
configFile = "kernel";
inherit pkgs kernel;
};
zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix {
configFile = "kernel";
inherit pkgs kernel;
Expand Down