From 311a25648b4d2f9b938d0e6d862c4a6114305fe2 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 11 Nov 2013 00:57:40 +0000 Subject: mpd: update to latest version --- pkgs/servers/mpd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 238176aadff9..67a11e01651a 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -27,10 +27,10 @@ let mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; in stdenv.mkDerivation rec { - name = "mpd-0.17.4"; + name = "mpd-0.18.3"; src = fetchurl { - url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz"; - sha256 = "06diyprg65xx0c0bgxdwlgrc5bhwy6cf39rabwnv9ikhimh94ir3"; + url = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz"; + sha256 = "177h23vqa59lm1fid883z9y5qn7kfb57yda6p44zva5hh85xczgh"; }; buildInputs = [ pkgconfig glib ] -- cgit 1.4.1 From 9c0e95663a22fd76154fb570603761d8d54965bc Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sun, 17 Nov 2013 23:06:25 +0100 Subject: lighttpd: update 1.4.32 -> 1.4.33 Changes in this version: http://www.lighttpd.net/2013/9/27/1-4-33/ --- pkgs/servers/http/lighttpd/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 61070ef22b6e..0da9f05901db 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -4,12 +4,12 @@ assert enableMagnet -> lua5 != null; -stdenv.mkDerivation { - name = "lighttpd-1.4.32"; +stdenv.mkDerivation rec { + name = "lighttpd-1.4.33"; src = fetchurl { - url = http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.32.tar.xz; - sha256 = "1hgd9bi4mrak732h57na89lqg58b1kkchnddij9gawffd40ghs0k"; + url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; + sha256 = "0331671snhhf48qb43mfb6l85v2rc3ryd3qvz56s8z454gfax1i8"; }; buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ] @@ -27,6 +27,6 @@ stdenv.mkDerivation { homepage = http://www.lighttpd.net/; license = "BSD"; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } -- cgit 1.4.1 From f73185d596b0ae3f168da8d625b633cbef203fb8 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 18 Nov 2013 16:02:33 +0100 Subject: nginx: adding rtmp module --- pkgs/servers/http/nginx/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 28390aa38da0..48ea4260ae8d 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -1,6 +1,15 @@ -{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat, fullWebDAV ? false, syslog ? false }: +{ stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat +, rtmp ? false +, fullWebDAV ? false +, syslog ? false}: let + rtmp-ext = fetchgit { + url = git://github.com/arut/nginx-dav-rtmp-module.git; + rev = "1cfb7aeb582789f3b15a03da5b662d1811e2a3f1"; + sha256 = "1dvpq1fg4rslnl05z8jc39sgnvh3akam9qxfl033akpczq1bh8nq"; + }; + dav-ext = fetchgit { url = git://github.com/arut/nginx-dav-ext-module.git; rev = "54cebc1f21fc13391aae692c6cce672fa7986f9d"; @@ -35,7 +44,8 @@ stdenv.mkDerivation rec { "--with-http_secure_link_module" # Install destination problems # "--with-http_perl_module" - ] ++ stdenv.lib.optional fullWebDAV "--add-module=${dav-ext}" + ] ++ stdenv.lib.optional fullWebDAV "--add-module=${rtmp-ext}" + ++ stdenv.lib.optional fullWebDAV "--add-module=${dav-ext}" ++ stdenv.lib.optional syslog "--add-module=${syslog-ext}"; preConfigure = '' -- cgit 1.4.1 From 174f5813ef39ead3e42e70003242baadde92156a Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 18 Nov 2013 17:04:30 +0100 Subject: nginx: rtmp module - commited to fast. now it works. --- pkgs/servers/http/nginx/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 48ea4260ae8d..f6f4415e806d 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -5,9 +5,9 @@ let rtmp-ext = fetchgit { - url = git://github.com/arut/nginx-dav-rtmp-module.git; + url = git://github.com/arut/nginx-rtmp-module.git; rev = "1cfb7aeb582789f3b15a03da5b662d1811e2a3f1"; - sha256 = "1dvpq1fg4rslnl05z8jc39sgnvh3akam9qxfl033akpczq1bh8nq"; + sha256 = "03ikfd2l8mzsjwx896l07rdrw5jn7jjfdiyl572yb9jfrnk48fwi"; }; dav-ext = fetchgit { @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { sha256 = "116yfy0k65mwxdkld0w7c3gly77jdqlvga5hpbsw79i3r62kh4mf"; }; - buildInputs = [ openssl zlib pcre libxml2 libxslt ] ++ stdenv.lib.optional fullWebDAV expat; + buildInputs = [ openssl zlib pcre libxml2 libxslt + ] ++ stdenv.lib.optional fullWebDAV expat; patches = if syslog then [ "${syslog-ext}/syslog_1.4.0.patch" ] else []; @@ -44,7 +45,7 @@ stdenv.mkDerivation rec { "--with-http_secure_link_module" # Install destination problems # "--with-http_perl_module" - ] ++ stdenv.lib.optional fullWebDAV "--add-module=${rtmp-ext}" + ] ++ stdenv.lib.optional rtmp "--add-module=${rtmp-ext}" ++ stdenv.lib.optional fullWebDAV "--add-module=${dav-ext}" ++ stdenv.lib.optional syslog "--add-module=${syslog-ext}"; -- cgit 1.4.1