colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zfs_unstable: Rename from zfsUnstable

Browse Source 
This matches the naming of other zfs_* pkgs.
This commit is contained in:
Andrew Marshall 2024-02-27 18:27:39 -05:00
parent ce5b1e007e
commit 929fcf9335
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/tasks/filesystems/zfs.nix
View File

@ -219,9 +219,9 @@ in
boot.zfs = {
package = mkOption {
type = types.package;
default = if cfgZfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs;
defaultText = literalExpression "if enableUnstable is enabled then pkgs.zfsUnstable else pkgs.zfs";
description = lib.mdDoc "Configured ZFS userland tools package, use `pkgs.zfsUnstable` if you want to track the latest staging ZFS branch.";
default = if cfgZfs.enableUnstable then pkgs.zfs_unstable else pkgs.zfs;
defaultText = literalExpression "if enableUnstable is enabled then pkgs.zfs_unstable else pkgs.zfs";
description = lib.mdDoc "Configured ZFS userland tools package, use `pkgs.zfs_unstable` if you want to track the latest staging ZFS branch.";
};
modulePackage = mkOption {

4
nixos/tests/zfs.nix
View File

@ -203,12 +203,12 @@ in {
};
unstable = makeZfsTest rec {
zfsPackage = pkgs.zfsUnstable;
zfsPackage = pkgs.zfs_unstable;
kernelPackages = zfsPackage.latestCompatibleLinuxPackages;
};
unstableWithSystemdStage1 = makeZfsTest rec {
zfsPackage = pkgs.zfsUnstable;
zfsPackage = pkgs.zfs_unstable;
kernelPackages = zfsPackage.latestCompatibleLinuxPackages;
enableSystemdStage1 = true;
};

2
pkgs/os-specific/linux/zfs/generic.nix
View File

@ -234,7 +234,7 @@ let
inherit maintainers;
mainProgram = "zfs";
# If your Linux kernel version is not yet supported by zfs, try zfsUnstable.
# If your Linux kernel version is not yet supported by zfs, try zfs_unstable.
# On NixOS set the option boot.zfs.enableUnstable.
broken = buildKernel && (kernelCompatible != null) && !kernelCompatible;
};

2
pkgs/os-specific/linux/zfs/unstable.nix
View File

@ -12,7 +12,7 @@ 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 = "zfsUnstable";
kernelModuleAttribute = "zfs_unstable";
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelOlder "6.9";

1
pkgs/top-level/aliases.nix
View File

@ -1212,6 +1212,7 @@ mapAliases ({
zabbix40 = throw "'zabbix40' has been removed as it has reached end of life"; # Added 2024-01-07
zfsStable = zfs; # Added 2024-02-26
zfsUnstable = zfs_unstable; # Added 2024-02-26
zinc = zincsearch; # Added 2023-05-28
zkg = throw "'zkg' has been replaced by 'zeek'";
zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq"; }; }); # Added 2023-02-06

2
pkgs/top-level/all-packages.nix
View File

@ -28732,7 +28732,7 @@ with pkgs;
zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix {
configFile = "user";
};
zfsUnstable = callPackage ../os-specific/linux/zfs/unstable.nix {
zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix {
configFile = "user";
};
zfs = zfs_2_2;

2
pkgs/top-level/linux-kernels.nix
View File

@ -569,7 +569,7 @@ in {
configFile = "kernel";
inherit pkgs kernel;
};
zfsUnstable = callPackage ../os-specific/linux/zfs/unstable.nix {
zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix {
configFile = "kernel";
inherit pkgs kernel;
};