diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-08-04 21:37:39 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-08-04 21:37:39 +0200 |
commit | 8bbc202208d0a972e1a1a973f19b4ae0415bce4b (patch) | |
tree | 7a4f4702191f40b493eb160a0ddc14fb553ac17e /pkgs/servers | |
parent | 26c481b43576a9fed903ecd16b83c180e060548f (diff) | |
parent | 6a617de2c41eb15dee7c08fccffc0bee9c1ae125 (diff) | |
download | nixpkgs-8bbc202208d0a972e1a1a973f19b4ae0415bce4b.tar nixpkgs-8bbc202208d0a972e1a1a973f19b4ae0415bce4b.tar.gz nixpkgs-8bbc202208d0a972e1a1a973f19b4ae0415bce4b.tar.bz2 nixpkgs-8bbc202208d0a972e1a1a973f19b4ae0415bce4b.tar.lz nixpkgs-8bbc202208d0a972e1a1a973f19b4ae0415bce4b.tar.xz nixpkgs-8bbc202208d0a972e1a1a973f19b4ae0415bce4b.tar.zst nixpkgs-8bbc202208d0a972e1a1a973f19b4ae0415bce4b.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/nfs-ganesha/default.nix | 48 | ||||
-rw-r--r-- | pkgs/servers/nfs-ganesha/sysstatedir.patch | 15 | ||||
-rw-r--r-- | pkgs/servers/ser2net/default.nix | 4 |
3 files changed, 65 insertions, 2 deletions
diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix new file mode 100644 index 00000000000..adbcbb63759 --- /dev/null +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, cmake, pkg-config +, krb5, xfsprogs, jemalloc, dbus, libcap +, ntirpc, liburcu, bison, flex, nfs-utils +} : + +stdenv.mkDerivation rec { + pname = "nfs-ganesha"; + version = "3.3"; + + src = fetchFromGitHub { + owner = "nfs-ganesha"; + repo = "nfs-ganesha"; + rev = "V${version}"; + sha256 = "1w48rqrbqah0hnirvjdz8lyr9ah8b73j3cgsppb04gnrmpssgmb6"; + }; + + patches = [ ./sysstatedir.patch ]; + + preConfigure = "cd src"; + + cmakeFlags = [ "-DUSE_SYSTEM_NTIRPC=ON" ]; + + nativeBuildInputs = [ + cmake + pkg-config + bison + flex + ]; + + buildInputs = [ + krb5 + xfsprogs + jemalloc + dbus.lib + libcap + ntirpc + liburcu + nfs-utils + ]; + + meta = with stdenv.lib; { + description = "NFS server that runs in user space"; + homepage = "https://github.com/nfs-ganesha/nfs-ganesha/wiki"; + maintainers = [ maintainers.markuskowa ]; + platforms = platforms.linux; + license = licenses.lgpl3Plus; + }; +} diff --git a/pkgs/servers/nfs-ganesha/sysstatedir.patch b/pkgs/servers/nfs-ganesha/sysstatedir.patch new file mode 100644 index 00000000000..534f71743e7 --- /dev/null +++ b/pkgs/servers/nfs-ganesha/sysstatedir.patch @@ -0,0 +1,15 @@ +diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake +index 51697310b..2b5f91075 100644 +--- a/src/include/config-h.in.cmake ++++ b/src/include/config-h.in.cmake +@@ -72,8 +72,8 @@ + #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_PIDFILE_PATH "/run/ganesha.pid" ++#define NFS_V4_RECOV_ROOT "/var/lib/nfs/ganesha" + /** + * @brief Default value for krb5_param.ccache_dir + */ diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix index bbfb0315d9e..9f82a76c323 100644 --- a/pkgs/servers/ser2net/default.nix +++ b/pkgs/servers/ser2net/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.1.8"; + version = "4.2.0"; src = fetchFromGitHub { owner = "cminyard"; repo = "${pname}"; rev = "v${version}"; - sha256 = "0xxxxlfi4wln2l86ybdsc42qcj37mnac2s2baj6s7mqri8alaa14"; + sha256 = "154sc7aa74c2vwfwan41qwqxckp36lw9wf3qydamsyvd9ampjf5x"; }; buildInputs = [ pkgconfig autoreconfHook gensio libyaml ]; |