Unverified Commit 63aafed9 authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

zfs_2_2: 2.2.5 -> 2.2.6 (#339696)

parents 5dd6efea 636134b8

pkgs/os-specific/linux/zfs/2_2.nix

+3 −3
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ callPackage ./generic.nix args { 
  # this attribute is the correct one for this package.

  kernelModuleAttribute = "zfs_2_2";

  # check the release notes for compatible kernels

  kernelCompatible = kernel: kernel.kernelOlder "6.10";

  kernelCompatible = kernel: kernel.kernelOlder "6.11";



  # this package should point to the latest release.

  version = "2.2.5";

  version = "2.2.6";



  tests = [

    nixosTests.zfs.installer
@@ -26,5 +26,5 @@ callPackage ./generic.nix args { 


  maintainers = with lib.maintainers; [ adamcstephens amarshall ];



  hash = "sha256-BkwcNPk+jX8CXp5xEVrg4THof7o/5j8RY2SY6+IPNTg=";

  hash = "sha256-wkgoYg6uQOHVq8a9sJXzO/QXJ6q28l7JXWkC+BFvOb0=";

}

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

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ let 


      # Add Bash completions.

      install -v -m444 -D -t $out/share/bash-completion/completions contrib/bash_completion.d/zfs

    '' + optionalString (lib.versionOlder version "2.2.6") ''

      (cd $out/share/bash-completion/completions; ln -s zfs zpool)

    '';

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

+2 −2
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ callPackage ./generic.nix args { 
  # 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.5";

  version = "2.2.6";

  # rev = "";



  tests = [

    nixosTests.zfs.unstable

  ];



  hash = "sha256-BkwcNPk+jX8CXp5xEVrg4THof7o/5j8RY2SY6+IPNTg=";

  hash = "sha256-wkgoYg6uQOHVq8a9sJXzO/QXJ6q28l7JXWkC+BFvOb0=";

}