mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
zfs_unstable: Rename from zfsUnstable
This matches the naming of other zfs_* pkgs.
This commit is contained in:
parent
ce5b1e007e
commit
929fcf9335
|
@ -219,9 +219,9 @@ in
|
||||||
boot.zfs = {
|
boot.zfs = {
|
||||||
package = mkOption {
|
package = mkOption {
|
||||||
type = types.package;
|
type = types.package;
|
||||||
default = if cfgZfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs;
|
default = if cfgZfs.enableUnstable then pkgs.zfs_unstable else pkgs.zfs;
|
||||||
defaultText = literalExpression "if enableUnstable is enabled then pkgs.zfsUnstable 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.zfsUnstable` if you want to track the latest staging ZFS branch.";
|
description = lib.mdDoc "Configured ZFS userland tools package, use `pkgs.zfs_unstable` if you want to track the latest staging ZFS branch.";
|
||||||
};
|
};
|
||||||
|
|
||||||
modulePackage = mkOption {
|
modulePackage = mkOption {
|
||||||
|
|
|
@ -203,12 +203,12 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
unstable = makeZfsTest rec {
|
unstable = makeZfsTest rec {
|
||||||
zfsPackage = pkgs.zfsUnstable;
|
zfsPackage = pkgs.zfs_unstable;
|
||||||
kernelPackages = zfsPackage.latestCompatibleLinuxPackages;
|
kernelPackages = zfsPackage.latestCompatibleLinuxPackages;
|
||||||
};
|
};
|
||||||
|
|
||||||
unstableWithSystemdStage1 = makeZfsTest rec {
|
unstableWithSystemdStage1 = makeZfsTest rec {
|
||||||
zfsPackage = pkgs.zfsUnstable;
|
zfsPackage = pkgs.zfs_unstable;
|
||||||
kernelPackages = zfsPackage.latestCompatibleLinuxPackages;
|
kernelPackages = zfsPackage.latestCompatibleLinuxPackages;
|
||||||
enableSystemdStage1 = true;
|
enableSystemdStage1 = true;
|
||||||
};
|
};
|
||||||
|
|
|
@ -234,7 +234,7 @@ let
|
||||||
|
|
||||||
inherit maintainers;
|
inherit maintainers;
|
||||||
mainProgram = "zfs";
|
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.
|
# On NixOS set the option boot.zfs.enableUnstable.
|
||||||
broken = buildKernel && (kernelCompatible != null) && !kernelCompatible;
|
broken = buildKernel && (kernelCompatible != null) && !kernelCompatible;
|
||||||
};
|
};
|
||||||
|
|
|
@ -12,7 +12,7 @@ in
|
||||||
callPackage ./generic.nix args {
|
callPackage ./generic.nix args {
|
||||||
# You have to ensure that in `pkgs/top-level/linux-kernels.nix`
|
# You have to ensure that in `pkgs/top-level/linux-kernels.nix`
|
||||||
# this attribute is the correct one for this package.
|
# this attribute is the correct one for this package.
|
||||||
kernelModuleAttribute = "zfsUnstable";
|
kernelModuleAttribute = "zfs_unstable";
|
||||||
# check the release notes for compatible kernels
|
# check the release notes for compatible kernels
|
||||||
kernelCompatible = kernel.kernelOlder "6.9";
|
kernelCompatible = kernel.kernelOlder "6.9";
|
||||||
|
|
||||||
|
|
|
@ -1212,6 +1212,7 @@ mapAliases ({
|
||||||
|
|
||||||
zabbix40 = throw "'zabbix40' has been removed as it has reached end of life"; # Added 2024-01-07
|
zabbix40 = throw "'zabbix40' has been removed as it has reached end of life"; # Added 2024-01-07
|
||||||
zfsStable = zfs; # Added 2024-02-26
|
zfsStable = zfs; # Added 2024-02-26
|
||||||
|
zfsUnstable = zfs_unstable; # Added 2024-02-26
|
||||||
zinc = zincsearch; # Added 2023-05-28
|
zinc = zincsearch; # Added 2023-05-28
|
||||||
zkg = throw "'zkg' has been replaced by 'zeek'";
|
zkg = throw "'zkg' has been replaced by 'zeek'";
|
||||||
zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq"; }; }); # Added 2023-02-06
|
zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq"; }; }); # Added 2023-02-06
|
||||||
|
|
|
@ -28732,7 +28732,7 @@ 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";
|
||||||
};
|
};
|
||||||
zfsUnstable = callPackage ../os-specific/linux/zfs/unstable.nix {
|
zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix {
|
||||||
configFile = "user";
|
configFile = "user";
|
||||||
};
|
};
|
||||||
zfs = zfs_2_2;
|
zfs = zfs_2_2;
|
||||||
|
|
|
@ -569,7 +569,7 @@ in {
|
||||||
configFile = "kernel";
|
configFile = "kernel";
|
||||||
inherit pkgs kernel;
|
inherit pkgs kernel;
|
||||||
};
|
};
|
||||||
zfsUnstable = 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;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue