diff options
| author | Edward Tjörnhammar <ed@cflags.cc> | 2015-07-21 16:48:38 +0200 |
|---|---|---|
| committer | Edward Tjörnhammar <ed@cflags.cc> | 2015-07-21 16:48:38 +0200 |
| commit | bed11354e968cc2971da580dcccd7674afb62fd8 (patch) | |
| tree | 12b33439802477c9123fd961d28a2d5899a963d3 /pkgs/os-specific/linux | |
| parent | fe71fc8c0b8c7213935dcb30db9a6680a53adb97 (diff) | |
| parent | 5c31245047a4bd0966059d0d5cd4e701745ee6c4 (diff) | |
| download | nixlib-bed11354e968cc2971da580dcccd7674afb62fd8.tar nixlib-bed11354e968cc2971da580dcccd7674afb62fd8.tar.gz nixlib-bed11354e968cc2971da580dcccd7674afb62fd8.tar.bz2 nixlib-bed11354e968cc2971da580dcccd7674afb62fd8.tar.lz nixlib-bed11354e968cc2971da580dcccd7674afb62fd8.tar.xz nixlib-bed11354e968cc2971da580dcccd7674afb62fd8.tar.zst nixlib-bed11354e968cc2971da580dcccd7674afb62fd8.zip | |
Merge pull request #8902 from dezgeg/pr-nfs
nfs-utils, rpcbind: Update packages to fix nfs3 test
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/nfs-utils/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 6b30104b0833..75f25e268042 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,18 +1,18 @@ { fetchurl, stdenv, tcp_wrappers, utillinux, libcap, libtirpc, libevent, libnfsidmap -, lvm2, e2fsprogs, python +, lvm2, e2fsprogs, python, sqlite }: stdenv.mkDerivation rec { - name = "nfs-utils-1.2.5"; + name = "nfs-utils-1.3.2"; # NOTE: when updating, remove the HACK BUG FIX below src = fetchurl { url = "mirror://sourceforge/nfs/${name}.tar.bz2"; - sha256 = "16ssfkj36ljifyaskgwpd3ys8ylhi5gasq88aha3bhg5dr7yv59m"; + sha256 = "1xwilpdr1vizq2yhpzxpwqqr9f8kn0dy2wcpc626mf30ybp7572v"; }; buildInputs = [ tcp_wrappers utillinux libcap libtirpc libevent libnfsidmap - lvm2 e2fsprogs python + lvm2 e2fsprogs python sqlite ]; # FIXME: Add the dependencies needed for NFSv4 and TI-RPC. @@ -32,14 +32,15 @@ stdenv.mkDerivation rec { done sed -i s,/usr/sbin,$out/sbin, utils/statd/statd.c - # https://bugzilla.redhat.com/show_bug.cgi?id=749195 - sed -i s,PAGE_SIZE,getpagesize\(\), utils/blkmapd/device-process.c + # HACK BUG FIX: needed for 1.3.2 + # http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=17a3e5bffb7110d46de1bf42b64b90713ff5ea50 + sed -e 's,daemon_init(!,daemon_init(,' -i utils/statd/statd.c ''; preBuild = '' makeFlags="sbindir=$out/sbin" - installFlags="statedir=$TMPDIR" # hack to make `make install' work + installFlags="statedir=$TMPDIR statdpath=$TMPDIR" # hack to make `make install' work ''; # One test fails on mips. |