Commit graph

128 commits

Author SHA1 Message Date
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