pyrox.dev
Merge pull request #152687 from markuskowa/upd-nfs-ganesha
nfs-ganesha: 3.5 -> 4.0
authored by markuskowa and committed by GitHub 96dae085 f0621158
+2
-2
pkgs/development/libraries/ntirpc/default.nix
+2
-2
pkgs/development/libraries/ntirpc/default.nix
···
4
4
5
5
stdenv.mkDerivation rec {
6
6
pname = "ntirpc";
7
-
version = "3.4";
7
+
version = "4.0";
8
8
9
9
src = fetchFromGitHub {
10
10
owner = "nfs-ganesha";
11
11
repo = "ntirpc";
12
12
rev = "v${version}";
13
-
sha256 = "1xdwqyc9m4lbsgr7ll1g0f84c2h8jrfkg67cgvsp424i1a7r9mm1";
13
+
sha256 = "0hffma57b4c7g7862yvfr8bvbsbxh5w383mvjkjv3jpzi01l79yv";
14
14
};
15
15
16
16
postPatch = ''
+2
-4
pkgs/servers/nfs-ganesha/default.nix
+2
-4
pkgs/servers/nfs-ganesha/default.nix
···
5
5
6
6
stdenv.mkDerivation rec {
7
7
pname = "nfs-ganesha";
8
-
version = "3.5";
8
+
version = "4.0";
9
9
10
10
src = fetchFromGitHub {
11
11
owner = "nfs-ganesha";
12
12
repo = "nfs-ganesha";
13
13
rev = "V${version}";
14
-
sha256 = "sha256-N0qVlnMshsEcWEpPhtR+zXwFKXlik1XnEuZdFMjpZTE=";
14
+
sha256 = "1zv7aprmydyjs53xnn1h1s6xxb22pic7va23459zq0nfnhmsgd26";
15
15
};
16
-
17
-
patches = [ ./sysstatedir.patch ];
18
16
19
17
preConfigure = "cd src";
20
18
-22
pkgs/servers/nfs-ganesha/sysstatedir.patch
-22
pkgs/servers/nfs-ganesha/sysstatedir.patch
···
1
-
diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
2
-
index 2a5795e9f..7314e0594 100644
3
-
--- a/src/include/config-h.in.cmake
4
-
+++ b/src/include/config-h.in.cmake
5
-
@@ -71,13 +71,13 @@
6
-
#cmakedefine HAVE_URCU_REF_GET_UNLESS_ZERO 1
7
-
#define NFS_GANESHA 1
8
-
9
-
-#define GANESHA_CONFIG_PATH "@SYSCONFDIR@/ganesha/ganesha.conf"
10
-
-#define GANESHA_PIDFILE_PATH "@SYSSTATEDIR@/run/ganesha.pid"
11
-
-#define NFS_V4_RECOV_ROOT "@SYSSTATEDIR@/lib/nfs/ganesha"
12
-
+#define GANESHA_CONFIG_PATH "/etc/ganesha/ganesha.conf"
13
-
+#define GANESHA_PIDFILE_PATH "/run/ganesha.pid"
14
-
+#define NFS_V4_RECOV_ROOT "/var/lib/nfs/ganesha"
15
-
/**
16
-
* @brief Default value for krb5_param.ccache_dir
17
-
*/
18
-
-#define DEFAULT_NFS_CCACHE_DIR "@SYSSTATEDIR@/run/ganesha"
19
-
+#define DEFAULT_NFS_CCACHE_DIR "/run/ganesha"
20
-
21
-
/* We're LGPL'd */
22
-
#define _LGPL_SOURCE 1