mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
zfs_2_4: init at 2.4.0
Update zfs_unstable as well. Not changing default zfs yet. This is also to make it easier to backport this PR while keeping the 25.11 default unchanged.
This commit is contained in:
parent
1306659b58
commit
f74c64bacf
5 changed files with 49 additions and 2 deletions
|
|
@ -209,6 +209,11 @@ in
|
|||
kernelPackages = pkgs.linuxPackages;
|
||||
};
|
||||
|
||||
series_2_4 = makeZfsTest {
|
||||
zfsPackage = pkgs.zfs_2_4;
|
||||
kernelPackages = pkgs.linuxPackages;
|
||||
};
|
||||
|
||||
unstable = makeZfsTest {
|
||||
zfsPackage = pkgs.zfs_unstable;
|
||||
kernelPackages = pkgs.linuxPackages;
|
||||
|
|
|
|||
34
pkgs/os-specific/linux/zfs/2_4.nix
Normal file
34
pkgs/os-specific/linux/zfs/2_4.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{
|
||||
callPackage,
|
||||
lib,
|
||||
nixosTests,
|
||||
stdenv,
|
||||
fetchpatch,
|
||||
...
|
||||
}@args:
|
||||
|
||||
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_4";
|
||||
|
||||
kernelMinSupportedMajorMinor = "4.18";
|
||||
kernelMaxSupportedMajorMinor = "6.18";
|
||||
|
||||
# this package should point to the latest release.
|
||||
version = "2.4.0";
|
||||
|
||||
tests = {
|
||||
inherit (nixosTests.zfs) series_2_4;
|
||||
}
|
||||
// lib.optionalAttrs stdenv.isx86_64 {
|
||||
inherit (nixosTests.zfs) installer;
|
||||
};
|
||||
|
||||
maintainers = with lib.maintainers; [
|
||||
adamcstephens
|
||||
amarshall
|
||||
];
|
||||
|
||||
hash = "sha256-v78Tn1Im9h8Sjd4XACYesPOD+hlUR3Cmg8XjcJXOuwM=";
|
||||
}
|
||||
|
|
@ -16,14 +16,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.4.0-rc5";
|
||||
version = "2.4.0";
|
||||
# rev = "";
|
||||
|
||||
tests = {
|
||||
inherit (nixosTests.zfs) unstable;
|
||||
};
|
||||
|
||||
hash = "sha256-HLxqzZjAFnaKqzy1CA3RecTdqpheR2pmFCTqMIcm+wk=";
|
||||
hash = "sha256-v78Tn1Im9h8Sjd4XACYesPOD+hlUR3Cmg8XjcJXOuwM=";
|
||||
|
||||
extraLongDescription = ''
|
||||
This is "unstable" ZFS, and will usually be a pre-release version of ZFS.
|
||||
|
|
|
|||
|
|
@ -10123,11 +10123,15 @@ with pkgs;
|
|||
zfs_2_3 = callPackage ../os-specific/linux/zfs/2_3.nix {
|
||||
configFile = "user";
|
||||
};
|
||||
zfs_2_4 = callPackage ../os-specific/linux/zfs/2_4.nix {
|
||||
configFile = "user";
|
||||
};
|
||||
zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix {
|
||||
configFile = "user";
|
||||
};
|
||||
})
|
||||
zfs_2_3
|
||||
zfs_2_4
|
||||
zfs_unstable
|
||||
;
|
||||
zfs = zfs_2_3;
|
||||
|
|
|
|||
|
|
@ -670,6 +670,10 @@ in
|
|||
configFile = "kernel";
|
||||
inherit pkgs kernel;
|
||||
};
|
||||
zfs_2_4 = callPackage ../os-specific/linux/zfs/2_4.nix {
|
||||
configFile = "kernel";
|
||||
inherit pkgs kernel;
|
||||
};
|
||||
zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix {
|
||||
configFile = "kernel";
|
||||
inherit pkgs kernel;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue