diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-23 12:02:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-23 12:02:04 +0000 |
| commit | 2c2c0379b759c234413de63478847266cdc8ed93 (patch) | |
| tree | 92ebd45d1cd2a17d5fb63ff5c6c006a4d8f25f7e /pkgs/os-specific/linux/zfs/generic.nix | |
| parent | 1026189bd67abfd6f7def1c697988217caafbc5c (diff) | |
| parent | a3b463e8874fe9182e758919eeb18bb44070097c (diff) | |
| download | nixlib-2c2c0379b759c234413de63478847266cdc8ed93.tar nixlib-2c2c0379b759c234413de63478847266cdc8ed93.tar.gz nixlib-2c2c0379b759c234413de63478847266cdc8ed93.tar.bz2 nixlib-2c2c0379b759c234413de63478847266cdc8ed93.tar.lz nixlib-2c2c0379b759c234413de63478847266cdc8ed93.tar.xz nixlib-2c2c0379b759c234413de63478847266cdc8ed93.tar.zst nixlib-2c2c0379b759c234413de63478847266cdc8ed93.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux/zfs/generic.nix')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/generic.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 7bb4a1b7496e..8adbb8cab8f9 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -202,15 +202,15 @@ stdenv'.mkDerivation { changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; license = lib.licenses.cddl; - # The case-block for TARGET_CPU has branches for only five CPU families, + # The case-block for TARGET_CPU has branches for only some CPU families, # which prevents ZFS from building on any other platform. Since the NixOS # `boot.zfs.enabled` property is `readOnly`, excluding platforms where ZFS # does not build is the only way to produce a NixOS installer on such # platforms. - # https://github.com/openzfs/zfs/blob/6a6bd493988c75331deab06e5352a9bed035a87d/config/always-arch.m4#L16 + # https://github.com/openzfs/zfs/blob/6723d1110f6daf93be93db74d5ea9f6b64c9bce5/config/always-arch.m4#L12 platforms = with lib.systems.inspect.patterns; - map (p: p // isLinux) [ isx86_32 isx86_64 isPower isAarch64 isSparc ]; + map (p: p // isLinux) ([ isx86_32 isx86_64 isPower isAarch64 isSparc ] ++ isArmv7); maintainers = with lib.maintainers; [ jcumming jonringer globin raitobezarius ]; mainProgram = "zfs"; |