colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8902 from dezgeg/pr-nfs

Browse Source 
nfs-utils, rpcbind: Update packages to fix nfs3 test
This commit is contained in:
Edward Tjörnhammar 2015-07-21 16:48:38 +02:00
commit bed11354e9
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/os-specific/linux/nfs-utils/default.nix
View File

@ -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.

7
pkgs/servers/rpcbind/default.nix
View File

@ -1,16 +1,19 @@
{ fetchurl, stdenv, pkgconfig, libtirpc
, useSystemd ? true, systemd }:
let version = "0.2.3";
let version = "1.0.7";
in stdenv.mkDerivation rec {
name = "rpcbind-${version}";
src = fetchurl {
url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2";
sha256 = "0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq";
sha256 = "14vl0kmavc1fay630f4w8l1hjfzhmcqm8d0akzahhgymh5fw1f7r";
};
patches = [ ./sunrpc.patch ];
postPatch = ''
sed -e 's|/usr/include/tirpc|${libtirpc}/include/tirpc|' -i src/Makefile.am -i src/Makefile.in
'';
buildInputs = [ libtirpc ]
++ stdenv.lib.optional useSystemd systemd;