Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5'

1 files changed, 13 insertions, 6 deletions

diff --git a/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix
index 19a5184f8962..d7eafd9246d0 100644
--- a/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -9,11 +9,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "nfs-utils-${version}";
-  version = "2.3.3";
+  version = "2.3.4";
 
   src = fetchurl {
     url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${name}.tar.xz";
-    sha256 = "08k36d7l8yqylscnln3p85lcfwi7r7g6n3bnslgmzc1i71wk92zn";
+    sha256 = "1kcn11glc3rma1gvykbk1s542mgz36ipi7yqxlk9jyh8hsiqncpq";
   };
 
   # libnfsidmap is built together with nfs-utils from the same source,
@@ -37,8 +37,6 @@ stdenv.mkDerivation rec {
         --replace '$dir/bin/krb5-config' ${lib.getDev kerberos}/bin/krb5-config
     '';
 
-  #configureScript = "bash -x configure";
-
   configureFlags =
     [ "--enable-gss"
       "--with-statedir=/var/lib/nfs"
@@ -49,7 +47,14 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen";
 
-  patches = lib.optionals stdenv.hostPlatform.isMusl [
+  patches = [
+    # Fixes build on i686.
+    (fetchpatch {
+      name = "sqlite.c-Use-PRIx64-macro-to-print-64-bit-integers.patch";
+      url = "http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff_plain;h=a8133e1fd174267536cd459e19cfe0a1cbbe037c;hp=a709f25c1da4a2fb44a1f3fd060298fbbd88aa3c";
+      sha256 = "03azkw13xhp8f49777p08xziy0d7crz65qrisjbkzjnx1wczdqy5";
+    })
+  ] ++ lib.optionals stdenv.hostPlatform.isMusl [
     (fetchpatch {
       url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch";
       sha256 = "0rrddrykz8prk0dcgfvmnz0vxn09dbgq8cb098yjjg19zz6d7vid";
@@ -100,7 +105,9 @@ stdenv.mkDerivation rec {
     '';
 
   # One test fails on mips.
-  doCheck = !stdenv.isMips;
+  # doCheck = !stdenv.isMips;
+  # https://bugzilla.kernel.org/show_bug.cgi?id=203793
+  doCheck = false;
 
   disallowedReferences = [ (lib.getDev kerberos) ];