Commit Graph

237 Commits

Author SHA1 Message Date
Atemu
aa58df5312 zfs: use meta.broken instead of throw when incompatible with kernel
`throw` aborts eval when the package is touched in inappropriate places. See
https://github.com/NixOS/nixpkgs/issues/109001 for an adverse instance of that.

ZFS now behaves like a regular broken package when it's, you know, broken.

It also still prints the helpful incompatibility notice when fully evaluated.
2021-01-21 14:58:00 +01:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Ben Siraphob
16d91ee628 pkgs/os-specific: stdenv.lib -> lib 2021-01-17 23:26:08 +07:00
Atemu
e44a4abdbe zfs: 2.0.0 -> 2.0.1
RT patch is included in this release
2021-01-07 05:54:10 -08:00
Alyssa Ross
e27774e9df
linuxPackages.zfs: use autoconf 2.69
I bring in autoreconfHook269 instead of overriding it in
all-packages.nix, so that when an unstable version of ZFS comes out
that supports autoconf 2.70, it can use the latest autoconf even if
stable ZFS still needs the old version.
2020-12-17 12:53:48 +00:00
Orivej Desh
1026c02f6d zfs: fix build with linux-rt 2020-12-10 10:34:44 +00:00
Jonathan Ringer
c2c8e2e4cc
zfs: add new maintainers, update homepage 2020-12-01 06:40:20 -08:00
Jonathan Ringer
d4aa37b0f6
zfs: 0.8.5 -> 2.0.0 2020-11-30 15:09:54 -08:00
Graham Christensen
bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Jonathan Ringer
f525d54c55 zfsUnstable: 2.0.0-rc5 -> 2.0.0-rc6 2020-11-13 09:31:18 -08:00
Graham Christensen
b3d4f5dada
zfs: extend zpool scripts with :$PATH, remove sudo
sudo the package is not suid, so remove it from the PATH. Extend
PATH with $PATH to fetch sudo from the outer PATH. Move the generation
of `path` in to Nix, so the sed expression can use single quotes,
which prevents $PATH being interpolated at build-time.
2020-11-10 08:50:22 -05:00
Jonathan Ringer
5d9ea37fd3 zfsUnstable: 2.0.0-rc4 -> 2.0.0-rc5 2020-11-05 08:05:05 -08:00
Henri Menke
3cf85bc8a2
zfsUnstable: 2.0.0-rc3 -> 2.0.0-rc4 2020-10-19 21:37:42 +02:00
Henri Menke
cabb90e212 zfs: 0.8.4 -> 0.8.5 2020-10-19 11:18:01 -07:00
Frederik Rietdijk
692d219a93 Merge staging-next into staging 2020-10-06 10:25:58 +02:00
Maximilian Bosch
bafe7eb14d
zfs: fix build w/gibc-2.32 2020-09-12 23:04:47 +02:00
Henri Menke
c286d1cb06
zfsUnstable: 0.8.4 -> 2.0.0-rc1 2020-08-27 17:05:31 +12:00
rtreffer
08566523d8 Backport zfs 5.8 compaitibility patch to zfs 0.8.4
Adding this patch makes zfs compile against 5.8-rc7 kernels.

Upstream PR: https://github.com/openzfs/zfs/pull/10422
Modifications:
- spl_kvmalloc does not exists in zfs 0.8.4 - related code was dropped.
2020-07-31 21:02:36 +02:00
Henri Menke
952b698689 zfsUnstable: 2.0.0-rc2 -> 2.0.0-rc3 2020-10-02 08:38:56 -07:00
Henri Menke
a115901f72 zfsUnstable: 2.0.0-rc1 -> 2.0.0-rc2 2020-09-30 16:22:19 -07:00
adisbladis
1b3825ebcb
zfs: 0.8.3 -> 0.8.4 2020-05-21 16:32:19 +01:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Silvan Mosberger
b293421a69
Merge pull request #84129 from Infinisil/removing-python-from-grub
Support removing python from zfs/grub closure
2020-04-08 12:53:28 +02:00
Silvan Mosberger
0a43c6e0f9
zfs: Add enablePython argument
Reduces closure size with it disabled from 236.0M to 176.7M
2020-04-08 02:29:03 +02:00
Jörg Thalheim
75c28ebdf7
zfs: fix build against 5.6 2020-04-07 13:00:55 +01:00
sjau
88de34b160 zfs: 0.8.2 -> 0.8.3 2020-01-24 14:52:44 +01:00
Jörg Thalheim
faa7ce3ee5
Merge pull request #70240 from woffs/pr-etc-zpool.d
nixos module zfs: provide /etc/zfs/zpool.d
2019-10-15 11:45:52 +01:00
Robin Gloster
4fb5cdd413
treewide: update some homepage URLs
Updated dead or redirecting URLs on packages maintained by me.
2019-10-12 14:52:34 +02:00
Frank Doepper
17f76a906e zfs: fix PATH for zpool.d scripts 2019-10-04 13:38:27 +02:00
Jörg Thalheim
539e66c429
zfsUnstable: drop build patches 2019-09-28 10:43:46 +01:00
Svein Ove Aas
f6a894475c
zfs: 0.8.1 -> 0.8.2 2019-09-27 15:38:55 +01:00
Tim Steinbach
53e1d838eb
Revert "zfs: Incompatibility with kernel 5.3"
This reverts commit 7cff0bc3ee.

