cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

zfs_2_2: Rename from zfsStable

Browse source 
The `zfs` alias already has equivalent semantics. Instead, make this
like zfs_2_1 so folks who want to pin a specific release series can do
so easily and clearly to have more control over when more substantial
updates occur.

Rename all tests to match the pkg attr they are testing.
This commit is contained in:
Andrew Marshall 2024-01-27 11:15:29 -05:00
parent d06dccfb4d
commit dcff4f8318
5 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/tests/zfs.nix
View file

@ -192,22 +192,22 @@ let
in {
# maintainer: @raitobezarius
series_2_1 = makeZfsTest "2.1-series" {
series_2_1 = makeZfsTest "zfs_2_1" {
zfsPackage = pkgs.zfs_2_1;
kernelPackages = pkgs.linuxPackages;
};
stable = makeZfsTest "stable" {
zfsPackage = pkgs.zfsStable;
series_2_2 = makeZfsTest "zfs_2_2" {
zfsPackage = pkgs.zfs_2_2;
kernelPackages = pkgs.linuxPackages;
};
unstable = makeZfsTest "unstable" rec {
unstable = makeZfsTest "zfsUnstable" rec {
zfsPackage = pkgs.zfsUnstable;
kernelPackages = zfsPackage.latestCompatibleLinuxPackages;
};
unstableWithSystemdStage1 = makeZfsTest "unstable" rec {
unstableWithSystemdStage1 = makeZfsTest "zfsUnstable" rec {
zfsPackage = pkgs.zfsUnstable;
kernelPackages = zfsPackage.latestCompatibleLinuxPackages;
enableSystemdStage1 = true;

4
pkgs/os-specific/linux/zfs/stable.nix → pkgs/os-specific/linux/zfs/2_2.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 = "zfs";
kernelModuleAttribute = "zfs_2_2";
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelOlder "6.8";
@ -23,7 +23,7 @@ callPackage ./generic.nix args {
tests = [
nixosTests.zfs.installer
nixosTests.zfs.stable
nixosTests.zfs.series_2_2
];
hash = "sha256-Bzkow15OitUUQ+mTYhCXgTrQl+ao/B4feleHY/rSSjg=";

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

@ -1211,6 +1211,7 @@ mapAliases ({
### Z ###
zabbix40 = throw "'zabbix40' has been removed as it has reached end of life"; # Added 2024-01-07
zfsStable = zfs; # 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

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

@ -28729,13 +28729,13 @@ with pkgs;
zfs_2_1 = callPackage ../os-specific/linux/zfs/2_1.nix {
configFile = "user";
};
zfsStable = callPackage ../os-specific/linux/zfs/stable.nix {
zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix {
configFile = "user";
};
zfsUnstable = callPackage ../os-specific/linux/zfs/unstable.nix {
configFile = "user";
};
zfs = zfsStable;
zfs = zfs_2_2;
### DATA

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

@ -565,7 +565,7 @@ in {
configFile = "kernel";
inherit pkgs kernel;
};
zfsStable = callPackage ../os-specific/linux/zfs/stable.nix {
zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix {
configFile = "kernel";
inherit pkgs kernel;
};
@ -573,7 +573,7 @@ in {
configFile = "kernel";
inherit pkgs kernel;
};
zfs = zfsStable;
zfs = zfs_2_2;
can-isotp = callPackage ../os-specific/linux/can-isotp { };