Commit Graph

202 Commits

Author SHA1 Message Date
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
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
Jörg Thalheim
c33e1e06fa
zfsUnstable: 0.7.0-rc2 -> 0.7.0-rc3 2017-01-21 18:18:17 +01:00
Jörg Thalheim
4029470a6f
zfs: add unstable variant
Until now nixos only delivered the latest zfs release. This release is often not
compatible with the latest mainline kernel. Therefor an unstable variant is
added, which might be based on testing releases or git revisions.

fixes #21359
2017-01-05 08:40:50 +01:00
Franz Pletz
1fec301ac5
zfs: remove zfs-tests
Removes runtime dependency on gcc and reduces closure size by more than 110MB.
2016-11-20 04:49:42 +01:00
Franz Pletz
c8c688b0c9
linuxPackages.zfs: 0.6.5.7 -> 0.6.5.8
Adds compatibility for 4.7 & 4.8 Linux kernels.
2016-09-25 14:20:46 +02:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Rok Garbas
81eceb14be zfs: 0.6.5.6 -> 0.6.5.7 2016-05-24 12:36:08 +02:00
Franz Pletz
2e08d8234e Merge remote-tracking branch 'origin/master' 2016-03-31 10:06:30 +02:00
Louis Taylor
259eb36205 zfs: 0.6.5.5 -> 0.6.5.6 2016-03-29 13:28:35 +01:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Louis Taylor
e99eeb4c3f zfs: 0.6.5.4 -> 0.6.5.5 2016-03-15 15:41:00 +00:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
f0e6c6ec0e linuxPackages.zfs: turn off pic hardening 2016-02-09 23:35:35 +00:00
Ricardo M. Correia
d51204e8de zfs: 0.6.5.3 -> 0.6.5.4 2016-01-19 16:34:14 +01:00
William A. Kennington III
f6361bc096 zfs: 0.6.5.2 -> 0.6.5.3 2015-11-02 11:01:17 -08:00
Ricardo M. Correia
ca9e807530 zfs: 0.6.5.1 -> 0.6.5.2 2015-10-05 12:58:19 +02:00
Eelco Dolstra
0e3c1e31b1 Remove zfs-git and spl-git
See https://github.com/NixOS/nixpkgs/pull/10042#commitcomment-13422343.
2015-09-29 14:54:12 +02:00
William A. Kennington III
d9fd037e88 zfs + zfs_git: 0.6.5 -> 0.6.5.1 2015-09-19 15:02:59 -07:00
William A. Kennington III
4a672c87cd zfs: Add a patch to fix discard data corruption 2015-09-18 14:55:36 -07:00
William A. Kennington III
6727f76739 zfs: Update to 0.6.5 2015-09-11 17:45:38 -07:00
William A. Kennington III
66563862ec zfs: Fix build for kernel 4.2 2015-09-01 08:57:02 -07:00
William A. Kennington III
38e2c1586b zfs_git: 2015-07-21 -> 2015-08-30 2015-08-31 00:09:18 -07:00
William A. Kennington III
c034e966bf zfs_git: 2015-05-13 -> 2015-07-21 2015-07-22 12:22:15 -07:00
Luca Bruno
6f5aa25e89 Revert "zfs_git: 2015-06-22 -> 2015-07-01"
This reverts commit 54022375eb.

Revert "zfs_git: 2015-05-13 -> 2015-06-22"

This reverts commit 59faa759da.

Closes #8941
2015-07-22 10:31:28 +02:00
William A. Kennington III
54022375eb zfs_git: 2015-06-22 -> 2015-07-01 2015-07-01 22:52:09 -07:00
William A. Kennington III
f6f9b9574d zfs: 0.6.4.1 -> 0.6.4.2 2015-07-01 22:50:49 -07:00
William A. Kennington III
59faa759da zfs_git: 2015-05-13 -> 2015-06-22 2015-06-24 23:41:46 -07:00
William A. Kennington III
2a8cf39952 zfs: Fix kernel 4.1 compat 2015-06-24 23:33:28 -07:00
Ricardo M. Correia
3afae4037b zfs: Fix systemd warning
The `zfs-share` service was trying to execute the `rm` binary, but it
was providing an invalid `/bin` path.

This should fix #8171.
2015-06-04 17:35:39 +02:00
Eelco Dolstra
cdeb271101 zfs: Nuke references to linux.dev in *.ko files
This prevents linux.dev being included in the installation CD.
2015-06-04 11:06:44 +02:00
William A. Kennington III
a5979edc8a zfs_git: 2015-04-08 -> 2015-05-13 2015-05-15 18:38:13 -07:00
Ricardo M. Correia
8119b8a0e4 zfs: Update from 0.6.4 -> 0.6.4.1 2015-05-02 01:05:54 +02:00
William A. Kennington III
7b34703b70 zfs: Fix pkgconfig 2015-04-21 20:57:58 -07:00
William A. Kennington III
ef03b0ffde zfs_git: 2015-04-03 -> 2015-04-08 2015-04-09 13:21:46 -07:00
William A. Kennington III
d8bf90c8a0 zfs: 0.6.3 -> 0.6.4 2015-04-09 13:21:46 -07:00
William A. Kennington III
8c330acec8 zfs_git: 2015-03-25 -> 2015-04-03 2015-04-04 20:12:38 -07:00
William A. Kennington III
ff21171921 Fix references to current-system/sw/sbin 2015-04-01 13:57:36 -07:00
William A. Kennington III
123bde971e zfs_git: 2015-03-20 -> 2015-03-25 2015-03-27 15:52:44 -07:00
William A. Kennington III
786f3216bc zfs_git: 2015-03-12 -> 2015-03-20 2015-03-22 12:20:53 -07:00
Ricardo M. Correia
5b074d20f8 zfs: Update from 0.6.3-1.2 -> 0.6.3-1.3 2015-03-19 06:08:08 +01:00
Ricardo M. Correia
92501d62f4 zfs_git: Update to 2015-03-12 2015-03-17 03:43:31 +01:00
William A. Kennington III
aad4e6fb84 zfs: 2015-03-05 -> 2015-03-10 2015-03-10 11:23:40 -07:00
William A. Kennington III
e49db703dc zfs_git: 2015-03-02 -> 2015-03-05 2015-03-06 11:56:43 -08:00