The assertion is eagerly evaluated and prevents builds for kernels
that do not even use zfs
2019-09-20 23:59:57 -04:00
Tim Steinbach
7cff0bc3ee
zfs: Incompatibility with kernel 5.3
Enable the warning that ZFS is currently
incompatible with 5.3 kernels
2019-09-20 14:39:38 -04:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Ben Wolsieffer
27e830fff9 zfs: fix cross compilation 2019-07-22 19:09:57 -04:00
Matthew Bauer
04e6a1bb9b
Merge pull request #63081 from caadar/master
Improve ZFS Bash completions user expirience
2019-06-20 15:29:03 -04:00
Franz Pletz
fa6c8ada20
Merge pull request #63171 from Mic92/zfs
zfs: 0.8.0 -> 0.8.1
2019-06-17 05:43:43 +00:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Jörg Thalheim
b916d11a6e
zfsUnstable: 0.8.0 -> 0.8.1 2019-06-15 19:35:30 +01:00
Jörg Thalheim
05f7301a9e
zfs: 0.8.0 -> 0.8.1 2019-06-15 19:35:25 +01:00
caadar
fcbbfeeaa8 Add ZFS completions/zpool 2019-06-14 23:10:14 +03:00
Mario Rodas
f00a9f2689
zfs: fix install completions 2019-06-12 18:00:00 -05:00
caadar
57301d9b2f Add Bash completions for ZFS. (#62986)
* Add Bash completions for ZFS.

* Load completions on demand only.
2019-06-12 18:15:35 -04:00
Jörg Thalheim
11b8a5f20e
zfs: 0.7.13 -> 0.8.0
Same as zfsUnstable for the moment.
We still keep the zfsUnstable expression as we likely
need it in the near future again.
Also remove spl since it is no longer needed.
2019-06-06 10:07:43 +01:00
Ivan Jager
0c42941997 zfsUnstable: 0.8.0-rc5 -> 0.8.0
Technically, this is a stable release, but it seems
prudent to test as zfsUnstable before upgrading zfsStable.
2019-05-23 13:12:43 -05:00
Izorkin
9ad5a326b0 zfsUnstable: 0.8.0-rc4 -> 0.8.0-rc5 2019-05-10 16:40:17 +03:00
adisbladis
e3a83b5bc0
zfsUnstable: 0.8.0-rc3 -> 0.8.0-rc4 2019-04-17 20:57:51 +01:00
Jörg Thalheim
2bfd19fcb2
zfs: 0.7.12 -> 0.7.13
(cherry picked from commit b57080d34136fd8dcc49632696ceb5ed1ff73326)
2019-03-05 14:49:44 +00:00
Jörg Thalheim
73fda89c7c
Merge pull request #54258 from aij/zfs
zfsUnstable: 0.8.0-rc2 -> 0.8.0-rc3
2019-01-30 15:07:25 +00:00
Jörg Thalheim
b5c1deca8a
treewide: remove wkennington as maintainer
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
2019-01-26 10:05:32 +00:00
Ivan Jager
1f2a3fe040 zfsUnstable: Fetch source by tag and patch by hash. 2019-01-19 06:22:24 -06:00
Jörg Thalheim
f1d7cc678b
zfs: mark as broken on 4.20 2019-01-18 08:53:43 +00:00
Ivan Jager
d1e838ed23 zfsUnstable: 0.8.0-rc2 -> 0.8.0-rc3 2019-01-17 22:08:15 -06:00
Jörg Thalheim
3bde31f140
zfs: switch to python3 2018-12-11 21:32:25 +00:00
Robert Schütz
d9cd9acc24 linuxPackages.{spl,zfs}: 0.7.11 -> 0.7.12 2018-11-18 18:08:08 +01:00
Ivan Jager
a995a81182 zfsUnstable: 0.8.0-rc1 -> 0.8.0-rc2 2018-11-14 22:09:55 -06:00
Jörg Thalheim
8609ff17ed
zfs{Stable,Unstable}: mark as incompatible with 4.19 2018-10-29 07:43:28 +00:00
Lenz Weber
218ce4de50 zfs-unstable: 2018-09-02 -> 0.8.0-rc1 (#46543) 2018-09-15 02:34:08 +02:00
Clemens Fruhwirth
81082c6c60 spl/zfs: 0.7.10 -> 0.7.11 2018-09-15 00:41:04 +02:00
Clemens Fruhwirth
05f122c561 spl/zfs: 0.7.9 -> 0.7.10 2018-09-09 17:08:12 +02:00
Lenz Weber
080a6385ff zfs-unstable: 64e9696 -> c197a77 2018-09-04 21:59:23 +02:00
Jörg Thalheim
1333ebce98 zfsUnstable: compatible with 4.18 again 2018-08-14 14:57:15 +02:00
Jörg Thalheim
93f9b7069a
Merge pull request #45012 from Mic92/zfs
linuxPackages.zfsUnstable: 2018-05-22 -> 2018-08-13
2018-08-14 14:39:04 +02:00
Jörg Thalheim
4360a87c45 linuxPackages.zfsUnstable: 2018-05-22 -> 2018-08-13
spl was merged into zfs master
2018-08-14 14:12:07 +02:00
Tim Steinbach
a0649086b5
zfs: unsupported for 4.18 2018-08-13 20:18:56 -04:00
Jörg Thalheim
43595c7884 zfsLegacyCrypto: remove
This package was only mandatory for migration for people on zfsUnstable
in nixos unstable.
2018-08-13 19:53:50 +02:00
volth
dda95bae35 [bot] treewide: remove unused 'args@' in lambdas 2018-07-20 19:54:05 +00:00
Clemens Fruhwirth
43a737b81c Disable fortify and stackprotector hardening for spl/zfs.
Linux 4.16 introduces a stackprotector detection script that returns
different results for the kernel compilation run and the spl/zfs
compilation run, as the setting for hardening are different. This
results in a broken ABI between spl/zfs and the compiled kernel,
breaking ZFS. Also disabling the fortify and stackprotector hardening,
as we do for the kernel, fixes that.
2018-06-25 16:55:42 +02:00
Frank Doepper
27e7143cf7 zfs: fix substitution of /bin/rm (#41930) 2018-06-13 19:38:11 +02:00
Frank Doepper
f9a23fe0a6 nixos/zfs: fix vdev_id PATH
closes #41602
2018-06-11 19:30:14 +02:00
Ben Wolsieffer
c5a088bf2b spl, zfs: 0.7.8 -> 0.7.9, unstable to latest (#41093) 2018-05-28 22:05:05 +02:00
Jörg Thalheim
bc7c7b2b09 zfs: mark as broken for 4.16 2018-04-22 23:45:17 +01:00
Richard Marko
1eddfaffb1 zfs: patch exportfs path for sharenfs functionality 2018-04-18 22:07:42 +02:00
Jörg Thalheim
6b796a9c23 zfsUnstable: fix build
fixes #38859
2018-04-13 00:27:56 +01:00
Robert Schütz
80fc5f2a24 Merge branch 'master' into staging 2018-04-10 09:13:36 +02:00
Jörg Thalheim
ad229677a3 linuxPackages.{zfs,spl}{Stable,Unstable}: 0.7.7 -> 0.7.8; 2018-04-04 -> 2018-04-10 2018-04-10 06:53:07 +01:00
Frederik Rietdijk
0aa59a08d6 Merge master into staging 2018-04-09 15:12:32 +02:00
Jörg Thalheim
692e0b5f3a zfsLegacyCrypto: set incompatibleKernelVersion to 4.16 2018-04-08 12:07:23 +01:00
Frederik Rietdijk
595a72589f Merge master into staging 2018-04-08 10:54:17 +02:00
Jörg Thalheim
0af5b254ab zfsUnstable: fix evaluation of error message 2018-04-06 16:18:26 +01:00
Jörg Thalheim
e7f2b7692b zfsUnstable: mark correct zfs version as incompatible 2018-04-06 12:10:11 +01:00
Jörg Thalheim
6c87fbb620 zfsUnstable: mark linux 4.16 as broken 2018-04-06 12:07:34 +01:00
Frederik Rietdijk
23741692fa Merge master into staging 2018-04-04 19:36:39 +02:00
Jörg Thalheim
41958e5d2b linuxPackages.zfsUnstable: 2018-02-02 -> 2018-04-04 2018-04-04 15:27:25 +01:00
Will Dietz
bae5ec0faf zfs: fix hardcoded include path for libtirpc 2018-03-25 18:08:12 -05:00
Will Dietz
d6ffaac4ac zfs: libtirpc dep on musl 2018-03-25 18:07:59 -05:00
Franz Pletz
f744f83072
zfs, spl: 0.7.6 -> 0.7.7
Remove spl patch that was introduced for grsecurity which we don't support
anymore. ZFS now needs perl for some scripts that are call in the configure
script.
2018-03-22 01:05:32 +01:00
Will Dietz
5da8924333 zfs, spl: 0.7.5 -> 0.7.6
Fixes compat with 4.15
(cc #34459)
2018-02-07 18:49:26 -06:00
sjau
0d65e2e0e5 zfs: add migration path for new crypto format
fixes #34559
2018-02-07 20:46:16 +00:00
adisbladis
c72a05b88d
zfsUnstable: 2017-12-28 - 2018-01-10 2018-01-10 20:22:46 +08:00
adisbladis
f0f6515bb8
zfsUnstable: 2017-11-16 -> 2017-12-28 2017-12-30 12:20:30 +01:00
adisbladis
cbccffadc9
zfs: 0.7.4 -> 0.7.5 2017-12-30 12:20:28 +01:00
Yegor Timoshenko
0d321897fb
linuxPackages.spl: eval, 84d8ef6e2f
Second attempt.
2017-12-30 00:28:37 +00:00
Franz Pletz
6b74d2ca07
linuxPackages.zfs: use correct kernel module build flag
In this expression the boolean flags `buildUser` and `buildKernel` determine
if either userspace tools or the kernel module is being built.

cc #33166
2017-12-29 22:46:34 +01:00
David Guibert
1e77d0b975 kernel 4.14 require libelf to compile modules.
[...]
make modules -C /nix/store/h1vzl6bq4wif3m8dd1bw2p3fv4shjg3n-linux-4.14.9-dev/lib/modules/4.14.9/build EXTRA_CFLAGS=-Werror-implicit-function-declaration M=/tmp/nix-build-spl-kernel-2017-11-16-4.14.9.drv-0/source/build
/nix/store/h1vzl6bq4wif3m8dd1bw2p3fv4shjg3n-linux-4.14.9-dev/lib/modules/4.14.9/source/Makefile:939: *** "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel". Stop.

This patch introduces kernel.moduleBuildDependencies to avoid the logic "stdenv.lib.optional (stdenv.lib.versionAtLeast kernel.version "4.14") libelf" in multiple places.

[dezgeg did some minor tweaks on top]
2017-12-29 23:08:17 +02:00
Clemens Fruhwirth
79939b29ea zfs: 0.7.3 -> 0.7.4 2017-12-13 13:15:26 +01:00
Jan Malakhovski
1858e8909e tree-wide: fix either check-meta or meta attrs of all the packages I evaluate 2017-12-05 13:46:52 +01:00
adisbladis
0bdaedbe87
zfsUnstable: 2017-11-12 -> 2017-11-16 2017-11-16 19:28:23 +08:00
sjau
8ccaa882a1 zfsUnstable: 2017-10-16 -> 2017-11-12 2017-11-13 10:06:57 +01:00
Franz Pletz
94043f511a
zfs: 0.7.2 -> 0.7.3
Bugfix release.
2017-11-03 21:39:05 +01:00