diff options
| author | Adam Stephens <adam@valkor.net> | 2023-10-07 16:14:09 -0400 |
|---|---|---|
| committer | Adam Stephens <adam@valkor.net> | 2023-10-10 23:49:54 -0400 |
| commit | 37c7768047edc6c6f5acb0bbe513d2ce31da2aa8 (patch) | |
| tree | d547e1230e664813be6b89ff066f2aa3d49b9f5e /pkgs/os-specific/linux/zfs | |
| parent | 679733b3adb6ab06154adb93c345e75fd3f1c2ab (diff) | |
zfsUnstable: 2.2.0-rc4 -> 2.2.0-rc5
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/generic.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/zfs/unstable.nix | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 41aa909532fd3..1065ea998dec4 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -83,6 +83,9 @@ stdenv'.mkDerivation { substituteInPlace ./udev/vdev_id \ --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" + substituteInPlace ./config/zfs-build.m4 \ + --replace "bashcompletiondir=/etc/bash_completion.d" \ + "bashcompletiondir=$out/share/bash-completion/completions" '' else '' substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)/zfs" "$out/etc/zfs" diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 45b7dd6c74789..23882322c0930 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -12,18 +12,20 @@ in callPackage ./generic.nix args { # check the release notes for compatible kernels kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM - then kernel.kernelOlder "6.5" + then kernel.kernelOlder "6.6" else kernel.kernelOlder "6.2"; - latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1; + latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM + then linuxKernel.packages.linux_6_5 + else linuxKernel.packages.linux_6_1; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the # zfs-<version>-staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.2.0-rc4"; + version = "2.2.0-rc5"; - sha256 = "sha256-zTG6iujlWB2H8j6i+t59zdyztoDFk373AjgHzC8x5mQ="; + sha256 = "sha256-97dTmSneAuhDR7LrJxG7/xPpI1hGv5mDDuq8HRTZKx0="; isUnstable = true; } |