diff options
Diffstat (limited to 'pkgs/os-specific/linux/nfs-utils/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/nfs-utils/default.nix | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 719ded4d70f..7b5f6e72001 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,31 +1,31 @@ -{ stdenv, fetchurl, fetchpatch, lib, pkgconfig, utillinux, libcap, libtirpc, libevent -, sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers -, python3, buildPackages, nixosTests +{ stdenv, fetchurl, fetchpatch, lib, pkg-config, util-linux, libcap, libtirpc, libevent +, sqlite, libkrb5, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers +, python3, buildPackages, nixosTests, rpcsvc-proto , enablePython ? true }: let - statdPath = lib.makeBinPath [ systemd utillinux coreutils ]; + statdPath = lib.makeBinPath [ systemd util-linux coreutils ]; in stdenv.mkDerivation rec { pname = "nfs-utils"; - version = "2.4.1"; + version = "2.5.1"; src = fetchurl { url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz"; - sha256 = "0dkp11a7i01c378ri68bf6k56z27kz8zzvpqm7mip6s7jkd4l9w5"; + sha256 = "1i1h3n2m35q9ixs1i2qf1rpjp10cipa3c25zdf1xj1vaw5q8270g"; }; # 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 buildPackages.stdenv.cc ]; + nativeBuildInputs = [ pkg-config buildPackages.stdenv.cc rpcsvc-proto ]; buildInputs = [ libtirpc libcap libevent sqlite lvm2 - libuuid keyutils kerberos tcp_wrappers + libuuid keyutils libkrb5 tcp_wrappers ] ++ lib.optional enablePython python3; enableParallelBuilding = true; @@ -33,20 +33,20 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace configure \ - --replace '$dir/include/gssapi' ${lib.getDev kerberos}/include/gssapi \ - --replace '$dir/bin/krb5-config' ${lib.getDev kerberos}/bin/krb5-config + --replace '$dir/include/gssapi' ${lib.getDev libkrb5}/include/gssapi \ + --replace '$dir/bin/krb5-config' ${lib.getDev libkrb5}/bin/krb5-config ''; configureFlags = [ "--enable-gss" "--enable-svcgss" "--with-statedir=/var/lib/nfs" - "--with-krb5=${lib.getLib kerberos}" + "--with-krb5=${lib.getLib libkrb5}" "--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"; + "--with-rpcgen=${buildPackages.rpcsvc-proto}/bin/rpcgen" + ]; patches = lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { # https://bugzilla.kernel.org/show_bug.cgi?id=203793 doCheck = false; - disallowedReferences = [ (lib.getDev kerberos) ]; + disallowedReferences = [ (lib.getDev libkrb5) ]; passthru.tests = { nfs3-simple = nixosTests.nfs3.simple; @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { nfs4-kerberos = nixosTests.nfs4.kerberos; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux user-space NFS utilities"; longDescription = '' |