diff options
author | Ludovic Courtès <ludo@gnu.org> | 2010-04-27 09:43:22 +0000 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2010-04-27 09:43:22 +0000 |
commit | 7802763b45f50137dcdd2c6191b41a4a87fe64ea (patch) | |
tree | f8040889956b914a5f4db3e9c4126c6996479b23 | |
parent | 9ae4b8b11ca3c5f99ca88b49c49bb4250bd85857 (diff) |
Linux nfs-utils 1.2.2.
svn path=/nixpkgs/trunk/; revision=21336
-rw-r--r-- | pkgs/os-specific/linux/nfs-utils/default.nix | 32 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 25 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 90b9068eacc15..14be5f196f8b5 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,18 +1,29 @@ -{ fetchurl, stdenv, tcpWrapper, libuuid }: +{ fetchurl, stdenv, tcpWrapper, utillinuxng, libcap }: stdenv.mkDerivation rec { - name = "nfs-utils-1.2.0"; + name = "nfs-utils-1.2.2"; src = fetchurl { url = "mirror://sourceforge/nfs/${name}.tar.bz2"; - sha256 = "1ld1f6wcm53pza3zy768y1y8xa01zq3bnjyy1j3z62yd7a5lcffb"; + sha256 = "07nhr7ds5ic4x81l9qphrlmi4ifxl28xzr1zpzvg334ncrv2fizx"; }; # Needs `libblkid' and `libcomerr' from `e2fsprogs' or `util-linux-ng'. - buildInputs = [ tcpWrapper libuuid ]; - - # FIXME: Currently too lazy to build the dependencies needed for NFSv4. - configureFlags = "--disable-gss --disable-nfsv4 --with-statedir=/var/lib/nfs"; + buildInputs = [ tcpWrapper utillinuxng libcap ]; + + # FIXME: Add the dependencies needed for NFSv4 and TI-RPC. + configureFlags = + [ "--disable-gss" "--disable-nfsv4" "--disable-nfsv41" "--disable-tirpc" + "--with-statedir=/var/lib/nfs" + ]; + + patchPhase = + '' for i in "tests/"*.sh + do + sed -i "$i" -e's|/bin/bash|/bin/sh|g' + chmod +x "$i" + done + ''; preBuild = '' @@ -20,7 +31,9 @@ stdenv.mkDerivation rec { installFlags="statedir=$TMPDIR" # hack to make `make install' work ''; - meta = { + doCheck = true; + + meta = { description = "Linux user-space NFS utilities"; longDescription = '' @@ -31,5 +44,8 @@ stdenv.mkDerivation rec { homepage = http://nfs.sourceforge.net/; license = "GPLv2"; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a09fcc261735..fa2a5967b121f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5731,7 +5731,7 @@ let }; nfsUtils = import ../os-specific/linux/nfs-utils { - inherit fetchurl stdenv tcpWrapper libuuid; + inherit fetchurl stdenv tcpWrapper utillinuxng libcap; }; acpi = import ../os-specific/linux/acpi { |