diff options
Diffstat (limited to 'pkgs/servers/nfs-ganesha')
| -rw-r--r-- | pkgs/servers/nfs-ganesha/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/nfs-ganesha/sysstatedir.patch | 22 |
2 files changed, 2 insertions, 26 deletions
diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index b5533e10b2f..0c8b871ade7 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -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" ]; diff --git a/pkgs/servers/nfs-ganesha/sysstatedir.patch b/pkgs/servers/nfs-ganesha/sysstatedir.patch deleted file mode 100644 index fff3d589735..00000000000 --- a/pkgs/servers/nfs-ganesha/sysstatedir.patch +++ /dev/null @@ -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 |