zowoq
e99eb6d145
zfs: remove patch
...
included in 2.3.8 and 2.4.3
2026-06-12 12:42:53 +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
Robert Schütz
9d66a1bc39
zfs: simplify kernelIsCompatible function
2026-04-16 10:12:02 -07: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
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
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
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
nixpkgs-ci[bot]
3029e20133
Merge master into staging-next
2025-06-14 06:05:15 +00: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
Izorkin
bd4128c317
zfs: reduce closure size
2025-03-13 01:11:56 +03: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
K900
aa3e94fe7c
treewide: kernel.makeFlags -> kernel.moduleMakeFlags
2025-01-23 14:00:43 +03:00
Andrew Marshall
60cc35abae
zfs: remove code for obsolete versions
...
In cbc50da11c
2025-01-19 17:40:08 -05:00
Silvan Mosberger
4f0dadbf38
treewide: format all inactive Nix files
...
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build a08b3a4d19b32a094368
2024-12-10 20:26:33 +01:00
Sandro Jäckel
9b6f2df0b6
zfs: substitute absolute path in arc_summary to modinfo
2024-11-14 22:45:35 +01:00
Andrew Marshall
b5e959d3c3
zfs_unstable: expand on unstable nature in long description
2024-11-01 18:50:52 -04:00
Andrew Marshall
9ce881027b
zfs: remove recommendations to use unstable
...
`pkgs.zfs_unstable` is pre-release software and may very well have
critical bugs that make it unsuitable for general use. As such, we
should not recommend it as a general solution to the problem of "my
Kernel is too new for stable ZFS".
2024-11-01 18:50:24 -04:00
Andrew Marshall
2491be0a6d
zfs: update usage of deprecated --replace
...
- In some cases, move into a conditional as the substitution is only
needed on some version
- One use of `--replace-warn` since it is looking in a set of files
where the exact files that might contain it may change over time, but
we want to cover all of them
2024-11-01 18:50:24 -04:00
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
Adam Stephens
a65001e999
zfs: move maintainer adamcstephens to 2.2 only
2024-07-19 08:46:21 -04:00
Sigmanificient
d48a9bb622
treewide: remove unused fetchpatch arguments
2024-06-04 12:40:25 +02: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
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
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
Jörg Thalheim
32883aecc9
zfsUnstable: 2.1.13 -> 2.2.0-rc4
2023-09-11 21:11:01 +02:00
Adam Joseph
ede53c31bc
Merge pull request #194148 from amjoseph-nixpkgs/pr/zfs/mips-bad
...
zfs.meta.platforms: restrict to upstream-supported $TARGET_CPUs
2023-05-16 07:31:35 +00:00
Adam Joseph
53c8cd6af8
zfs.meta.platforms: restrict to upstream-supported $TARGET_CPUs
2023-05-15 01:07:09 -07:00
