nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-03 20:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #67741 from averelld/nfs-utils-upgrade

Browse Source 
nfs-utils: 2.3.4 -> 2.4.1
This commit is contained in:
Marek Mahut 2019-08-30 16:53:03 +02:00 committed by GitHub
commit fd01dc5851
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/os-specific/linux/nfs-utils/default.nix
View File

@ -9,11 +9,11 @@ in
stdenv.mkDerivation rec {
name = "nfs-utils-${version}";
version = "2.3.4";
version = "2.4.1";
src = fetchurl {
url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${name}.tar.xz";
sha256 = "1kcn11glc3rma1gvykbk1s542mgz36ipi7yqxlk9jyh8hsiqncpq";
sha256 = "0dkp11a7i01c378ri68bf6k56z27kz8zzvpqm7mip6s7jkd4l9w5";
};
# libnfsidmap is built together with nfs-utils from the same source,
@ -47,14 +47,7 @@ stdenv.mkDerivation rec {
]
++ lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen";
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 [
patches = 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";