Commit Graph

255 Commits

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