summary refs log tree commit diff
path: root/pkgs/os-specific/linux/nfs-utils
diff options
context:
space:
mode:
authorajs124 <git@ajs124.de>2022-08-17 00:59:48 +0200
committerajs124 <git@ajs124.de>2022-08-17 00:59:48 +0200
commit356ea489afc21e70a3c927dd4684e2dde75fc5e6 (patch)
treede715327bebc71013a4ff84e9162c06b0810b396 /pkgs/os-specific/linux/nfs-utils
parentce7b4fd5a67118b869abe57803ccd7e7a4ff6a28 (diff)
downloadnixpkgs-356ea489afc21e70a3c927dd4684e2dde75fc5e6.tar
nixpkgs-356ea489afc21e70a3c927dd4684e2dde75fc5e6.tar.gz
nixpkgs-356ea489afc21e70a3c927dd4684e2dde75fc5e6.tar.bz2
nixpkgs-356ea489afc21e70a3c927dd4684e2dde75fc5e6.tar.lz
nixpkgs-356ea489afc21e70a3c927dd4684e2dde75fc5e6.tar.xz
nixpkgs-356ea489afc21e70a3c927dd4684e2dde75fc5e6.tar.zst
nixpkgs-356ea489afc21e70a3c927dd4684e2dde75fc5e6.zip
nfs-utils: 2.5.1 -> 2.6.2
Diffstat (limited to 'pkgs/os-specific/linux/nfs-utils')
-rw-r--r--pkgs/os-specific/linux/nfs-utils/default.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 7b5f6e72001..acb325a6e09 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -10,11 +10,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "nfs-utils";
-  version = "2.5.1";
+  version = "2.6.2";
 
   src = fetchurl {
-    url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz";
-    sha256 = "1i1h3n2m35q9ixs1i2qf1rpjp10cipa3c25zdf1xj1vaw5q8270g";
+    url = "mirror://kernel/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz";
+    hash = "sha256-UgCHPoHE1hDiRi/CYv4YE18tvni3l5+VrM0VmuZNUBE=";
   };
 
   # libnfsidmap is built together with nfs-utils from the same source,
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
       "--enable-libmount-mount"
       "--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap
       "--with-rpcgen=${buildPackages.rpcsvc-proto}/bin/rpcgen"
+      "--with-modprobedir=${placeholder "out"}/etc/modprobe.d"
     ];
 
   patches = lib.optionals stdenv.hostPlatform.isMusl [
@@ -71,6 +72,9 @@ stdenv.mkDerivation rec {
       substituteInPlace systemd/nfs-utils.service \
         --replace "/bin/true" "${coreutils}/bin/true"
 
+      substituteInPlace tools/nfsrahead/Makefile.in \
+        --replace "/usr/lib/udev/rules.d/" "$out/lib/udev/rules.d/"
+
       substituteInPlace utils/mount/Makefile.in \
         --replace "chmod 4511" "chmod 0511"