Author: viric
Date: Tue Mar 20 23:17:45 2012
New Revision: 33315
URL: https://nixos.org/websvn/nix/?rev=33315&sc=1
Log:
Enabling nfsv4 and nfsv41 in nfsUtils (or at least I think so).
Added:
nixpkgs/trunk/pkgs/development/libraries/libnfsidmap/
nixpkgs/trunk/pkgs/development/libraries/libnfsidmap/default.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/ti-rpc/default.nix
nixpkgs/trunk/pkgs/os-specific/linux/nfs-utils/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/libnfsidmap/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/libnfsidmap/default.nix Tue Mar
20 23:17:45 2012 (r33315)
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "libnfsidmap-0.25";
+
+ src = fetchurl {
+ url =
"http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${name}.tar.gz";;
+ sha256 = "1kzgwxzh83qi97rblcm9qj80cdvnv8kml2plz0q103j0hifj8vb5";
+ };
+
+ meta = {
+ homepage = http://www.citi.umich.edu/projects/nfsv4/linux/;
+ description = "Library for holding mulitiple methods of mapping names to
id's and visa versa, mainly for NFSv4";
+ license = "BSD";
+ };
+}
Modified: nixpkgs/trunk/pkgs/development/libraries/ti-rpc/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/ti-rpc/default.nix Tue Mar 20
22:19:48 2012 (r33314)
+++ nixpkgs/trunk/pkgs/development/libraries/ti-rpc/default.nix Tue Mar 20
23:17:45 2012 (r33315)
@@ -8,7 +8,10 @@
sha256 =
"f05eb17c85d62423858b8f74512cfe66a9ae1cedf93f03c2a0a32e04f0a33705";
};
+ #
http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf
preConfigure = ''
+ echo "" > src/des_crypt.c
+
sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i "doc/Makefile.in"
'';
Modified: nixpkgs/trunk/pkgs/os-specific/linux/nfs-utils/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/nfs-utils/default.nix Tue Mar 20
22:19:48 2012 (r33314)
+++ nixpkgs/trunk/pkgs/os-specific/linux/nfs-utils/default.nix Tue Mar 20
23:17:45 2012 (r33315)
@@ -1,4 +1,5 @@
-{ fetchurl, stdenv, tcpWrapper, utillinux, libcap }:
+{ fetchurl, stdenv, tcpWrapper, utillinux, libcap, libtirpc, libevent,
libnfsidmap, lvm2,
+ e2fsprogs }:
stdenv.mkDerivation rec {
name = "nfs-utils-1.2.5";
@@ -8,13 +9,14 @@
sha256 = "16ssfkj36ljifyaskgwpd3ys8ylhi5gasq88aha3bhg5dr7yv59m";
};
- # Needs `libblkid' and `libcomerr' from `e2fsprogs' or `util-linux-ng'.
- buildInputs = [ tcpWrapper utillinux libcap ];
+ buildInputs = [ tcpWrapper utillinux libcap libtirpc libevent libnfsidmap
lvm2
+ e2fsprogs ];
# FIXME: Add the dependencies needed for NFSv4 and TI-RPC.
configureFlags =
- [ "--disable-gss" "--disable-nfsv4" "--disable-nfsv41" "--disable-tirpc"
+ [ "--disable-gss"
"--with-statedir=/var/lib/nfs"
+ "--with-tirpcinclude=${libtirpc}/include/tirpc"
]
++ stdenv.lib.optional (stdenv ? glibc)
"--with-rpcgen=${stdenv.glibc}/bin/rpcgen";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Mar 20 22:19:48
2012 (r33314)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Mar 20 23:17:45
2012 (r33315)
@@ -4035,6 +4035,8 @@
libnatspec = callPackage ../development/libraries/libnatspec { };
+ libnfsidmap = callPackage ../development/libraries/libnfsidmap { };
+
libnice = callPackage ../development/libraries/libnice { };
libplist = callPackage ../development/libraries/libplist { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
