zfs_2_2: 2.2.7 -> 2.2.8 (#416236) (97e55e7d) · Commits · nix / nixpkgs

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

+11 −11

Original line number	Diff line number	Diff line
		{
		callPackage,
		kernel ? null,
		stdenv,
		lib,
		nixosTests,
		stdenv,
		...
		}@args:

		let
		stdenv' = if kernel == null then stdenv else kernel.stdenv;
		in
		callPackage ./generic.nix args {
		# You have to ensure that in `pkgs/top-level/linux-kernels.nix`
		# 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.13";
		kernelCompatible = kernel: kernel.kernelOlder "6.16";

		# this package should point to the latest release.
		version = "2.2.7";
		version = "2.2.8";

		tests = {
		inherit (nixosTests.zfs) installer series_2_2;
		tests =
		{
		inherit (nixosTests.zfs) series_2_2;
		}
		// lib.optionalAttrs stdenv.isx86_64 {
		inherit (nixosTests.zfs) installer;
		};

		maintainers = with lib.maintainers; [
		@@ -29,5 +29,5 @@ callPackage ./generic.nix args {
		amarshall
		];

		hash = "sha256-nFOB0/7YK4e8ODoW9A+RQDkZHG/isp2EBOE48zTaMP4=";
		hash = "sha256-ZYgC8L4iI9ewaC7rkMFSRAKeTWr72N5aRP98VLL4oqo=";
		}

+8 −8

Original line number	Diff line number	Diff line
		{
		callPackage,
		kernel ? null,
		stdenv,
		lib,
		nixosTests,
		stdenv,
		...
		}@args:

		let
		stdenv' = if kernel == null then stdenv else kernel.stdenv;
		in
		callPackage ./generic.nix args {
		# You have to ensure that in `pkgs/top-level/linux-kernels.nix`
		# this attribute is the correct one for this package.
		@@ -20,8 +16,12 @@ callPackage ./generic.nix args {
		# this package should point to the latest release.
		version = "2.3.2";

		tests = {
		inherit (nixosTests.zfs) installer series_2_3;
		tests =
		{
		inherit (nixosTests.zfs) series_2_3;
		}
		// lib.optionalAttrs stdenv.isx86_64 {
		inherit (nixosTests.zfs) installer;
		};

		maintainers = with lib.maintainers; [

+26 −16

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ let
		pkg-config,
		curl,
		pam,
		nix-update-script,

		# Kernel dependencies
		kernel ? null,
		@@ -263,7 +264,8 @@ let

		outputs = [ "out" ] ++ optionals buildUser [ "dev" ];

		passthru = {
		passthru =
		{
		inherit kernel;
		inherit enableMail kernelModuleAttribute;
		latestCompatibleLinuxPackages = lib.warn "zfs.latestCompatibleLinuxPackages is deprecated and is now pointing at the default kernel. If using the stable LTS kernel (default `linuxPackages` is not possible then you must explicitly pin a specific kernel release. For example, `boot.kernelPackages = pkgs.linuxPackages_6_6`. Please be aware that non-LTS kernels are likely to go EOL before ZFS supports the latest supported non-LTS release, requiring manual intervention." linuxPackages;
		@@ -278,6 +280,14 @@ let
		) innerArgs;

		inherit tests;
		}
		// lib.optionalAttrs (kernelModuleAttribute != "zfs_unstable") {
		updateScript = nix-update-script {
		extraArgs = [
		"--version-regex=^zfs-(${lib.versions.major version}\\.${lib.versions.minor version}\\.[0-9]+)"
		"--override-filename=pkgs/os-specific/linux/zfs/${lib.versions.major version}_${lib.versions.minor version}.nix"
		];
		};
		};

		meta = {

+0 −5

Original line number	Diff line number	Diff line
		{
		callPackage,
		kernel ? null,
		stdenv,
		nixosTests,
		...
		}@args:

		let
		stdenv' = if kernel == null then stdenv else kernel.stdenv;
		in
		callPackage ./generic.nix args {
		# You have to ensure that in `pkgs/top-level/linux-kernels.nix`
		# this attribute is the correct one for this package.