Commit Graph

354 Commits

Author SHA1 Message Date
Adam Stephens
2dbc1128b3
zfs: deprecate latestCompatibleLinuxPackages
Using zfs.latestCompatibleLinuxPackages can result in downgrades to the kernel on a system, potentially causing breakage.
This breakage may not be apparent during build and switch, but only after attempting to reboot into the updated generation.
By forcing users to explicitly manage their kernel version, we can ensure that the breakage will be apparent at build time instead.
2024-09-17 08:57:38 -04:00
Andrew Marshall
abc759221f linux: remove unneeded and misleading passthru.isVanilla
This was added for use by ZFS, but it turned out that `pname == "linux"`
is sufficient enough and has better coverage since many of our Linux
variants do not have an existing `passthru.isX`, and instead are
identifiable by a different pname.
2024-09-09 10:24:41 -04:00
Will Fancher
cf572e0f31 zfs: Fix bash completions with 2.1 2024-09-06 16:07:55 -04:00
Adam C. Stephens
63aafed9dd
zfs_2_2: 2.2.5 -> 2.2.6 (#339696) 2024-09-05 07:42:32 -04:00
Andrew Marshall
636134b8ed zfs_2_2: 2.2.5 -> 2.2.6
- This release brings official support for Kernel 6.10
- Also update zfs_unstable as it would otherwise lag behind
- Upstream now links `zpool` completion, so only do so on older zfs
  (since we still need to support 2.1.x)

Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.2.6
2024-09-04 22:28:28 -04:00
Andrew Marshall
34e1748391 zfs: fix maybe getting wrong kernel in latestCompatibleLinuxPackages
E.g. might have gotten -rt, -xanmod, etc.
2024-09-03 08:18:28 -04:00
Andrew Marshall
7fa05c77b7 zfs: dynamically determine latestCompatibleLinuxPackages
This removes the need to micromanage this value, instead we simply find
the correct one based on the existing kernelCompatible attr (though that
is now a function). This not only simplifies ZFS upgrades, but also
whenever Kernel versions are removed due to EOL.
2024-08-28 20:55:06 -04:00
Andrew Marshall
52a7570e09 zfs_unstable: remove unused param 2024-08-28 09:07:55 -04:00
Andrew Marshall
f8a1ba0e7d zfs_2_2: fix latestCompatibleLinuxPackages
Broken in ba0d495264, which removed Linux
6.8 and 6.9, so now 6.6 is the latest compatible.
2024-08-14 11:05:55 -04:00
Maximilian Bosch
d2fca016fe
Merge pull request #331717 from alyssais/linux-6.9-drop
linux_6_8,linux_6_9: remove
2024-08-14 16:04:30 +02:00
Andrew Marshall
fde7c3afb3 zfs-unstable: 2.2.4-unstable-2024-07-15 -> 2.2.5
Patches all appear to be merged into this release.
2024-08-06 19:52:43 -04:00
Andrew Marshall
8d0db92828 zfs_2_2: 2.2.4 -> 2.2.5
Diff: https://github.com/openzfs/zfs/compare/zfs-2.2.4...zfs-2.2.5

Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.2.5
2024-08-06 19:51:32 -04:00
Alyssa Ross
dc305dc655
linuxPackages_6_10.zfs_unstable: unmark broken
Builds and should work fine thanks to the included patches.
2024-08-03 13:50:01 +02:00
toastal
72f2df0147 Linux 6.10 compat patches
Since this is *zfs_unstable*, & these patches are merged. It seems like
this could let folks test out 6.10 as others have had sucess while
setting the new bar to 6.9.
2024-07-20 17:43:06 +07:00
toastal
a350402ac2 zfs_unstable: 2.2.4-unstable-2024-05-29 → 2.2.4-unstable-2024-07-15
fixes a use-after-free
2024-07-20 17:43:06 +07:00
Adam Stephens
a65001e999
zfs: move maintainer adamcstephens to 2.2 only 2024-07-19 08:46:21 -04:00
Sandro
224c195208
Merge pull request #311415 from toastal/zfs-2.2.4-unstable-2024-05-13
zfs_unstable: 2.2.4 → 2.2.4-unstable-2024-05-13
2024-06-07 22:21:59 +02:00
Sigmanificient
d48a9bb622 treewide: remove unused fetchpatch arguments 2024-06-04 12:40:25 +02:00
toastal
1fd084b264 zfs_unstable: 2.2.4 → 2.2.4-unstable-2024-05-29 2024-06-01 17:37:41 +07:00
Andrew Marshall
a1dcb54257 zfs_2_2: 2.2.3 -> 2.2.4
Now compatible with Linux 6.8.

https://github.com/openzfs/zfs/releases/tag/zfs-2.2.4

Need to patch py-libzfs to support incompatible API change.
2024-05-03 07:44:36 -04:00
Andrew Marshall
2cbe063319 zfs_unstable: 2.2.3-unstable-2024-04-09 -> 2.2.4
No pre-release version at this moment, so use now-released 2.2.4.
2024-05-03 07:44:35 -04:00
toastal
634308e6f5 zfs_unstable: 2.2.3-unstable-2024-03-30 → 2.2.3-unstable-2024-04-09 2024-04-09 14:47:57 +07:00
K900
b71cc870b6 linux_6_7: drop 2024-04-04 22:45:46 +03:00
toastal
14377d6b82 zfs_unstable: 2.2.3-unstable-2024-03-21 → 2.2.3-unstable-2024-03-30 2024-04-01 17:00:42 +07:00
toastal
8107bc55f4 zfsUnstable: 2.2.3-unstable-2024-02-12 → 2.2.3-unstable-2024-03-21
Has patch to fix 6.8 issue
2024-03-22 23:12:58 +07:00
Adam C. Stephens
b52452f8c7
Merge pull request #291951 from amarshall/zfs-pkgs-renaming
zfs: rename zfsStable -> zfs_2_2; zfsUnstable -> zfs_unstable; remove enableUnstable option in favor of package
2024-03-01 10:09:12 -05:00
Andrew Marshall
1f32eb724d nixos/zfs: Remove enableUnstable in favor of setting package
This just adds complexity and confusion. Once-upon-a-time, there was no
`package` and only `enableUnstable`, but now it is just confusing to
have both, as it would be possible to do e.g. `package = pkgs.zfs` and
`enableUnstable = true`, but then `enableUnstable` does nothing.
2024-02-27 19:30:19 -05:00
Andrew Marshall
929fcf9335 zfs_unstable: Rename from zfsUnstable
This matches the naming of other zfs_* pkgs.
2024-02-27 18:45:55 -05:00
Andrew Marshall
dcff4f8318 zfs_2_2: Rename from zfsStable
The `zfs` alias already has equivalent semantics. Instead, make this
like zfs_2_1 so folks who want to pin a specific release series can do
so easily and clearly to have more control over when more substantial
updates occur.

Rename all tests to match the pkg attr they are testing.
2024-02-27 18:45:43 -05:00
Alyssa Ross
45f1428902
zfs_2_1: 2.1.14 -> 2.1.15
This adds compatibility with newer kernels, which fixes
nixosTests.zfs.series_2_1, which broke when the default kernel version
was bumped.

This means we no longer need the removeLinuxDRM option at all, but
I've kept it around as a no-op so people can leave it set in case the
same thing happens again in future.
2024-02-27 13:44:16 +01:00
Alyssa Ross
2b9f043823
zfs: update latestCompatibleLinuxPackages
ZFS no longer tries to use GPL-only symbols on aarch64.

Tested by building nixosTests.zfs.stable (modified to use Linux 6.6)
and nixosTests.zfs.unstable.
2024-02-26 12:27:10 +01:00
Siddhartha
dddc87e337 zfs: 2.2.2 -> 2.2.3 2024-02-23 00:00:31 -05:00
toastal
df3a1a871a zfsUnstable: 2.2.3-unstable-2024-01-26 → 2.2.3-unstable-2024-02-12
Patch now includes compatibility for 6.8 kernels (even if ðey aren’t on
offer in nixpkgs at ðis time).
2024-02-14 11:00:21 +07:00
toastal
fd12b90a57 zfsUnstable: 2.2.2 → 2.2.3-unstable-2024-01-26
Should have patches for 6.7 compatibility
2024-01-31 11:04:55 +07:00
Adam Stephens
d3b5271dc9
zfs_2_1: 2.1.13 -> 2.1.14 2023-11-30 19:35:04 -05:00
Adam Stephens
c3fa6659dd
zfsStable/zfsUnstable: 2.2.1 -> 2.2.2 2023-11-30 19:35:02 -05:00
Adam C. Stephens
c9b87a5dfa
Merge pull request #270275 from amarshall/zfs-disable-dmu-offset-by-default
zfs: default disable zfs_dmu_offset_next_sync to avoid data corruption
2023-11-27 08:35:28 -05:00
Andrew Marshall
9670ddc543 zfs: default disable zfs_dmu_offset_next_sync to avoid data corruption
This helps mitigate a data corruption bug. This was previously defaulted
to zero prior to upstream commit
05b3eb6d232009db247882a39d518e7282630753, and it is already a tunable,
so doing this seems safe. Initially data corruption was thought to be
introduced with v2.2, but further upstream investigation currently
believes that changes in v2.2 only exacerbated the issue that already
existed.

A longer-term fix is likely to be
https://github.com/openzfs/zfs/pull/15571, though that is not yet
merged. The zfs_2_1 package has already backported that, so do not apply
the tunable default change there.

Positioning of `extraPatches` is to avoid merge conflicts with
https://github.com/NixOS/nixpkgs/pull/269097.

Patch is nearly identical to the [Gentoo][1] patch, but better patch
formatting.

See https://github.com/openzfs/zfs/issues/11900
See https://github.com/openzfs/zfs/issues/15526

[1]: https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-fs/zfs-kmod/files/zfs-kmod-2.2.1-Disable-zfs_dmu_offset_next_sync-tunable-by-default.patch
2023-11-26 13:29:41 -05:00
Jörg Thalheim
55b737831b zfsUnstable: 2.2.1-unstable-2023-10-21 -> 2.2.1
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
2023-11-26 12:26:39 -05:00
Andrew Marshall
365cc96597 zfs: 2.2.0 -> 2.2.1
Now supports Kernel 6.6.
2023-11-26 12:26:16 -05:00
Raito Bezarius
b026c45bf6 zfs: improve description and long description
When we are building for user or kernel, we are not building a kernel module all the time.
2023-11-24 15:47:21 +01:00
Raito Bezarius
e04c0b0d99 zfs_2_1: init at 2.1.13
This re-introduces the old stable ZFS version we had in the past following
the many predicted issues of ZFS 2.2.x series, that is much more stable
than any further ZFS version at the moment.

I am also removing myself from maintenance of any further ZFS versions as I am
planning to quit ZFS maintenance at some point.

In the meantime, for users like me who depend on ZFS for critical operations, here is a ZFS version
that is known to work for LTS kernels.
2023-11-24 15:47:21 +01:00
Majiir Paktu
007d92d830 zfs: add armv7 to supported platforms 2023-10-22 15:43:26 -04:00
Adam Stephens
53bb653759
zfsUnstable: 2.2.0-rc5 -> 2.2.1-unstable-2023-10-21 2023-10-21 12:16:50 -04:00
Adam Stephens
1a81fe0cc8
zfs: 2.1.13 -> 2.2.0 2023-10-21 12:16:31 -04:00
OPNA2608
841c447326 zfs: Honour NIX_BUILD_CORES in kernel build
Otherwise configuring runs some test builds with `nproc` amount of cores.
2023-10-14 17:15:44 +02:00
Adam Stephens
37c7768047
zfsUnstable: 2.2.0-rc4 -> 2.2.0-rc5 2023-10-10 23:49:54 -04:00
Alyssa Ross
ae3682cb17
linux_6_4: drop (EOL)
It's still in kernels-org.json, because even if I remove it the update
script will keep putting it back, but nothing references it, and it'll
be removed from that file when kernels are next updated after it's
been delisted from kernel.org.

linux_testing_bcachefs still needs to be updated for >6.4, so for now
I've just inlined the Linux 6.4 definition in linux_testing_bcachefs's
definition.
2023-10-02 17:27:32 +00:00
Adam Stephens
9414695774
zfs: 2.1.12 -> 2.1.13 2023-09-28 08:10:52 -04:00
Jörg Thalheim
32883aecc9 zfsUnstable: 2.1.13 -> 2.2.0-rc4 2023-09-11 21:11:01 +02:00