nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-10-30 06:01:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #332848 from amarshall/zfs-update

Browse Source 
zfs_2_2: 2.2.4 -> 2.2.5
This commit is contained in:
Adam C. Stephens 2024-08-07 07:50:21 -04:00 committed by GitHub
commit 1602c0d3c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/zfs/2_2.nix
View File

@ -15,12 +15,12 @@ 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.9";
kernelCompatible = kernel.kernelOlder "6.10";
latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_8;
latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_9;
# this package should point to the latest release.
version = "2.2.4";
version = "2.2.5";
tests = [
nixosTests.zfs.installer
@ -29,5 +29,5 @@ callPackage ./generic.nix args {
maintainers = with lib.maintainers; [ adamcstephens amarshall ];
hash = "sha256-SSp/1Tu1iGx5UDcG4j0k2fnYxK05cdE8gzfSn8DU5Z4=";
hash = "sha256-BkwcNPk+jX8CXp5xEVrg4THof7o/5j8RY2SY6+IPNTg=";
}

24
pkgs/os-specific/linux/zfs/unstable.nix
View File

@ -23,31 +23,13 @@ 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.4-unstable-2024-07-15";
rev = "/54ef0fdf60a8e7633c38cb46e1f5bcfcec792f4e";
version = "2.2.5";
# rev = "";
isUnstable = true;
tests = [
nixosTests.zfs.unstable
];
# 6.10 patches approved+merged to the default branch, not in staging yet
# https://github.com/openzfs/zfs/pull/16250
extraPatches = [
(fetchpatch {
url = "https://github.com/openzfs/zfs/commit/7ca7bb7fd723a91366ce767aea53c4f5c2d65afb.patch";
hash = "sha256-vUX4lgywh5ox6DjtIfeC90KjbLoW3Ol0rK/L65jOENo=";
})
(fetchpatch {
url = "https://github.com/openzfs/zfs/commit/e951dba48a6330aca9c161c50189f6974e6877f0.patch";
hash = "sha256-A1h0ZLY+nlReBMTlEm3O9kwBqto1cgsZdnJsHpR6hw0=";
})
(fetchpatch {
url = "https://github.com/openzfs/zfs/commit/b409892ae5028965a6fe98dde1346594807e6e45.patch";
hash = "sha256-pW1b8ktglFhwVRapTB5th9UCyjyrPmCVPg53nMENax8=";
})
];
hash = "sha256-7vZeIzA2yDW/gSCcS2AM3+C9qbRIbA9XbCRUxikW2+M=";
hash = "sha256-BkwcNPk+jX8CXp5xEVrg4THof7o/5j8RY2SY6+IPNTg=";
}