Unverified Commit 6f2581d3 authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #259625 from adamcstephens/zfsUnstable/2.2.0-rc5

parents 4b8623e2 37c77680

pkgs/os-specific/linux/zfs/generic.nix

+3 −0
Original line number Diff line number Diff line
@@ -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"

pkgs/os-specific/linux/zfs/unstable.nix

+6 −4
Original line number Diff line number Diff line
@@ -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;

}