lol

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

authored by

Ryan Lahfa and committed by
GitHub
6f2581d3 4b8623e2

+9 -4
+3
pkgs/os-specific/linux/zfs/generic.nix
··· 83 83 substituteInPlace ./udev/vdev_id \ 84 84 --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ 85 85 "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" 86 + substituteInPlace ./config/zfs-build.m4 \ 87 + --replace "bashcompletiondir=/etc/bash_completion.d" \ 88 + "bashcompletiondir=$out/share/bash-completion/completions" 86 89 '' else '' 87 90 substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)/zfs" "$out/etc/zfs" 88 91
+6 -4
pkgs/os-specific/linux/zfs/unstable.nix
··· 12 12 callPackage ./generic.nix args { 13 13 # check the release notes for compatible kernels 14 14 kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM 15 - then kernel.kernelOlder "6.5" 15 + then kernel.kernelOlder "6.6" 16 16 else kernel.kernelOlder "6.2"; 17 17 18 - latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1; 18 + latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM 19 + then linuxKernel.packages.linux_6_5 20 + else linuxKernel.packages.linux_6_1; 19 21 20 22 # this package should point to a version / git revision compatible with the latest kernel release 21 23 # IMPORTANT: Always use a tagged release candidate or commits from the 22 24 # zfs-<version>-staging branch, because this is tested by the OpenZFS 23 25 # maintainers. 24 - version = "2.2.0-rc4"; 26 + version = "2.2.0-rc5"; 25 27 26 - sha256 = "sha256-zTG6iujlWB2H8j6i+t59zdyztoDFk373AjgHzC8x5mQ="; 28 + sha256 = "sha256-97dTmSneAuhDR7LrJxG7/xPpI1hGv5mDDuq8HRTZKx0="; 27 29 28 30 isUnstable = true; 29 31 }