diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-18 09:48:49 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-18 09:48:49 +0100 |
commit | 620c147ccee09d7d068fa21b2b5b94b6695993a5 (patch) | |
tree | 8bfa9b076f2712ba0318c986dcf80749e281db2d /pkgs/servers | |
parent | 85628148de308b96744986f44ef0d05807125082 (diff) | |
parent | c23b0856fda476df6aa58bcded9de6bdbeefdaed (diff) |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/http/nginx/modules.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/pshs/default.nix | 11 | ||||
-rw-r--r-- | pkgs/servers/mail/rmilter/default.nix | 22 | ||||
-rw-r--r-- | pkgs/servers/mail/rspamd/default.nix | 38 | ||||
-rw-r--r-- | pkgs/servers/matrix-synapse/default.nix | 45 | ||||
-rw-r--r-- | pkgs/servers/matrix-synapse/matrix-synapse.patch | 20 | ||||
-rw-r--r-- | pkgs/servers/rt/default.nix | 23 | ||||
-rw-r--r-- | pkgs/servers/rt/override-generated.patch | 21 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 |
9 files changed, 180 insertions, 8 deletions
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 00b3c6a9d6a4c..d0d587eb0410e 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -71,8 +71,8 @@ src = fetchFromGitHub { owner = "openresty"; repo = "lua-nginx-module"; - rev = "v0.9.19"; - sha256 = "13h58rzdfhc5kc4xqwrd2p34rgnwim4hikq923cnfz1p2bvlddrf"; + rev = "v0.10.0"; + sha256 = "0isdqrnjhfy4zlydj4csf91i9184ykazyah3i63jfrmmarxr5li1"; }; inputs = [ pkgs.luajit ]; preConfigure = '' diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index 141f58417fb60..b9a42b4a5f613 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, libevent, file, qrencode }: +{ stdenv, fetchurl, pkgconfig, libevent, file, qrencode, miniupnpc }: let - version = "0.2.6"; + version = "0.3"; in stdenv.mkDerivation { name = "pshs-${version}"; src = fetchurl { url = "https://www.bitbucket.org/mgorny/pshs/downloads/pshs-${version}.tar.bz2"; - sha256 = "0n8l5sjnwjqjmw0jzg3hb93n6npg2wahmdg1zrpsw8fyh9ggjg4g"; + sha256 = "0qvy1m9jmbjhbihs1qr9nasbaajl3n0x8bgz1vw9xvpkqymx5i63"; }; - buildInputs = [ pkgconfig libevent file qrencode ]; + buildInputs = [ pkgconfig libevent file qrencode miniupnpc ]; - # TODO: enable ssl once dependencies - # (libssl libcrypto libevent >= 2.1 libevent_openssl) can be met + # SSL requires libevent at 2.1 with ssl support configureFlags = "--disable-ssl"; meta = { diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix new file mode 100644 index 0000000000000..45c6254662806 --- /dev/null +++ b/pkgs/servers/mail/rmilter/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, cmake, bison, flex, openssl, pcre, libmilter, opendkim }: + +stdenv.mkDerivation rec { + name = "rmilter-${version}"; + version = "1.6.7"; + src = fetchFromGitHub { + owner = "vstakhov"; + repo = "rmilter"; + rev = version; + sha256 = "1syviydlv4m1isl0r52sk4s0a75fyk788j1z3yvfzzf1hga333gn"; + }; + + nativeBuildInputs = [ bison cmake flex ]; + buildInputs = [ libmilter openssl pcre opendkim]; + + meta = with stdenv.lib; { + homepage = "https://github.com/vstakhov/rmilter"; + license = licenses.bsd2; + description = "server, used to integrate rspamd and milter compatible MTA, for example postfix or sendmail"; + maintainer = maintainers.avnik; + }; +} diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix new file mode 100644 index 0000000000000..a3b20820a6e03 --- /dev/null +++ b/pkgs/servers/mail/rspamd/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, cmake, perl + ,file , glib, gmime, libevent, luajit, openssl, pcre, pkgconfig, sqlite }: + +let libmagic = file; # libmagic provided buy file package ATM +in + +stdenv.mkDerivation rec { + name = "rspamd-${version}"; + version = "git-2016-01-16"; + src = fetchFromGitHub { + owner = "vstakhov"; + repo = "rspamd"; + rev = "04bfc92c1357c0f908ce9371ab303f8bf57657df"; + sha256 = "1zip1msjjy5q7jcsn4l0yyg92c3wdsf1v5jv1acglrih8dbfl7zj"; + }; + + nativeBuildInputs = [ cmake pkgconfig perl ]; + buildInputs = [ glib gmime libevent libmagic luajit openssl pcre sqlite]; + + postPatch = '' + substituteInPlace conf/common.conf --replace "\$CONFDIR/rspamd.conf.local" "/etc/rspamd/rspamd.conf.local" + substituteInPlace conf/common.conf --replace "\$CONFDIR/rspamd.conf.local.override" "/etc/rspamd/rspamd.conf.local.override" + ''; + + cmakeFlags = '' + -DDEBIAN_BUILD=ON + -DRUNDIR=/var/run/rspamd + -DDBDIR=/var/lib/rspamd + -DLOGDIR=/var/log/rspamd + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/vstakhov/rspamd"; + license = licenses.bsd2; + description = "advanced spam filtering system"; + maintainer = maintainers.avnik; + }; +} diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix new file mode 100644 index 0000000000000..66d9e7258f4c0 --- /dev/null +++ b/pkgs/servers/matrix-synapse/default.nix @@ -0,0 +1,45 @@ +{ pkgs, stdenv, buildPythonPackage, pythonPackages, fetchurl, fetchFromGitHub }: +let + matrix-angular-sdk = buildPythonPackage rec { + name = "matrix-angular-sdk-${version}"; + version = "0.6.6"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/m/matrix-angular-sdk/matrix-angular-sdk-${version}.tar.gz"; + sha256 = "1vknhmibb8gh8lng50va2cdvng5xm7vqv9dl680m3gj38pg0bv8a"; + }; + }; +in +buildPythonPackage rec { + name = "matrix-synapse-${version}"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "synapse"; + rev = "f35f8d06ea58e2d0cdccd82924c7a44fd93f4c38"; + sha256 = "0b0k1am9lh0qglagc06m91qs26ybv37k7wpbg5333x8jaf5d1si4"; + }; + + patches = [ ./matrix-synapse.patch ]; + + propagatedBuildInputs = with pythonPackages; [ + blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1 + pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2 + service-identity signedjson systemd twisted15 ujson unpaddedbase64 pyyaml + matrix-angular-sdk + ]; + + # Checks fail because of Tox. + doCheck = false; + + buildInputs = with pythonPackages; [ + mock setuptoolsTrial + ]; + + meta = { + homepage = https://matrix.org; + description = "Matrix reference homeserver"; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/servers/matrix-synapse/matrix-synapse.patch b/pkgs/servers/matrix-synapse/matrix-synapse.patch new file mode 100644 index 0000000000000..a6a393ea56c31 --- /dev/null +++ b/pkgs/servers/matrix-synapse/matrix-synapse.patch @@ -0,0 +1,20 @@ +diff --git a/homeserver b/homeserver +new file mode 120000 +index 0000000..2f1d413 +--- /dev/null ++++ b/homeserver +@@ -0,0 +1 @@ ++synapse/app/homeserver.py +\ No newline at end of file +diff --git a/setup.py b/setup.py +index 9d24761..f3e6a00 100755 +--- a/setup.py ++++ b/setup.py +@@ -85,6 +85,6 @@ setup( + include_package_data=True, + zip_safe=False, + long_description=long_description, +- scripts=["synctl"] + glob.glob("scripts/*"), ++ scripts=["synctl", "homeserver"] + glob.glob("scripts/*"), + cmdclass={'test': Tox}, + ) diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix new file mode 100644 index 0000000000000..7f8c372c33552 --- /dev/null +++ b/pkgs/servers/rt/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + name = "rt-4.2.12"; + + src = fetchurl { + url = "https://download.bestpractical.com/pub/rt/release/${name}.tar.gz"; + + sha256 = "0r3jhgfwwhhk654zag42mrai85yrliw9sc0kgabwjvbh173204p2"; + }; + + patches = [ ./override-generated.patch ]; + + buildInputs = [ perl ]; + + buildPhase = "true"; + + installPhase = '' + mkdir $out + cp -a {bin,docs,etc,lib,sbin,share} $out + find $out -name '*.in' -exec rm '{}' \; + ''; +} diff --git a/pkgs/servers/rt/override-generated.patch b/pkgs/servers/rt/override-generated.patch new file mode 100644 index 0000000000000..5727a9b50c58c --- /dev/null +++ b/pkgs/servers/rt/override-generated.patch @@ -0,0 +1,21 @@ +commit 7aec1e9478ef679227e759ab9537df7584c6a852 +Author: Shea Levy <shea@shealevy.com> +Date: Fri Jan 15 09:09:18 2016 -0500 + + Make it possible to override hard-coded paths + +diff --git a/lib/RT/Generated.pm.in b/lib/RT/Generated.pm.in +index 9dcb80b..99b034b 100644 +--- a/lib/RT/Generated.pm.in ++++ b/lib/RT/Generated.pm.in +@@ -82,4 +82,10 @@ $MasonDataDir = '@MASON_DATA_PATH@'; + $MasonSessionDir = '@MASON_SESSION_PATH@'; + + ++if ( my $override_file = $ENV{RT_PATHS_OVERRIDE} ) ++{ ++ require "$override_file" || die "Couldn't load paths override file: $@"; ++} ++ ++ + 1; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index d6e18254760fd..7bd179067cd0f 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -325,6 +325,10 @@ in wrapProgram $out/bin/Xephyr \ --set XKB_BINDIR "${xorg.xkbcomp}/bin" \ --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb" + wrapProgram $out/bin/Xvfb \ + --set XKB_BINDIR "${xorg.xkbcomp}/bin" \ + --set XORG_DRI_DRIVER_PATH ${args.mesa}/lib/dri \ + --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb" ''; passthru.version = version; # needed by virtualbox guest additions } else { |