Unverified Commit 14e704d9 authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

Merge pull request #308642 from amarshall/zfs-2.2.4 

zfs_2_2: 2.2.3 -> 2.2.4; zfs_unstable: 2.2.3-unstable-2024-04-09 -> 2.2.4; python3Packages.py-libzfs: 22.12.4.2 -> 24.04.0
parents 9282d2eb a1dcb542

pkgs/development/python-modules/py-libzfs/default.nix

+10 −2
Original line number Diff line number Diff line
@@ -2,22 +2,30 @@ 
, stdenv

, buildPythonPackage

, fetchFromGitHub

, fetchpatch2

, cython_0

, zfs

}:



buildPythonPackage rec {

  pname = "py-libzfs";

  version = "22.12.4.2";

  version = "24.04.0";

  format = "setuptools";



  src = fetchFromGitHub {

    owner = "truenas";

    repo = pname;

    rev = "TS-${version}";

    hash = "sha256-vBLbjP1gQEQNsTLc2W6uRzCFHQXZp+jGiwE0Pe8VTuw=";

    hash = "sha256-Uiu0RNE06++iNWUNcKpbZvreT2D7/EqHlFZJXKe3F4A=";

  };



  patches = [

    (fetchpatch2 {

      url = "https://github.com/truenas/py-libzfs/commit/b5ffe1f1d6097df6e2f5cc6dd3c968872ec60804.patch";

      hash = "sha256-6r5hQ/o7c4vq4Tfh0l1WbeK3AuPvi+1wzkwkIn1qEes=";

    })

  ];



  nativeBuildInputs = [ cython_0 ];

  buildInputs = [ zfs ];

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

+4 −4
Original line number Diff line number Diff line
@@ -14,17 +14,17 @@ 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.kernelOlder "6.8";

  kernelCompatible = kernel.kernelOlder "6.9";



  latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_6;

  latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_8;



  # this package should point to the latest release.

  version = "2.2.3";

  version = "2.2.4";



  tests = [

    nixosTests.zfs.installer

    nixosTests.zfs.series_2_2

  ];



  hash = "sha256-Bzkow15OitUUQ+mTYhCXgTrQl+ao/B4feleHY/rSSjg=";

  hash = "sha256-SSp/1Tu1iGx5UDcG4j0k2fnYxK05cdE8gzfSn8DU5Z4=";

}

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

+4 −4
Original line number Diff line number Diff line
@@ -16,19 +16,19 @@ callPackage ./generic.nix args { 
  # check the release notes for compatible kernels

  kernelCompatible = kernel.kernelOlder "6.9";



  latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_6;

  latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_8;



  # 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.3-unstable-2024-04-09";

  rev = "28520cad2500b60ce8653e431990e33f77ff08f7";

  version = "2.2.4";

  # rev = "";



  isUnstable = true;

  tests = [

    nixosTests.zfs.unstable

  ];



  hash = "sha256-lGoiTmCWOxqACSYY0WA0gN6CN/1FyYhSVHmtYC1Izhg=";

  hash = "sha256-SSp/1Tu1iGx5UDcG4j0k2fnYxK05cdE8gzfSn8DU5Z4=";

}