diff options
| author | Adam C. Stephens <2071575+adamcstephens@users.noreply.github.com> | 2024-03-01 10:09:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-01 10:09:12 -0500 |
| commit | b52452f8c780c66c917fb51c3de14ca28f87aaa9 (patch) | |
| tree | 6c8b240549a23d64b42fd967fe7e1b174f25333c /pkgs/top-level/linux-kernels.nix | |
| parent | 8147f49e28c9dd5219944095396212a59b8d530c (diff) | |
| parent | 29a1b11f916e5994f7ad23039ae21945df99247c (diff) | |
| download | nixlib-b52452f8c780c66c917fb51c3de14ca28f87aaa9.tar nixlib-b52452f8c780c66c917fb51c3de14ca28f87aaa9.tar.gz nixlib-b52452f8c780c66c917fb51c3de14ca28f87aaa9.tar.bz2 nixlib-b52452f8c780c66c917fb51c3de14ca28f87aaa9.tar.lz nixlib-b52452f8c780c66c917fb51c3de14ca28f87aaa9.tar.xz nixlib-b52452f8c780c66c917fb51c3de14ca28f87aaa9.tar.zst nixlib-b52452f8c780c66c917fb51c3de14ca28f87aaa9.zip | |
Merge pull request #291951 from amarshall/zfs-pkgs-renaming
zfs: rename zfsStable -> zfs_2_2; zfsUnstable -> zfs_unstable; remove enableUnstable option in favor of package
Diffstat (limited to 'pkgs/top-level/linux-kernels.nix')
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 659ef01910ab..b0400cfeab01 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -557,15 +557,15 @@ 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; }; - zfsUnstable = callPackage ../os-specific/linux/zfs/unstable.nix { + zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix { configFile = "kernel"; inherit pkgs kernel; }; - zfs = zfsStable; + zfs = zfs_2_2; can-isotp = callPackage ../os-specific/linux/can-isotp { }; |