From cdfd953ffa284afe896bc78fcac43527b9977706 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Dec 2013 12:52:48 +0100 Subject: apache-httpd-2.4: enable building the 'event'-based mpm worker Adding "LoadModule mpm_event_module modules/mod_mpm_event.so" to httpd.conf enables that worker instead of the default choice. --- pkgs/servers/http/apache-httpd/2.4.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/servers') diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 2bbe9798de46..c6d0b3ad73b0 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { --with-pcre=${pcre} --disable-maintainer-mode --disable-debugger-mode + --enable-mpm=event --enable-mods-shared=all --enable-mpms-shared=all --enable-cern-meta -- cgit 1.4.1 From 4d6605e882167a1695ea4a4e2df76264de114ba7 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Thu, 2 Jan 2014 17:53:57 +0100 Subject: Whitespace fixes in package expressions I maintain --- pkgs/applications/audio/qmmp/default.nix | 2 +- pkgs/applications/graphics/openscad/default.nix | 3 ++- pkgs/applications/misc/evtest/default.nix | 2 +- pkgs/applications/misc/gnuradio/default.nix | 3 ++- pkgs/applications/misc/pitz/default.nix | 5 +++-- pkgs/applications/misc/slic3r/default.nix | 3 ++- pkgs/applications/science/spyder/default.nix | 2 +- pkgs/data/misc/freepats/default.nix | 2 +- pkgs/development/compilers/sdcc/default.nix | 2 +- pkgs/development/libraries/wildmidi/default.nix | 2 +- pkgs/development/tools/build-managers/ninja/default.nix | 2 +- pkgs/development/tools/misc/openocd/default.nix | 2 +- pkgs/development/tools/misc/premake/default.nix | 6 +++--- pkgs/development/tools/misc/stlink/default.nix | 2 +- pkgs/development/tools/misc/tcptrack/default.nix | 2 +- pkgs/servers/monitoring/munin/default.nix | 3 ++- pkgs/tools/backup/duply/default.nix | 3 ++- pkgs/tools/misc/ethtool/default.nix | 2 +- pkgs/tools/networking/ncftp/default.nix | 2 +- pkgs/tools/networking/ntopng/default.nix | 3 ++- 20 files changed, 30 insertions(+), 23 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 8cb64820295c..255c63a5d6d2 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = http://qmmp.ylsoftware.com/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; repositories.svn = http://qmmp.googlecode.com/svn/; }; } diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index d34eeba207ce..a1238fe3dcd9 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal -, mpfr, gmp }: +, mpfr, gmp +}: stdenv.mkDerivation rec { version = "2013.06"; diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 635775e75ac7..f2dadd2e5e8b 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = "Simple tool for input event debugging"; license = "GPLv2"; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 3c47e3bf8a82..08d2b29a92a8 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -18,7 +18,8 @@ # gr-video-sdl: PAL and NTSC display , SDL , libusb1, orc, pyopengl -, makeWrapper }: +, makeWrapper +}: stdenv.mkDerivation rec { name = "gnuradio-${version}"; diff --git a/pkgs/applications/misc/pitz/default.nix b/pkgs/applications/misc/pitz/default.nix index 355ea9b2033d..e4f097469a49 100644 --- a/pkgs/applications/misc/pitz/default.nix +++ b/pkgs/applications/misc/pitz/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, buildPythonPackage, tempita, jinja2, pyyaml, clepy, mock -, nose, decorator, docutils }: +, nose, decorator, docutils +}: # TODO: pitz has a pitz-shell utility that depends on ipython, but it just # errors out and dies (it probably depends on an old ipython version): @@ -28,6 +29,6 @@ buildPythonPackage rec { license = licenses.bsd3; homepage = http://pitz.tplus1.com/; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index aa2ceb08e809..203ef7d84a7e 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -2,7 +2,8 @@ # Perl modules: , EncodeLocale, MathClipper, ExtUtilsXSpp, BoostGeometryUtils , MathConvexHullMonotoneChain, MathGeometryVoronoi, MathPlanePath, Moo -, IOStringy, ClassXSAccessor, Wx, GrowlGNTP, NetDBus }: +, IOStringy, ClassXSAccessor, Wx, GrowlGNTP, NetDBus +}: stdenv.mkDerivation rec { version = "0.9.10b"; diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 600bd6bc4394..1079a153ca16 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { homepage = https://code.google.com/p/spyderlib/; license = licenses.mit; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/data/misc/freepats/default.nix b/pkgs/data/misc/freepats/default.nix index 21f34a607d4f..ac015c02b199 100644 --- a/pkgs/data/misc/freepats/default.nix +++ b/pkgs/data/misc/freepats/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://freepats.zenvoid.org/; license = licenses.gpl2; platforms = platforms.all; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index 472930d047bf..1a51f087a28f 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = http://sdcc.sourceforge.net/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 85e5726f8636..eb55d1d60f41 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { # The library is LGPLv3, the wildmidi executable is GPLv3 license = licenses.lgpl3; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index ed9890150a37..b5c0b0a03dae 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = http://martine.github.io/ninja/; license = licenses.asl20; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index e0da284887cc..c625f1474006 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libftdi, libusb1 }: +{ stdenv, fetchurl, libftdi, libusb1 }: stdenv.mkDerivation rec { name = "openocd-${version}"; diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix index 8dce23aa9593..770c80710953 100644 --- a/pkgs/development/tools/misc/premake/default.nix +++ b/pkgs/development/tools/misc/premake/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip }: let baseName = "premake"; version = "4.3"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1017rd0wsjfyq2jvpjjhpszaa7kmig6q1nimw76qx3cjz2868lrn"; }; - buildInputs = [unzip]; + buildInputs = [ unzip ]; buildPhase = '' make -C build/gmake.unix/ @@ -27,6 +27,6 @@ stdenv.mkDerivation { description = "A simple build configuration and project generation tool using lua"; license = stdenv.lib.licenses.bsd3; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index c4dfa99becdc..13796453eba2 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { description = "In-circuit debug and programming for ST-Link devices"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix index 43ff8df70d27..645bd0611777 100644 --- a/pkgs/development/tools/misc/tcptrack/default.nix +++ b/pkgs/development/tools/misc/tcptrack/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = http://www.rhythm.cx/~steve/devel/tcptrack/; # dead link license = licenses.lgpl21; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 4f16ab35527b..6c8f1fd7a9f0 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, makeWrapper, which, coreutils, rrdtool, perl, perlPackages -, python, ruby, openjdk, nettools }: +, python, ruby, openjdk, nettools +}: stdenv.mkDerivation rec { version = "2.0.17"; diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index 5e95ede695cd..b184dff11cd2 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, coreutils, python, duplicity, gawk, gnupg1, bash -, gnugrep, txt2man, makeWrapper }: +, gnugrep, txt2man, makeWrapper +}: stdenv.mkDerivation { name = "duply-1.5.11"; diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 01b45cd6d8b7..48baa8bff018 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "ethtool-3.11"; diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix index 515ea5edf88c..2dcfd09bb777 100644 --- a/pkgs/tools/networking/ncftp/default.nix +++ b/pkgs/tools/networking/ncftp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, coreutils}: +{ stdenv, fetchurl, ncurses, coreutils }: let version = "3.2.5"; in stdenv.mkDerivation { diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 78d44b7768dc..3c33da1b6619 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, libpcap, gnutls, libgcrypt, libxml2, glib, geoip, sqlite -, which }: +, which +}: # ntopng includes LuaJIT, mongoose, rrdtool and zeromq in its third-party/ # directory. -- cgit 1.4.1 From ca8de637978b5c05a5562cb679f24ddda7013ab2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 Jan 2014 11:51:02 +0100 Subject: postgresql-8.3: Remove The 8.3 branch is no longer maintained so it shouldn't be used. --- pkgs/servers/sql/postgresql/8.3.x.nix | 24 ------------------------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/servers/sql/postgresql/8.3.x.nix (limited to 'pkgs/servers') diff --git a/pkgs/servers/sql/postgresql/8.3.x.nix b/pkgs/servers/sql/postgresql/8.3.x.nix deleted file mode 100644 index b7f2d7d2a502..000000000000 --- a/pkgs/servers/sql/postgresql/8.3.x.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, zlib, ncurses, readline }: - -let version = "8.3.23"; in - -stdenv.mkDerivation rec { - name = "postgresql-${version}"; - - src = fetchurl { - url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1n8qj1bvyx83jsn2x2l8xzk53c014gkz8hwvswvnzcdyvlbnd90p"; - }; - - buildInputs = [ zlib ncurses readline ]; - - LC_ALL = "en_US"; - - passthru = { inherit readline; }; - - meta = { - homepage = http://www.postgresql.org/; - description = "A powerful, open source object-relational database system"; - license = "bsd"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0700965114b..1503f87077be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6371,8 +6371,6 @@ let postgresql = postgresql92; - postgresql83 = callPackage ../servers/sql/postgresql/8.3.x.nix { }; - postgresql84 = callPackage ../servers/sql/postgresql/8.4.x.nix { }; postgresql90 = callPackage ../servers/sql/postgresql/9.0.x.nix { }; -- cgit 1.4.1 From 0c93c758bfc711edba57b765e9d6889c796af90b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 Jan 2014 11:54:52 +0100 Subject: postgresql: Update to 8.4.19, 9.0.15, 9.1.11, 9.2.6 This is a critical update fixing several data corruption issues: http://www.postgresql.org/about/news/1492/ --- pkgs/servers/sql/postgresql/8.4.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.0.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.1.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.2.x.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index a99d7536a8a2..b027d0093e88 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.4.18"; in +let version = "8.4.19"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "c08e5e93dac9d484019a07ff91db9f224350b90ef4be1543e33282cc20daf872"; + sha256 = "f744d04a5d9feeea516fa57fea92be5568527bab03a84cf660a06ce90f90dcea"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix index 3810eeba72c5..40878fc6e783 100644 --- a/pkgs/servers/sql/postgresql/9.0.x.nix +++ b/pkgs/servers/sql/postgresql/9.0.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.0.14"; in +let version = "9.0.15"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "de42b669cb891fc9b925406e71d1669ed5c856aae6d552ac6f14bf6dec0b79f1"; + sha256 = "a45acd27d546e425911ecd371247066be5dafd96304e50e0708c84b918c28f9d"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 65a969b4db0e..9eefe708798f 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.1.10"; in +let version = "9.1.11"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "8329bcd160fcb76ee8c79676f6c979a94069ca5c108449fbb365e1ea98f92b77"; + sha256 = "ccbc35aae1490ee5878b97a6aea48dad7465cdad296b380542e4303b68cc6f74"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix index eb6a2714eb2c..8f78dffb4ba3 100644 --- a/pkgs/servers/sql/postgresql/9.2.x.nix +++ b/pkgs/servers/sql/postgresql/9.2.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, readline }: -let version = "9.2.5"; in +let version = "9.2.6"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "22c1edfd6a404bb15fba655863e94f09a10716ded1910a8bc98ee85f413007a4"; + sha256 = "4ba98053a66e5678af93dbc2956e8b04623f759e174f48940c41f4251cf0f886"; }; buildInputs = [ zlib readline ]; -- cgit 1.4.1