Commit Graph

312 Commits

Author SHA1 Message Date
TredwellGit
04bbfd1b88 linux_5_14: remove
https://lwn.net/ml/linux-kernel/1637500331152110@kroah.com/
https://github.com/openzfs/zfs/issues/12786
2021-12-08 00:15:07 +00:00
Jörg Thalheim
b8df591eb6 zfs: remove myself as maintainer 2021-11-16 23:29:49 +01:00
TredwellGit
28289f34ec Revert "zfs: unlock for 5.15"
This reverts commit 86e057aa5b.
2021-11-16 22:11:25 +00:00
Jörg Thalheim
86e057aa5b zfs: unlock for 5.15 2021-11-13 09:41:34 +01:00
Julien Moutinho
736dcd8955 zfs-kernel: fix strip in cross-compilation 2021-10-28 20:11:18 -07:00
Jörg Thalheim
54bf57aa1b zfs: add docs why we strip symbols manual 2021-10-18 09:49:40 +02:00
Jörg Thalheim
eefdd9ffb2 zfs: strip debug symbols
initrd-linux: -12427.8 KiB
linux: -12419.3 KiB
nc2k9ym14spzz2pgq6hn84k8k9zgf686: ∅ → ε, +102451.2 KiB
nixos-system-turingmachine: 21.11.20211015.a2dcfa2 → 21.11.20211017.c6f77b7
visjwxsjqmh8c9lxnrxsw5w19zszflm6: ε → ∅, -102451.0 KiB
zfs-kernel: -12419.3 KiB
2021-10-17 07:04:22 +02:00
figsoda
8212bd0ed1
Merge pull request #138466 from samuelgrf/mainProgram-multiple-II
Add meta.mainProgram to multiple packages
2021-09-19 11:59:16 -04:00
Samuel Gräfenstein
9d5298933a
zfs: add meta.mainProgram
Fix the following error when running `nix run .#zfs`:
error: unable to execute '/nix/store/ns6rifm17r0lp17w8gb4qr5db4cwbkj9-zfs-user-2.1.1/bin/zfs-user': No such file or directory
2021-09-19 00:11:17 +02:00
Henri Menke
a0bbb9e766
zfsUnstable: correct sha256 2021-09-18 16:28:08 +02:00
sternenseemann
29f8f30b37 zfsStable, zfsUnstable: fix eval 2021-09-17 10:05:42 +00:00
Bernardo Meurer
af69a71395
linuxPackages.zfs: 2.1.0 -> 2.1.1 2021-09-16 11:22:57 -07:00
github-actions[bot]
704a7a86ca
Merge master into staging-next 2021-09-03 00:01:42 +00:00
Bernardo Meurer
ab1d85c0b1
Revert "linuxPackages.zfs: fix m4 script when not using GCC"
This reverts commit 5280cdee8d.
2021-09-02 13:45:53 -07:00
Bernardo Meurer
a12606bef4
linuxPackages.zfs: use the kernel's stdenv when possible 2021-09-02 13:45:52 -07:00
github-actions[bot]
ce1d6621cd
Merge master into staging-next 2021-09-02 00:01:38 +00:00
Bernardo Meurer
03f44bd225
Merge pull request #136251 from lovesegfault/zfs-fix-configure
linuxPackages.zfs: fix m4 script when not using GCC
2021-09-01 18:15:02 +00:00
Alyssa Ross
c13cf1e76f
Merge remote-tracking branch 'nixpkgs/master' into staging-next 2021-09-01 07:47:01 +00:00
adisbladis
19ea42a1f6
zfsUnstable: 2.1.0 -> unstable-2021-08-30 2021-08-31 09:59:20 -05:00
Bernardo Meurer
5280cdee8d
linuxPackages.zfs: fix m4 script when not using GCC 2021-08-30 17:25:19 -07:00
Dominik Xaver Hörl
c62f911507 top-level: move linux kernels, packages and related functions to linux-kernels.nix 2021-08-12 12:22:03 +02:00
Jonathan Ringer
e3074263be zfs: add latestCompatibleLinuxPackages option 2021-08-04 12:56:59 -07:00
Jonathan Ringer
6f1b155d37
zfsUnstable: 2.1.0-rc8 -> 2.1.0 2021-07-02 12:59:20 -07:00
Jonathan Ringer
4a397269c9
zfs: 2.0.5 -> 2.1.0 2021-07-02 12:58:42 -07:00
TredwellGit
5ef8322daa zfsUnstable: 2.1.0-rc7 -> 2.1.0-rc8
https://github.com/openzfs/zfs/releases/tag/zfs-2.1.0-rc8
2021-06-30 10:03:32 -07:00
Robert Schütz
ec8dbc11aa zfs: 2.0.4 -> 2.0.5
https://github.com/openzfs/zfs/releases/tag/zfs-2.0.5
2021-06-24 11:25:01 +02:00
Jörg Thalheim
7c2d15627a
Merge pull request #92378 from jnetod/zfs-smb-share-fix
zfs: patch client path used in smb share
2021-06-21 07:11:43 +02:00
TredwellGit
eeb255207d zfsUnstable: 2.1.0-rc6 -> 2.1.0-rc7
https://github.com/openzfs/zfs/releases/tag/zfs-2.1.0-rc7
2021-06-11 15:31:30 -07:00
jnetod
e16e51702b zfs: patch client path used in smb share
fix zfs smb share integration

