nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #152687 from markuskowa/upd-nfs-ganesha

Browse Source 
nfs-ganesha: 3.5 -> 4.0
This commit is contained in:
markuskowa 2021-12-30 14:51:41 +01:00 committed by GitHub
commit 96dae08553
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/ntirpc/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "ntirpc";
version = "3.4";
version = "4.0";
src = fetchFromGitHub {
owner = "nfs-ganesha";
repo = "ntirpc";
rev = "v${version}";
sha256 = "1xdwqyc9m4lbsgr7ll1g0f84c2h8jrfkg67cgvsp424i1a7r9mm1";
sha256 = "0hffma57b4c7g7862yvfr8bvbsbxh5w383mvjkjv3jpzi01l79yv";
};
postPatch = ''

6
pkgs/servers/nfs-ganesha/default.nix
View File

@ -5,17 +5,15 @@
stdenv.mkDerivation rec {
pname = "nfs-ganesha";
version = "3.5";
version = "4.0";
src = fetchFromGitHub {
owner = "nfs-ganesha";
repo = "nfs-ganesha";
rev = "V${version}";
sha256 = "sha256-N0qVlnMshsEcWEpPhtR+zXwFKXlik1XnEuZdFMjpZTE=";
sha256 = "1zv7aprmydyjs53xnn1h1s6xxb22pic7va23459zq0nfnhmsgd26";
};
patches = [ ./sysstatedir.patch ];
preConfigure = "cd src";
cmakeFlags = [ "-DUSE_SYSTEM_NTIRPC=ON" ];

22
pkgs/servers/nfs-ganesha/sysstatedir.patch
View File

@ -1,22 +0,0 @@
diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index 2a5795e9f..7314e0594 100644
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
@@ -71,13 +71,13 @@
#cmakedefine HAVE_URCU_REF_GET_UNLESS_ZERO 1
#define NFS_GANESHA 1
-#define GANESHA_CONFIG_PATH "@SYSCONFDIR@/ganesha/ganesha.conf"
-#define GANESHA_PIDFILE_PATH "@SYSSTATEDIR@/run/ganesha.pid"
-#define NFS_V4_RECOV_ROOT "@SYSSTATEDIR@/lib/nfs/ganesha"
+#define GANESHA_CONFIG_PATH "/etc/ganesha/ganesha.conf"
+#define GANESHA_PIDFILE_PATH "/run/ganesha.pid"
+#define NFS_V4_RECOV_ROOT "/var/lib/nfs/ganesha"
/**
* @brief Default value for krb5_param.ccache_dir
*/
-#define DEFAULT_NFS_CCACHE_DIR "@SYSSTATEDIR@/run/ganesha"
+#define DEFAULT_NFS_CCACHE_DIR "/run/ganesha"
/* We're LGPL'd */
#define _LGPL_SOURCE 1