From a8d5881c3eadd13b6ffa0aaff84107b62e66e38d Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 23 Nov 2013 15:36:20 +0100 Subject: varnish: update to 3.0.4 --- pkgs/servers/varnish/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 8d0f3b306f26..7c487961438d 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig }: +{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline }: stdenv.mkDerivation rec { - version = "3.0.3"; + version = "3.0.4"; name = "varnish-${version}"; src = fetchurl { url = "http://repo.varnish-cache.org/source/${name}.tar.gz"; - sha256 = "1cla2igwfwcm07srvk0z9cqdxh74sga0c1rsmh4b4n1gjn6x2drd"; + sha256 = "0y8gml06h3wjiasfqnk7f9wrfrlgx89qz04wz3fjn8knbk5lq12f"; }; - buildInputs = [ pcre libxslt groff ncurses pkgconfig ]; + buildInputs = [ pcre libxslt groff ncurses pkgconfig readline ]; meta = { description = "Web application accelerator also known as a caching HTTP reverse proxy"; -- cgit 1.4.1 From fb596303cfa5af437a8ccb996721194ca444d9f5 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 24 Nov 2013 22:26:56 +0000 Subject: Adds beanstalkd v1.9 --- pkgs/servers/beanstalkd/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/servers/beanstalkd/default.nix (limited to 'pkgs/servers') diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix new file mode 100644 index 000000000000..717ea6306cff --- /dev/null +++ b/pkgs/servers/beanstalkd/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + version = "1.9"; + name = "beanstalkd-${version}"; + + installPhase=''make install "PREFIX=$out"''; + + src = fetchurl { + url = "https://github.com/kr/beanstalkd/archive/v${version}.tar.gz"; + sha256 = "158e6d6090c0afac7ee17b9f22713506b3e870dc04a738517282e2e262afb9eb"; + }; + + meta = with stdenv.lib; { + homepage = http://kr.github.io/beanstalkd/; + description = "Beanstalk is a simple, fast work queue."; + license = licenses.mit; + maintainers = [ maintainers.zimbatm ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ab96b48057e..954aa173361b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -588,6 +588,8 @@ let bacula = callPackage ../tools/backup/bacula { }; + beanstalkd = callPackage ../servers/beanstalkd { }; + bgs = callPackage ../tools/X11/bgs { }; bibtextools = callPackage ../tools/typesetting/bibtex-tools { -- cgit 1.4.1 From 980c7929ab5544c345b11ff8ef0de2c47c0b0ece Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 25 Nov 2013 10:49:34 +0400 Subject: Updating Nginx to 1.4.4 --- pkgs/servers/http/nginx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index f6f4415e806d..a67ffe7e905a 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -13,7 +13,7 @@ let dav-ext = fetchgit { url = git://github.com/arut/nginx-dav-ext-module.git; rev = "54cebc1f21fc13391aae692c6cce672fa7986f9d"; - sha256 = "1dvpq1fg5rslnl05z8jc39sgnvh3akam9qxfl033akpczq1bh8nq"; + sha256 = "1f82845mpgmhvm151fhn2cnqjggw9w7cvsqbva9rb320wmc9m63w"; }; syslog-ext = fetchgit { @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { description = "A reverse proxy and lightweight webserver"; maintainers = [ stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.all; - version = "1.4.3"; + version = "1.4.4"; }; } -- cgit 1.4.1 From 2f53f6c82d65f1699690976d7fe6162294a15b3a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 25 Nov 2013 10:58:34 +0400 Subject: Fixing automatic update of Nginx --- pkgs/servers/http/nginx/default.nix | 18 ++++++++++-------- pkgs/servers/http/nginx/default.upstream | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index a67ffe7e905a..86b22ab5a18c 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -4,6 +4,12 @@ , syslog ? false}: let + version = "1.4.4"; + mainSrc = fetchurl { + url = "http://nginx.org/download/nginx-${version}.tar.gz"; + sha256 = "1f82845mpgmhvm151fhn2cnqjggw9w7cvsqbva9rb320wmc9m63w"; + }; + rtmp-ext = fetchgit { url = git://github.com/arut/nginx-rtmp-module.git; rev = "1cfb7aeb582789f3b15a03da5b662d1811e2a3f1"; @@ -13,7 +19,7 @@ let dav-ext = fetchgit { url = git://github.com/arut/nginx-dav-ext-module.git; rev = "54cebc1f21fc13391aae692c6cce672fa7986f9d"; - sha256 = "1f82845mpgmhvm151fhn2cnqjggw9w7cvsqbva9rb320wmc9m63w"; + sha256 = "1dvpq1fg5rslnl05z8jc39sgnvh3akam9qxfl033akpczq1bh8nq"; }; syslog-ext = fetchgit { @@ -24,12 +30,8 @@ let in stdenv.mkDerivation rec { - name = "nginx-${meta.version}"; - - src = fetchurl { - url = "http://nginx.org/download/${name}.tar.gz"; - sha256 = "116yfy0k65mwxdkld0w7c3gly77jdqlvga5hpbsw79i3r62kh4mf"; - }; + name = "nginx-${version}"; + src = mainSrc; buildInputs = [ openssl zlib pcre libxml2 libxslt ] ++ stdenv.lib.optional fullWebDAV expat; @@ -61,6 +63,6 @@ stdenv.mkDerivation rec { description = "A reverse proxy and lightweight webserver"; maintainers = [ stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.all; - version = "1.4.4"; + inherit version; }; } diff --git a/pkgs/servers/http/nginx/default.upstream b/pkgs/servers/http/nginx/default.upstream index f6a12eedda42..c20139017436 100644 --- a/pkgs/servers/http/nginx/default.upstream +++ b/pkgs/servers/http/nginx/default.upstream @@ -4,5 +4,5 @@ version_link '.*-([0-9]+[.][0-9]*[02468]([.][0-9]+)*)[.]tar[.][a-z0-9]*$' do_overwrite() { ensure_hash set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" 2 + set_var_value sha256 "$CURRENT_HASH" } -- cgit 1.4.1 From 7f6b5a04727aea2563784c175d2b0db6c9c213b2 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Fri, 29 Nov 2013 00:10:23 +0000 Subject: dico: fix build --- pkgs/servers/dico/default.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index d711d8a75ca5..ca4980f5a6c4 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, libtool, gettext, zlib, readline, gsasl -, guile, python, pcre }: +, guile, python, pcre, libffi }: stdenv.mkDerivation rec { name = "dico-2.2"; @@ -10,12 +10,22 @@ stdenv.mkDerivation rec { }; # XXX: Add support for GNU SASL. - buildInputs = [ libtool gettext zlib readline gsasl guile python pcre ]; + buildInputs = + [ libtool gettext zlib readline gsasl guile python pcre libffi ]; - doCheck = true; + # dicod fails to load modules, so the tests fail + doCheck = false; - meta = { + preBuild = '' + sed -i -e '/gets is a security/d' gnu/stdio.in.h + ''; + + meta = with stdenv.lib; { description = "GNU Dico, a flexible dictionary server and client implementing RFC 2229"; + homepage = http://www.gnu.org/software/dico/; + license = "GPLv3+"; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; longDescription = '' GNU Dico is a flexible modular implementation of DICT server @@ -36,9 +46,5 @@ stdenv.mkDerivation rec { The package also includes a console client program for querying remote dictionary servers. ''; - - homepage = http://www.gnu.org/software/dico/; - - license = "GPLv3+"; }; } -- cgit 1.4.1