diff options
Diffstat (limited to 'pkgs/servers')
21 files changed, 228 insertions, 21 deletions
diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 9fc0a303ad0..340e376e9ed 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.1.5"; + version = "3.2.4"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "0s0m456rxdrj58zbaby6mdgc1ndc3zx2c07n94hn3hdlgralgwaa"; + sha256 = "0a14wr2yal9q5vlwadyki9w35bn4f3r7r5w3zynp4f7460lfapmf"; }; buildInputs = with pkgs; [ diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix new file mode 100644 index 00000000000..26566b2281c --- /dev/null +++ b/pkgs/servers/http/hiawatha/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, cmake, + libxslt, zlib, libxml2, openssl, + enableSSL ? true, + enableMonitor ? false, + enableRproxy ? true, + enableTomahawk ? false, + enableXSLT ? true, + enableToolkit ? true +}: + +assert enableSSL -> openssl !=null; + +stdenv.mkDerivation rec { + name = "hiawatha-${version}"; + version = "10.5"; + + src = fetchurl { + url = "https://github.com/hsleisink/hiawatha/archive/v${version}.tar.gz"; + sha256 = "11nqdmmhq1glgsiza8pfh69wmpgwl51vb3xijmpcxv63a7ywp4fj"; + }; + + buildInputs = [ cmake libxslt zlib libxml2 ] ++ stdenv.lib.optional enableSSL openssl ; + + cmakeFlags = [ + ( if enableSSL then "-DENABLE_TLS=on" else "-DENABLE_TLS=off" ) + ( if enableMonitor then "-DENABLE_MONITOR=on" else "-DENABLE_MONITOR=off" ) + ( if enableRproxy then "-DENABLE_RPROXY=on" else "-DENABLE_RPROXY=off" ) + ( if enableTomahawk then "-DENABLE_TOMAHAWK=on" else "-DENABLE_TOMAHAWK=off" ) + ( if enableXSLT then "-DENABLE_XSLT=on" else "-DENABLE_XSLT=off" ) + ( if enableToolkit then "-DENABLE_TOOLKIT=on" else "-DENABLE_TOOLKIT=off" ) + "-DWEBROOT_DIR=/var/www/hiawatha" + "-DPID_DIR=/run" + "-DWORK_DIR=/var/lib/hiawatha" + "-DLOG_DIR=/var/log/hiawatha" + ]; + + # workaround because cmake tries installs stuff outside of nix store + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + postInstall = '' + mv $out/$out/* $out + rm -rf $out/{var,run} + ''; + + meta = with stdenv.lib; { + description = "An advanced and secure webserver"; + license = licenses.gpl2; + homepage = "https://www.hiawatha-webserver.org"; + maintainer = [ maintainers.ndowens ]; + }; + +} diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 587ec52c421..863f7afd159 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -24,13 +24,13 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "1jjfa3vigghnk201zkhp97mh25cx17gic0cjn0fgn7yxs83wrh5c"; + sha256 = "03gnz7rb7yncykqy0irl1y5lhk1cs0b4snpas8s1c9r0vsw1bmhr"; }; patches = [ ./matrix-synapse.patch ]; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 3e4e778e238..5d7d2e78773 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, which, coreutils, rrdtool, perl, perlPackages -, python, ruby, jre, nettools +, python, ruby, jre, nettools, bc }: stdenv.mkDerivation rec { @@ -99,7 +99,8 @@ stdenv.mkDerivation rec { postFixup = '' echo "Removing references to /usr/{bin,sbin}/ from munin plugins..." - find "$out/lib/plugins" -type f -print0 | xargs -0 -L1 sed -i -e "s|/usr/bin/||g" -e "s|/usr/sbin/||g" + find "$out/lib/plugins" -type f -print0 | xargs -0 -L1 \ + sed -i -e "s|/usr/bin/||g" -e "s|/usr/sbin/||g" -e "s|\<bc\>|${bc}/bin/bc|g" if test -e $out/nix-support/propagated-native-build-inputs; then ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix index ab896766272..c0a2c3ca49e 100644 --- a/pkgs/servers/monitoring/sensu/default.nix +++ b/pkgs/servers/monitoring/sensu/default.nix @@ -1,8 +1,8 @@ { lib, bundlerEnv, ruby }: -bundlerEnv { +bundlerEnv rec { name = "sensu-${version}"; - version = (import gemset).sensu.version; + version = (import ./gemset.nix).sensu.version; inherit ruby; gemdir = ./.; diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix new file mode 100644 index 00000000000..80e73d63235 --- /dev/null +++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix @@ -0,0 +1,23 @@ +# Generated by bower2nix v3.1.1 (https://github.com/rvl/bower2nix) +{ fetchbower, buildEnv }: +buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [ + (fetchbower "uchiwa-web" "0.22.1" "0.22.1" "09rhssb5bpwdahdl2fxkjmax8cqg2m51bbf0m3lhkcrcjfc2w8kj") + (fetchbower "angular" "1.4.14" "~1.4" "1j5d80bxqh9lgcbmd661bsk8xrhnf43ym77jsk9n845gqr02bdkl") + (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "0zbimxmrmgbz60xg5rnkhv4gd0zvp5fdjdx5407r6a942irfy2x7") + (fetchbower "angular-cookies" "1.4.14" "~1.4" "10z9azpd228jwdn8p767a93xhb5nrypwa0j6491kbcvm2q1k0g6a") + (fetchbower "angular-gravatar" "0.3.2" "~0.3.1" "17d2sc828dsnlkjc4b9irandpimqwan8hlvk9wlmlv8yiyi685p6") + (fetchbower "angular-mass-autocomplete-uchiwa" "0.4.1" "0.4.1" "1h2ypg35f6nd6gy6yznpiadql13lk1gyccq6qd4mvksbyb5va6l5") + (fetchbower "angular-moment" "0.9.2" "~0.9.0" "143vivplxqd03vg23ynad2yrlgn6dmad7avjmzh0ina2qx7zslgf") + (fetchbower "angular-resource" "1.4.14" "~1.4" "1ll2qd0kn39fl5aa49894n1bfcl8dgrfk0w154rkhg7k732q18bk") + (fetchbower "angular-route" "1.4.14" "~1.4" "0wfdgvvldgzf7c4lba3x8mw38l9zwkm0i9fg8ad7pvjkqz133sqs") + (fetchbower "angular-sanitize" "1.4.14" "~1.4" "072b8dcxjp4cjvcjqxsd0bxa8xd2nqvjb1v878qgfkhf0wz44x32") + (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1yksx3a4c3cva5liq087z4j196p0vxp1mzhbr27qr9wmyy6z84z1") + (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0z24747b0sywjyzl5chcwr96mpmyr595bry63c4d35mp186ail5z") + (fetchbower "bootstrap" "3.1.1" "3.1.1" "036xbjpv4621p5r2l9vfm9zys6h1mhkvb0zhvk3irrmkzsl77hwh") + (fetchbower "bootstrap-sass-official" "3.1.1" "3.1.1" "0rfmja15p8kxz6i3liwyqrmbm82azq61d3882w2vmp08vvv2c371") + (fetchbower "fontawesome" "4.4.0" "~4.4.0" "1mbs0vhixvg11vj3n0l3jn3pb6s839rcs416zq2wzfqkbvsc3sf5") + (fetchbower "highlightjs" "9.1.0" "~9.1.0" "1gz4q922sylbbqw1sawmjjq8nw0mk90wq0qq95ap0f31px7bfm3f") + (fetchbower "moment" "2.8.4" "~2.8.3" "1h30g5an2m9dja09m1s93hsfb25pzl0iah8mmab7nispl3mb585z") + (fetchbower "ua-parser-js" "0.7.12" "~0.7.12" "1hrhi7cdf5zd86jz7ipbb23qvkfplghfa92wa3aysca1rpg5zgpd") + (fetchbower "jquery" "3.1.1" ">= 1.9.0" "0rkp1hakimnjh3rvlzi30w7qx9x1j0gzjpaajgljn79kd082sgpd") +]; } diff --git a/pkgs/servers/monitoring/uchiwa/bower.json b/pkgs/servers/monitoring/uchiwa/bower.json new file mode 100644 index 00000000000..1eb94f73e6b --- /dev/null +++ b/pkgs/servers/monitoring/uchiwa/bower.json @@ -0,0 +1,6 @@ +{ + "name": "uchiwa", + "dependencies": { + "uchiwa-web": "0.21.0" + } +} diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix new file mode 100644 index 00000000000..e7cf3e8f70e --- /dev/null +++ b/pkgs/servers/monitoring/uchiwa/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, buildBowerComponents, buildGoPackage, makeWrapper }: + +let + inherit (import ./src.nix) version sha256; + owner = "sensu"; + repo = "uchiwa"; + + src = fetchFromGitHub { + inherit owner repo sha256; + rev = "${version}"; + }; + + backend = buildGoPackage { + name = "uchiwa-backend-${version}"; + goPackagePath = "github.com/${owner}/${repo}"; + inherit src; + postInstall = '' + cp go/src/github.com/sensu/uchiwa/public/index.html $out/ + ''; + }; + + frontend = buildBowerComponents { + name = "uchiwa-frontend-${version}"; + generated = ./bower-packages.nix; + inherit src; + }; + +in stdenv.mkDerivation rec { + name = "uchiwa-${version}"; + + inherit src; + + buildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out/bin $out/public + makeWrapper ${backend.bin}/bin/uchiwa $out/bin/uchiwa \ + --add-flags "-p $out/public" + ln -s ${backend.out}/index.html $out/public/index.html + ln -s ${frontend.out}/bower_components $out/public/bower_components + ''; + + meta = with stdenv.lib; { + description = "A Dashboard for the sensu monitoring framework"; + homepage = http://sensuapp.org/; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix new file mode 100644 index 00000000000..68aaa4a5249 --- /dev/null +++ b/pkgs/servers/monitoring/uchiwa/src.nix @@ -0,0 +1,4 @@ +{ + version = "0.22.1"; + sha256 = "15wa7zhchis2rh6jcqkindlidmbf3mryr3apnqnr27ydi2vlqn3g"; +} diff --git a/pkgs/servers/monitoring/uchiwa/update.sh b/pkgs/servers/monitoring/uchiwa/update.sh new file mode 100755 index 00000000000..2802037a4f5 --- /dev/null +++ b/pkgs/servers/monitoring/uchiwa/update.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nodePackages.bower2nix curl.bin git.out jq.out + +set -euo pipefail +IFS=$'\n\t' + +# set -x + +REPO=sensu/uchiwa + +VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r) + +t=$(mktemp) + +echo "Updating to: ${VERSION}" + +curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > $t +bower2nix $t bower-packages.nix + +pushd $(git rev-parse --show-toplevel) +sha=$(nix-prefetch-url -A uchiwa.src) +popd + +cat <<_EOF > src.nix +{ + version = "${VERSION}"; + sha256 = "${sha}"; +} +_EOF + +rm $t diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index e2ec4a7617d..87a477ab057 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -33,13 +33,13 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.20"; - minor = "4"; + minor = "5"; in stdenv.mkDerivation rec { name = "mpd-${major}${if minor == "" then "" else "." + minor}"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz"; - sha256 = "0a4psqsf71vc6hfgyv55jclsx8yb7lf4w840qlq6cq8j3hsjaavi"; + sha256 = "11w9v0l9lf504nkxlb91y5r9x403ikl626mjd1lf4fj44yz76maj"; }; patches = [ ./i386.patch ]; diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index f685d8b24d6..b754807dc9b 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -4,7 +4,7 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc ]); path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "1.2.0"; + version = "1.2.1"; pname = "sabnzbd"; name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = pname; repo = pname; rev = version; - sha256 = "1g1zf0zrlqgparg6hws6agpr414dw2q4xq9l8nh720rn6m7fv4vb"; + sha256 = "1rw6f455p0n8qigzkvnlr0d6rzkx2mpzhcp7m0j8fwqdbq831q8y"; }; buildInputs = [ pythonEnv makeWrapper ]; diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 6f553f70712..1e7ddb53e23 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.4472"; + version = "2.0.0.4613"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "0sz03z057pyai151lxsdsgxlv6kvrnd1xxw7i1ss7b79l6xgmpw8"; + sha256 = "1a8wm50aw7yyigvywx7hgy58w60mi4s60dqvwwlgrbavl4z5jphl"; }; buildInputs = [ diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 71867a94ef2..be4ab80f705 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, perl -, boost, cctools, CoreServices }: +, boost, cctools, CoreServices, developer_cmds }: # Note: zlib is not required; MySQL can use an internal zlib. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ cmake bison ncurses openssl readline zlib boost ] - ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ]; enableParallelBuilding = true; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index a94d8d101d2..50101fc5ce8 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -56,6 +56,14 @@ let # Prevent a retained dependency on gcc-wrapper. substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv.cc}/bin/ld ld + + # Remove static libraries in case dynamic are available. + for i in $out/lib/*.a; do + name="$(basename "$i")" + if [ -e "$lib/lib/''${name%.a}.so" ] || [ -e "''${i%.a}.so" ]; then + rm "$i" + fi + done ''; postFixup = lib.optionalString (!stdenv.isDarwin) diff --git a/pkgs/servers/sql/postgresql/pgjwt/default.nix b/pkgs/servers/sql/postgresql/pgjwt/default.nix new file mode 100644 index 00000000000..b4955f8184c --- /dev/null +++ b/pkgs/servers/sql/postgresql/pgjwt/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation rec { + name = "pgjwt-${version}"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "michelp"; + repo = "pgjwt"; + rev = "12a41eef15e6d3a22399e03178560d5174d496a3"; + sha256 = "1dgx7kqkf9d7j5qj3xykx238xm8jg0s6c8h7zyl4lx8dmbz9sgsv"; + }; + dontBuild = true; + installPhase = '' + mkdir -p $out/bin # current postgresql extension mechanism in nixos requires bin directory + mkdir -p $out/share/extension + cp pg*sql *.control $out/share/extension + ''; + meta = with stdenv.lib; { + description = "PostgreSQL implementation of JSON Web Tokens"; + longDescription = '' + sign() and verify() functions to create and verify JSON Web Tokens. + ''; + license = licenses.mit; + maintainers = with maintainers; [spinus]; + }; +} diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index fc5a744ad46..e1376a6c59f 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { buildFlags = "localstatedir=/var/spool"; + # https://github.com/varnishcache/varnish-cache/issues/1875 + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fexcess-precision=standard"; + outputs = [ "out" "dev" "man" ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 96f348e92b3..eee912d1b8c 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -669,11 +669,11 @@ let }) // {inherit windowswmproto libX11 libXext xextproto ;}; libX11 = (mkDerivation "libX11" { - name = "libX11-1.6.4"; + name = "libX11-1.6.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libX11-1.6.4.tar.bz2; - sha256 = "0hg46i6h92pmb7xp1cis2j43zq3fkdz89p0yv35w4vm17az4iixp"; + url = mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2; + sha256 = "0pa3cfp6h9rl2vxmkph65250gfqyki0ccqyaan6bl9d25gdr0f2d"; }; buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 0afbb21ea22..310bebd382a 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -568,6 +568,10 @@ in url = "https://cgit.freedesktop.org/xorg/driver/xf86-video-xgi/patch/?id=bd94c475035739b42294477cff108e0c5f15ef67"; sha256 = "0myfry07655adhrpypa9rqigd6rfx57pqagcwibxw7ab3wjay9f6"; }) + (args.fetchpatch { + url = "https://cgit.freedesktop.org/xorg/driver/xf86-video-xgi/patch/?id=78d1138dd6e214a200ca66fa9e439ee3c9270ec8"; + sha256 = "0z3643afgrync280zrp531ija0hqxc5mrwjif9nh9lcnzgnz2d6d"; + }) ]; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 3247d3e7b15..4aeace9f0c2 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -59,7 +59,7 @@ mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.13.4.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.6.4.tar.bz2 +mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2 mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index 4eecfa41810..16807a6571c 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, jre, makeWrapper, bash }: stdenv.mkDerivation rec { - name = "zookeeper-3.4.9"; + name = "zookeeper-${version}"; + version = "3.4.9"; src = fetchurl { url = "mirror://apache/zookeeper/${name}/${name}.tar.gz"; |