diff options
| author | Markus Kowalewski <markus.kowalewski@gmail.com> | 2020-12-26 14:22:38 +0100 |
|---|---|---|
| committer | Markus Kowalewski <markus.kowalewski@gmail.com> | 2020-12-26 14:22:38 +0100 |
| commit | 61b4bf53f08c0cb1f330758ad43961634f5c0a62 (patch) | |
| tree | 7a8e9f86fd71fb712d3a15ddab23ca964e8110ec /pkgs/servers | |
| parent | 1e40e796af18f0bd83ff4d98f1b39a2eaeca6b33 (diff) | |
| download | nixlib-61b4bf53f08c0cb1f330758ad43961634f5c0a62.tar nixlib-61b4bf53f08c0cb1f330758ad43961634f5c0a62.tar.gz nixlib-61b4bf53f08c0cb1f330758ad43961634f5c0a62.tar.bz2 nixlib-61b4bf53f08c0cb1f330758ad43961634f5c0a62.tar.lz nixlib-61b4bf53f08c0cb1f330758ad43961634f5c0a62.tar.xz nixlib-61b4bf53f08c0cb1f330758ad43961634f5c0a62.tar.zst nixlib-61b4bf53f08c0cb1f330758ad43961634f5c0a62.zip | |
nfs-ganesha: 3.3 -> 3.4
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/nfs-ganesha/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/nfs-ganesha/sysstatedir.patch | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index adbcbb63759b..7ec56b023e59 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "3.3"; + version = "3.4"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "1w48rqrbqah0hnirvjdz8lyr9ah8b73j3cgsppb04gnrmpssgmb6"; + sha256 = "1qi617ppjjl38mqpbxiqhpxanq9qgqshb87cajs30rqkv9nj811k"; }; patches = [ ./sysstatedir.patch ]; diff --git a/pkgs/servers/nfs-ganesha/sysstatedir.patch b/pkgs/servers/nfs-ganesha/sysstatedir.patch index 534f71743e71..fff3d5897353 100644 --- a/pkgs/servers/nfs-ganesha/sysstatedir.patch +++ b/pkgs/servers/nfs-ganesha/sysstatedir.patch @@ -1,15 +1,22 @@ diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake -index 51697310b..2b5f91075 100644 +index 2a5795e9f..7314e0594 100644 --- a/src/include/config-h.in.cmake +++ b/src/include/config-h.in.cmake -@@ -72,8 +72,8 @@ +@@ -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_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 |