Commit graph

113 commits

Author SHA1 Message Date
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
Joerg Thalheim
485fe61657 zfsUnstable: 2017-09-26 -> 2017-10-16 2017-10-19 16:06:21 +01:00
Vladimír Čunát
ef41fc7f51
Merge branch 'master' into staging
Hydra: ?compare=1399476
2017-10-07 10:17:42 +02:00
Franz Pletz
662f82aee8
zfs, spl: 0.7.1 -> 0.7.2 2017-10-07 00:48:51 +02:00
John Ericson
f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Joerg Thalheim
8fcf95f102 {zfsUnstable,splUnstable}: 2017-09-12 -> 2017-09-26 2017-09-26 09:08:56 +01:00
John Ericson
9f2e05662b treewide: Manually fix miscategorized autoreconfHook buildInputs
These are the ones with odd indentation my script will mess up on.
2017-09-21 15:49:53 -04:00
Jörg Thalheim
1ecf3e862f zfsUnstable: init at 2017-09-12 2017-09-15 17:59:37 +02:00
Franz Pletz
eb9f427d4e
zfs: use multiple outputs
Some dev headers are especially large.
2017-08-14 07:57:31 +02:00
Jörg Thalheim
317786c689 zfs: 0.7.0 -> 0.7.1 2017-08-12 19:38:10 +01:00
Thomas Tuegel
cdb18068cd
zfs: fix invalid use of substituteInPlace
substituteInPlace was invoked with multiple targets on the command line, which
is not supported.

(cherry picked from commit b21defaf51)

Re-applied due to bad merge in b116fa5ff2.
2017-07-29 20:59:08 +02:00
Franz Pletz
b116fa5ff2
Merge branch 'master' into staging 2017-07-28 16:08:30 +02:00
Robin Gloster
2799a94963
zfs, spl: 0.6.5.11 -> 0.7.0 2017-07-27 19:00:54 +02:00
Thomas Tuegel
6a004bf9c8
Merge branch 'master' into bugfix/staging/stdenv 2017-07-21 20:36:34 -05:00
Thomas Tuegel
b21defaf51
zfs: fix invalid use of substituteInPlace
substituteInPlace was invoked with multiple targets on the command line, which
is not supported.
2017-07-21 15:47:37 -05:00
Jörg Thalheim
4154279179 zfsUnstable: mark as stable with 4.12 2017-07-18 11:15:37 +01:00
Franz Pletz
7f0994c33d
zfsUnstable: 0.7.0-rc4 -> 0.7.0-rc5 2017-07-17 02:53:14 +02:00
Franz Pletz
e4eea75fa7
zfs: 0.6.5.10 -> 0.6.5.11 2017-07-17 02:53:14 +02:00
Jörg Thalheim
0518ec00b5 zfs: update kernel versions constraint for linux 4.12 2017-07-04 17:15:48 +01:00
Franz Pletz
de74d2015f
kernelPackages.zfs: 0.6.5.9 -> 0.6.5.10 2017-06-17 15:51:39 +02:00
Jörg Thalheim
7765e5971c
kernelPackages.zfsUnstable: 0.7.0-rc3 -> 0.7.0-rc4 2017-05-06 07:40:42 +01:00
Jörg Thalheim
7be7902990
zfsUnstable: mark as incompatible with 4.11 (since rc3) 2017-05-02 18:15:53 +02:00
evujumenuk
aef776836d zfs: Bump incompatibleKernelVersion to "4.11"
https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.6.5.9 attests compatibility with kernel versions up to 4.10.x.
2017-04-23 16:05:38 +02:00
Jörg Thalheim
efd77e06c3
linuxPackages.zfs: 0.6.5.8 -> 0.6.5.9 2017-02-04 10:33:16 +01:00
Franz Pletz
56c6a4391f
zfs: add hint to try unstable version, fix typo 2017-01-21 23:35:55 +01:00