before:

# zfs share tank/smb_share
cannot share tank/smb_share: smb add share failed

now works as intended.
2021-06-08 23:44:34 -03:00
TredwellGit
917884725d zfsUnstable: 2.1.0-rc5 -> 2.1.0-rc6
https://github.com/openzfs/zfs/releases/tag/zfs-2.1.0-rc6
2021-05-30 02:42:06 +00:00
fortuneteller2k
e97d557475 zfsUnstable: 2.1.0-rc4 -> 2.1.0-rc5 2021-05-11 11:35:33 +08:00
Henri Menke
e4b05d9af5
zfs: remove trace output
We cannot have trace output if the package is marked broken, because
ofborg will consider the evaluation failed if there is any output. Hence
if there is any unsupported kernel version in nixpkgs, the trace will
show up and ofborg will complain.
2021-05-10 21:01:54 +02:00
Henri Menke
33fff37020
zfsUnstable: 2.1.0-rc3 -> 2.1.0-rc4 2021-04-23 11:25:37 +02:00
Henri Menke
b14062b75c zfsUnstable: 2.0.4 -> 2.1.0-rc3
In https://github.com/openzfs/zfs/commit/658fb802 OpenZFS introduced a
new compatibility feature. This is accompanied by some default profiles
which are located in the $out output of the Nix derivation. However,
these compatibility profiles are used by both the zpool executable
located in $out and the libzfs library located in $lib. This
inadvertently creates a cycle, because zpool refers to $lib to link
against libzfs but libzfs refers back to $out for the compatibility
profiles.

There are two possible routes to rectify this problem:

 1. Patch the zpool source code to not read the compatibility profiles
    and adjust the build system to put them into the $lib output.

 2. Simply remove the $out/$lib split.

Since no other derivation in nixpkgs refers to the $lib output
explicitly we opt for the latter, because this is also in accordance
with upstream.
2021-04-21 09:08:18 -07:00
Henri Menke
fea3cb98e1 zfs: 2.0.3 -> 2.0.4 2021-03-10 10:16:30 -08:00
Sandro Jäckel
1aa4d1d846
zfs: remove unused input 2021-02-18 00:00:44 +01:00
Tim Steinbach
4d86791dd2 zfs: Enable 2.0.3 for kernel 5.11 2021-02-17 09:12:50 -05:00
Henri Menke
3f0e6e1daa zfs: 2.0.2 -> 2.0.3 2021-02-14 19:41:22 -08:00
Cole Helbling
1ed5b6a285
zfs: disable smartmontools mail functionality 2021-02-06 22:04:00 -08:00
Tim Steinbach
429800ea40 zfs: Add test references 2021-02-04 09:38:46 -05:00
Henri Menke
bde2fffbbe zfs: 2.0.1 -> 2.0.2 2021-02-03 11:18:48 -08:00
Tim Steinbach
b673417493
Revert "zfs: 2.0.1 -> 2.0.2"
This reverts commit e347e96601.
2021-02-01 20:23:03 -05:00
Henri Menke
e347e96601 zfs: 2.0.1 -> 2.0.2 2021-02-01 15:16:37 -05:00
Philipp Mildenberger
c67f9d2935 zfs: fix zfs legacy mount
Closes #110376
2021-01-31 17:03:23 +01:00
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