movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-09 12:05:50 +03:00
Code Activity

zfs_2_3: init at 2.3.0 (#373599)

Browse source
This commit is contained in:
Adam C. Stephens 2025-01-14 13:18:44 -05:00 • committed by GitHub
commit c44bf8b674
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 48 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nixos/tests/zfs.nix
View file

@ -202,6 +202,11 @@ in {
kernelPackages = pkgs.linuxPackages; kernelPackages = pkgs.linuxPackages;
}; };
series_2_3 = makeZfsTest {
zfsPackage = pkgs.zfs_2_3;
kernelPackages = pkgs.linuxPackages;
};
unstable = makeZfsTest rec { unstable = makeZfsTest rec {
zfsPackage = pkgs.zfs_unstable; zfsPackage = pkgs.zfs_unstable;
kernelPackages = pkgs.linuxPackages; kernelPackages = pkgs.linuxPackages;

33
pkgs/os-specific/linux/zfs/2_3.nix Normal file
View file

@ -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
pkgs/os-specific/linux/zfs/unstable.nix
View file

@ -21,14 +21,14 @@ callPackage ./generic.nix args {
# IMPORTANT: Always use a tagged release candidate or commits from the # IMPORTANT: Always use a tagged release candidate or commits from the
# zfs-<version>-staging branch, because this is tested by the OpenZFS # zfs-<version>-staging branch, because this is tested by the OpenZFS
# maintainers. # maintainers.
version = "2.3.0-rc5"; version = "2.3.0";
# rev = ""; # rev = "";
tests = { tests = {
inherit (nixosTests.zfs) unstable; inherit (nixosTests.zfs) unstable;
}; };
hash = "sha256-gTpj1hYEkx+f/VvvfgeZeqwUhBVQyOIMKic8AaiwYzg="; hash = "sha256-ZWWrVwMP/DSSIxuXp6GuHCD0wiRekHbRXFGaclqd/ns=";
extraLongDescription = '' extraLongDescription = ''
This is "unstable" ZFS, and will usually be a pre-release version of ZFS. This is "unstable" ZFS, and will usually be a pre-release version of ZFS.

4
pkgs/top-level/all-packages.nix
View file

@ -12556,12 +12556,16 @@ with pkgs;
zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix { zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix {
configFile = "user"; configFile = "user";
}; };
zfs_2_3 = callPackage ../os-specific/linux/zfs/2_3.nix {
configFile = "user";
};
zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix { zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix {
configFile = "user"; configFile = "user";
}; };
}) })
zfs_2_1 zfs_2_1
zfs_2_2 zfs_2_2
zfs_2_3
zfs_unstable; zfs_unstable;
zfs = zfs_2_2; zfs = zfs_2_2;

4
pkgs/top-level/linux-kernels.nix
View file

@ -591,6 +591,10 @@ in {
configFile = "kernel"; configFile = "kernel";
inherit pkgs 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 { zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix {
configFile = "kernel"; configFile = "kernel";
inherit pkgs kernel; inherit pkgs kernel;