K900
0ca42be61b
zfs_unstable: sync backports with zfs_2_4
2026-08-13 21:45:32 +03:00
K900
65f2c6ba8a
zfs_2_4: backport fix for kernel memory corruption
2026-08-13 21:44:33 +03:00
Morgan Jones
371a819607
zfs_2_4: apply patch for #18366 (dedup=on data corruption)
...
This was reproducible with substitution of large NARs with a lot of
files and a dedup=on Nix store. While Nix would correctly produce a
signature verification error if the hash was known, builds could
silently be corrupt.
TrueNAS backported this, so let's as well so this doesn't bite anyone
else.
See: https://github.com/truenas/zfs/pull/390
See: https://github.com/openzfs/zfs/issues/18366
See: https://github.com/openzfs/zfs/pull/18544
Signed-off-by: Morgan Jones <me@numin.it >
2026-06-25 23:27:06 -07:00
zowoq
e99eb6d145
zfs: remove patch
...
included in 2.3.8 and 2.4.3
2026-06-12 12:42:53 +10:00
zowoq
e431b35de8
zfs_2_4: 2.4.2 -> 2.4.3
...
Diff: https://github.com/openzfs/zfs/compare/zfs-2.4.2...zfs-2.4.3
Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.4.3
2026-06-12 12:30:39 +10:00
zowoq
138d8d6bc8
zfs_2_3: 2.3.7 -> 2.3.8
...
Diff: https://github.com/openzfs/zfs/compare/zfs-2.3.7...zfs-2.3.8
Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.3.8
2026-06-12 12:29:55 +10:00
Andrew Marshall
5a71c7cdef
zfs_2_3: 2.3.6 -> 2.3.7
...
The patch already applied on zfs_2_4 also needs to be applied here.
2026-05-13 19:18:00 -04:00
Andrew Marshall
3b30957189
zfs_2_4: 2.4.1 -> 2.4.2
...
Update zfs_unstable as well as it currently matches zfs_2_4.
Fails to build on older Kernel, so backport a patch to fix (that has
been merged upstream already). See also
https://github.com/openzfs/zfs/issues/18528 .
2026-05-13 19:08:17 -04:00
Ben Siraphob
869d641281
treewide: replace stdenv.is* with stdenv.hostPlatform.is*
2026-05-10 10:06:35 -07:00
Robert Schütz
9d66a1bc39
zfs: simplify kernelIsCompatible function
2026-04-16 10:12:02 -07:00
Lin Xianyi
ca6b71fb63
zfs_unstable: 2.4.0 -> 2.4.1
...
Diff: https://github.com/openzfs/zfs/compare/zfs-2.4.0...zfs-2.4.1
Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.4.1
2026-03-04 09:55:01 +08:00
zowoq
25b2253139
zfs_2_4: 2.4.0 -> 2.4.1
...
Diff: https://github.com/openzfs/zfs/compare/zfs-2.4.0...zfs-2.4.1
Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.4.1
2026-02-25 08:06:26 +10:00
zowoq
3b4016d738
zfs_2_3: 2.3.5 -> 2.3.6
...
Diff: https://github.com/openzfs/zfs/compare/zfs-2.3.5...zfs-2.3.6
Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.3.6
2026-02-25 08:06:26 +10:00
Stefan Frijters
d21d5ad038
zfs*: move NIX_CFLAGS_LINK into env for structuredAttrs
2026-02-19 18:10:28 +01:00
Doron Behar
c203b742ca
zfs: split man output
...
Co-Authored-By: Izorkin <izorkin@elven.pw >
2026-01-22 15:35:53 +02:00
Doron Behar
62c9aa3392
zfs: small outputs preparation formatting
2026-01-22 15:32:40 +02:00
Andrew Marshall
f74c64bacf
zfs_2_4: init at 2.4.0
...
Update zfs_unstable as well.
Not changing default zfs yet. This is also to make it easier to backport
this PR while keeping the 25.11 default unchanged.
2025-12-18 14:46:55 -05:00
zowoq
1316349870
zfs_unstable: 2.4.0-rc4 -> 2.4.0-rc5
...
Diff: https://github.com/openzfs/zfs/compare/zfs-2.4.0-rc4...zfs-2.4.0-rc5
Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.4.0-rc5
2025-12-11 10:47:34 +10:00
zowoq
d9ffa58721
zfs_unstable: 2.4.0-rc3 -> 2.4.0-rc4
...
Diff: https://github.com/openzfs/zfs/compare/zfs-2.4.0-rc3...zfs-2.4.0-rc4
Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.4.0-rc4
2025-11-18 08:25:25 +10:00
zowoq
9360b6473f
zfs_2_3: 2.3.4 -> 2.3.5
...
Diff: https://github.com/openzfs/zfs/compare/zfs-2.3.4...zfs-2.3.5
Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.3.5
2025-11-18 08:25:25 +10:00
Adam C. Stephens
0aa851869e
zfs_2_2: remove ( #459814 )
2025-11-08 20:53:05 +00:00
Adam C. Stephens
f2f501c50c
zfs_2_2: remove
...
Will likely go out of support during 25.11 as zfs-2.4.0-rc3 is already out
2025-11-08 12:17:12 -05:00
Oleksandr Usov
5dc0eaf3a1
zfs: When ZFS is calling external helper scripts (such as stuff from
...
/etc/zfs/zpool.d or zfs_prepare_disk it uses reduced PATH.
This fixes it to use NixOS system path, and not FHS.
2025-11-03 16:57:18 +00:00
h7x4
6c05d7bb17
zfs: lib.any -> lib.elem
2025-10-26 16:23:37 +09:00
zowoq
9e682fcd54
zfs_unstable: 2.4.0-rc2 -> 2.4.0-rc3
...
Diff: https://github.com/openzfs/zfs/compare/zfs-2.4.0-rc2...zfs-2.4.0-rc3
Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.4.0-rc3
2025-10-23 09:05:14 +10:00
Wolfgang Walther
91a8fee3aa
treewide: remove redundant parentheses
...
Auto-fixed by nixf-diagnose.
2025-10-05 10:52:03 +02:00
Adam C. Stephens
2158ccb683
zfs: fix version specific command rename
2025-10-01 09:13:50 -04:00
zowoq
89bd31053c
zfs_unstable: 2.4.0-rc1 -> 2.4.0-rc2
...
https://github.com/openzfs/zfs/releases/tag/zfs-2.4.0-rc2
2025-10-01 14:17:54 +10:00
zowoq
ce20ef1ea9
zfs_2_3: fix building with llvm 21
2025-09-28 12:05:33 +10:00
zowoq
7b7f93af75
zfs_2_3: 2.3.3 -> 2.3.4
...
Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.3.4
2025-08-26 09:04:40 +10:00
K900
e9a7500b70
Merge remote-tracking branch 'origin/master' into staging-next
2025-08-23 09:24:59 +03:00
Adam C. Stephens
235059aa6a
zfs_unstable: 2.3.3 -> 2.4.0-rc1
...
https://github.com/openzfs/zfs/releases/tag/zfs-2.4.0-rc1
2025-08-22 21:25:48 -04:00
Alyssa Ross
af5dd576e0
zfs: pass kernel build flags correctly
...
ZFS's autoconf scripts recognize KERNEL_CC, KERNEL_CROSS_COMPILE,
KERNEL_ARCH, etc. This avoids the need to separately give them as
Make flags, although I'm not sure what the original intention behind
giving the unprefixed flags to configure was — the commit adding that
doesn't say, except that it was to fix cross, which still works after
this change.
This fixes the ZFS kernel module build after the change to use
unwrapped compilers for building the kernel, which previously resulted
in CC etc. being clobbered for the ZFS build, even for non-kernel
parts like the "compiler works" Autoconf check.
2025-08-20 22:01:00 +02:00
Weijia Wang
ec7268aa64
zfs: update supported platforms
2025-08-13 22:30:50 +08:00
Andrew Marshall
3d589fc858
zfs: add enableUnsupportedExperimentalKernel option
...
This will allow building ZFS against an unsupported Kernel version.
While possible, it is not supported by upstream or Nixpkgs. As such, we
don’t enable it by default, even for zfs_unstable. Enabling should be a
deliberate choice by the user to opt into potential data corruption bugs.
2025-08-01 08:30:18 -04:00
Andrew Marshall
5d2750268b
zfs: verify kernel compatibility against META
...
Switch to specifying the Kernel compatibility in the same form as in the
ZFS source’s `META` file. This then allows checking it against what’s in
`META` to remove the need to manually check, and so reduce the cognitive
load and change of mistakes when performing updates.
As the “max” version is indeed a compatible version, we need to
increment that for the comparison when using `versionOlder`.
One side-effect here is that it makes it not possible to override the
specified compatibility. We will “fix” this soon.
2025-08-01 08:28:44 -04:00
Wolfgang Walther
5a0711127c
treewide: run nixfmt 1.0.0
2025-07-24 13:55:40 +02:00
Marie Ramlow
53aac1d02a
zfs_{2_3,unstable}: 2.3.2 -> 2.3.3
2025-06-19 22:51:28 +02:00
nixpkgs-ci[bot]
3029e20133
Merge master into staging-next
2025-06-14 06:05:15 +00:00
Adam C. Stephens
06743bb459
zfs: installer tests are x86 only
2025-06-12 20:42:00 -04:00
Adam C. Stephens
5a745565dc
zfs_2_2: 2.2.7 -> 2.2.8
...
https://github.com/openzfs/zfs/releases/tag/zfs-2.2.8
2025-06-12 20:41:58 -04:00
Adam C. Stephens
5ac3c6a986
zfs: cleanup unused stdenv'
2025-06-12 15:52:57 -04:00
Adam C. Stephens
745f2c79c5
zfs: add updateScript for stable releases
2025-06-12 15:52:57 -04:00
Grimmauld
2c14bf92a1
treewide: add udevCheckHook to packages with udev rules output
...
- [x] `{ doInstallCheck = false; name = "acpilight-1.2"; }`
- Configuration file /nix/store/sckm27vsrh58glp3acw07z8jdmpj72q7-acpilight-1.2/etc/udev/rules.d/90-backlight.rules is marked executable. Please remove executable permission bits. Proceeding anyway.
- [x] `{ doInstallCheck = false; name = "airspy-1.0.10"; }`
- propagated via libusb1
- [ ] `{ doInstallCheck = false; name = "alsa-utils-1.2.13"; }`
- /nix/store/pj5lqap32lsaipnmr1pjp8zi6zmc1ng2-alsa-utils-1.2.13/lib/udev/rules.d/90-alsa-restore.rules:16 GOTO="alsa_restore_std" has no matching label, ignoring.
- /nix/store/pj5lqap32lsaipnmr1pjp8zi6zmc1ng2-alsa-utils-1.2.13/lib/udev/rules.d/90-alsa-restore.rules:16 The line has no effect any more, dropping.
- /nix/store/pj5lqap32lsaipnmr1pjp8zi6zmc1ng2-alsa-utils-1.2.13/lib/udev/rules.d/90-alsa-restore.rules:20 GOTO="alsa_restore_std" has no matching label, ignoring.
- /nix/store/pj5lqap32lsaipnmr1pjp8zi6zmc1ng2-alsa-utils-1.2.13/lib/udev/rules.d/90-alsa-restore.rules:20 The line has no effect any more, dropping.
- /nix/store/pj5lqap32lsaipnmr1pjp8zi6zmc1ng2-alsa-utils-1.2.13/lib/udev/rules.d/90-alsa-restore.rules: udev rules check failed.
- [x] `{ doInstallCheck = false; name = "amazon-ec2-net-utils-2.5.5"; }`
- [x] `{ doInstallCheck = true; name = "amazon-ec2-utils-2.2.0"; }`
- has butchered pre/post phases, needs some proper cleaning up
- [x] `{ doInstallCheck = false; name = "android-udev-rules-20250314"; }`
- Configuration file /nix/store/30028n5xqh5lr1lxvm1vsmgxrpyk65fj-android-udev-rules-20250314/lib/udev/rules.d/51-android.rules is marked executable. Please remove executable permission bits. Proceeding anyway.
- [x] `{ doInstallCheck = false; name = "antimicrox-3.5.1"; }`
- [x] `{ doInstallCheck = false; name = "apio-udev-rules-0.9.5"; }`
- Configuration file /nix/store/hh4k648cymsa3dq966f6ivf2l0i528vx-apio-udev-rules-0.9.5/lib/udev/rules.d/70-fpga-ftdi.rules is marked executable. Please remove executable permission bits. Proceeding anyway.
- Configuration file /nix/store/hh4k648cymsa3dq966f6ivf2l0i528vx-apio-udev-rules-0.9.5/lib/udev/rules.d/70-fpga-serial.rules is marked executable. Please remove executable permission bits. Proceeding anyway.
- [x] `{ doInstallCheck = false; name = "argyllcms-3.3.0"; }`
- [ ] `{ doInstallCheck = false; name = "artisan-3.1.4"; }`
- ???? No udev rules
- [x] `{ doInstallCheck = false; name = "asdbctl-1.0.0"; }`
- [x] `{ doInstallCheck = false; name = "asusctl-6.1.12"; }`
- [x] `{ doInstallCheck = true; name = "autorandr-1.15"; }`
- [ ] `{ doInstallCheck = false; name = "bazecor-1.7.0"; }`
- wrapAppImage does not support postInstallCheck: a094b5d8cc/pkgs/build-support/appimage/default.nix (L60-L79)
2025-05-28 10:51:29 +02:00
Andrew Marshall
6d97b80f9b
zfs_{2_3,unstable}: 2.3.1 -> 2.3.2
...
Diff: https://github.com/openzfs/zfs/compare/zfs-2.3.1...zfs-2.3.2
Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.3.2
2025-05-01 17:43:14 -04:00
Adam C. Stephens
c0cdb53c88
zfs: reduce closure size ( #170460 )
2025-03-20 08:25:47 -04:00
Sigmanificient
670aba9a64
treewide: remove unused arguments
2025-03-13 18:00:11 +01:00
Izorkin
bd4128c317
zfs: reduce closure size
2025-03-13 01:11:56 +03:00
Andrew Marshall
f08d64bbd9
zfs_{2_3,unstable}: 2.3.0 -> 2.3.1
...
Diff: https://github.com/openzfs/zfs/compare/zfs-2.3.0...zfs-2.3.1
Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.3.1
2025-03-11 10:00:26 -04:00
Maximilian Bosch
5645cd22d4
linux: expose make flags for modules in linuxKernel.packages.linux_X_Y
...
Closes #376820
The issue with providing `moduleMakeFlags` via `passthru` of the kernel
package is that when this package gets overriden[1], the `moduleMakeFlags`
list still references the kernel without the overrides.
This broke e.g. kernel modules of linux-rpi4 which can be reproduced
with
nix-build --argstr system aarch64-linux -A linuxKernel.packages.linux_rpi4.zfs_2_3
This used to break with
Error: modDirVersion 6.6.51 specified in the Nix expression is wrong, it should be: 6.6.51-v8
since KBUILD_OUTPUT referenced the kernel without the changes from
`overrideDerivation` that also changes the `modDirVersion`.
The new approach is to add the build flags right into
`linuxKernel.packages.linux_X_Y`: that way we don't need any hacks to
update `moduleMakeFlags` when the derivation with the passthru gets
overridden.
By using the fixpoint of the package-set, the `kernelModuleMakeFlags`
list is correctly updated. E.g. given
with import ./. {};
linuxKernel.packages.linux_6_6.extend (self: super: {
kernel = super.kernel.overrideAttrs (_: {
name = "linux-snens";
});
})
the `makeFlags` is correctly updated:
$ nix-instantiate snenskek.nix -A zfs_2_3.makeFlags --eval --strict
[ "ARCH=x86_64" "CROSS_COMPILE=" "KBUILD_OUTPUT=/nix/store/gsp68549k1aqbwxwczpgw67w5jjn4shw-linux-snens-dev/lib/modules/6.6.74/build" ]
[1] E.g. `linux-rpi4`.
2025-01-27 16:09:50 +01:00
