diff options
author | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-31 14:23:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-31 14:23:56 +0200 |
commit | 4db15ba7b89623a9a0ad8871ad6df1a8c6189646 (patch) | |
tree | 3d3d2420bad04ad8c381f17cd6f3ca47ca867a99 /pkgs | |
parent | 865301fb8226944a899aa817ff355d0a8d065182 (diff) | |
parent | 037d27ed00435d6962c4eb9275466ccc4d2fbe77 (diff) | |
download | nixpkgs-4db15ba7b89623a9a0ad8871ad6df1a8c6189646.tar nixpkgs-4db15ba7b89623a9a0ad8871ad6df1a8c6189646.tar.gz nixpkgs-4db15ba7b89623a9a0ad8871ad6df1a8c6189646.tar.bz2 nixpkgs-4db15ba7b89623a9a0ad8871ad6df1a8c6189646.tar.lz nixpkgs-4db15ba7b89623a9a0ad8871ad6df1a8c6189646.tar.xz nixpkgs-4db15ba7b89623a9a0ad8871ad6df1a8c6189646.tar.zst nixpkgs-4db15ba7b89623a9a0ad8871ad6df1a8c6189646.zip |
Merge pull request #45748 from xeji/p/nfs-232
nfs-utils: 2.1.1 -> 2.3.2, integrate libnfsidmap
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/libnfsidmap/default.nix | 26 | ||||
-rw-r--r-- | pkgs/os-specific/linux/nfs-utils/default.nix | 19 | ||||
-rw-r--r-- | pkgs/os-specific/linux/sssd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 14 insertions, 37 deletions
diff --git a/pkgs/development/libraries/libnfsidmap/default.nix b/pkgs/development/libraries/libnfsidmap/default.nix deleted file mode 100644 index ce21cda4a5d..00000000000 --- a/pkgs/development/libraries/libnfsidmap/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ 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"; - }; - - postPatch = '' - sed -i '1i#include <sys/types.h>' cfg.h - ''; - - preConfigure = - '' - configureFlags="--with-pluginpath=$out/lib/libnfsidmap" - ''; - - 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"; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 359d1869084..f67663b3106 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, lib, pkgconfig, utillinux, libcap, libtirpc, libevent, libnfsidmap +{ stdenv, fetchurl, fetchpatch, lib, pkgconfig, utillinux, libcap, libtirpc, libevent , sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers , buildEnv }: @@ -14,17 +14,21 @@ let in stdenv.mkDerivation rec { name = "nfs-utils-${version}"; - version = "2.1.1"; + version = "2.3.2"; src = fetchurl { - url = "mirror://sourceforge/nfs/${name}.tar.bz2"; - sha256 = "02dvxphndpm8vpqqnl0zvij97dq9vsq2a179pzrjcv2i91ll2a0a"; + url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${name}.tar.xz"; + sha256 = "06av6cjf8h18dpaxh8cd1awsra75zf6s5sj5r2z5g7scbj051ziw"; }; + # libnfsidmap is built together with nfs-utils from the same source, + # put it in the "lib" output, and the headers in "dev" + outputs = [ "out" "dev" "lib" "man" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libtirpc libcap libevent libnfsidmap sqlite lvm2 + libtirpc libcap libevent sqlite lvm2 libuuid keyutils kerberos tcp_wrappers ]; @@ -34,8 +38,9 @@ in stdenv.mkDerivation rec { [ "--enable-gss" "--with-statedir=/var/lib/nfs" "--with-krb5=${kerberosEnv}" - "--with-systemd=$(out)/etc/systemd/system" + "--with-systemd=${placeholder "out"}/etc/systemd/system" "--enable-libmount-mount" + "--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap ] ++ lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen"; @@ -99,7 +104,7 @@ in stdenv.mkDerivation rec { daemons. ''; - homepage = https://sourceforge.net/projects/nfs/; + homepage = https://linux-nfs.org/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 0a55608af96..4224c4900db 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgs, glibc, augeas, dnsutils, c-ares, curl, - cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, libnfsidmap, doxygen, + cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen, python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap, pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, libuuid, ldap, systemd, nspr, check, cmocka, uid_wrapper, @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss - samba libnfsidmap doxygen python python3 popt + samba nfs-utils doxygen python python3 popt talloc tdb tevent pkgconfig ldb pam openldap pcre kerberos cifs-utils glib keyutils dbus fakeroot libxslt libxml2 libuuid ldap systemd nspr check cmocka uid_wrapper diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbbfcfdf9a6..4263054dc72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10550,8 +10550,6 @@ with pkgs; libnfs = callPackage ../development/libraries/libnfs { }; - libnfsidmap = callPackage ../development/libraries/libnfsidmap { }; - libnice = callPackage ../development/libraries/libnice { }; libnsl = callPackage ../development/libraries/libnsl { }; |