Commit graph

1239 commits

Author SHA1 Message Date
Vladimír Čunát 7e4709247d Merge master into x-updates 2014-01-26 09:01:25 +01:00
Peter Simons b3fe70a5e8 popa3d: disown this package 2014-01-25 20:59:31 +01:00
Peter Simons f6e18d1d43 popa3d: update from 1.0.2 to 1.0.3 2014-01-25 20:58:49 +01:00
Vladimír Čunát 7e0b78f7b2 Merge master into x-updates
Conflicts (re-created on master, preserved):
	pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch
2014-01-23 22:52:18 +01:00
Evgeny Egorochkin 9b538a96f1 nagios-plugins: change source location and homepage since the original site has been hijacked. https://bugzilla.redhat.com/show_bug.cgi?id=1054340 2014-01-22 08:42:35 +02:00
Domen Kožar 0c9f4cb22a evolution-data-server: upgrade and move to gnome3 namespace 2014-01-21 14:11:19 +01:00
Vladimír Čunát ac6761c908 Merge master into stdenv-updates
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
Bas van Dijk 9068ba2bb4 postgresql: Add version 9.3 2014-01-20 14:58:09 +01:00
Vladimír Čunát 0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Rok Garbas a39490d709 fixing munin (broken by latest version update) also switch to fetchgit 2014-01-16 18:07:16 +00:00
Vladimír Čunát fcb9e031f8 xorg.xf86-video-ati: update 7.2.0 -> 7.1.0
Proposed by @kosmikus.
2014-01-16 14:36:42 +01:00
Peter Simons 1671054702 mod_wsgi: update from 3.3 to 3.4 2014-01-15 17:29:14 +01:00
Peter Simons ed25859f07 mailman: update from 2.1.16 to 2.1.17 2014-01-15 17:29:14 +01:00
Peter Simons 6603ef3bf8 bind: update to version 9.9.4-P2 2014-01-14 15:55:24 +01:00
Nixpkgs Monitor 36c0702156 munin: update from 2.0.17 to 2.0.19, potentially fixes CVE-2013-6048, CVE-2013-6359 2014-01-14 11:59:41 +01:00
Nixpkgs Monitor 0c6ebeb734 lighttpd: update from 1.4.33 to 1.4.34, potentially fixes CVE-2013-4508 2014-01-14 11:55:48 +01:00
Thomas Bereknyei 57e3feda74 Adds kippo SSH honeypot 2014-01-14 10:32:26 +00:00
Vladimír Čunát 1cb146f3e1 Merge master into x-updates
Llvm refactorings from ae0c9b626f included.
Mesa is the only package using llvm_34 ATM.

Conflicts:
	pkgs/development/compilers/llvm/default.nix
2014-01-13 22:00:31 +01:00
Eelco Dolstra 6fb27abf33 Merge branch 'java' 2014-01-13 13:16:17 +01:00
Vladimír Čunát a2c316288c Merge master into stdenv-updates
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
Vladimír Čunát 91b7fa9169 Merge master into x-updates 2014-01-11 18:44:55 +01:00
Evgeny Egorochkin e8a9e30cc7 Add meta.branch to some packages 2014-01-08 18:06:18 +02:00
Nixpkgs Monitor e148a016f5 xlibs.xf86videointel: update from 2.21.9 to 2.21.15 2014-01-08 16:17:32 +01:00
Peter Simons 0266ac9c30 apache-httpd-2.4: revert "enable building the 'event'-based mpm worker"
Commit 0c3d910cd027a926ffc8538ea60cf2da099d7808 didn't have any effect.
The 'event' MPM module isn't built because our version of APR is too old.
2014-01-08 13:17:40 +01:00
Vladimír Čunát e01af040ed xorg.libXfont: bugfix update, CVE-2013-6462
This lib is deprecated and almost unused, but still...
2014-01-07 17:51:22 +01:00
Rob Vermaas 0d54426794 Add zabbix 2.2.1 2014-01-07 13:11:32 +01:00
Eelco Dolstra 9d3d42406b samba: Update to 3.6.22
CVE-2012-6150, CVE-2013-4408.
2014-01-06 17:48:39 +01:00
Shea Levy 139f8949e6 Merge branch 'merge-kernel-builds' into upstream-master
This is a second attempt at unifying the generic and manual-config
kernel builds (see #412 for the last time).

The set of working kernel packages is a superset of those that work on
master, and as the only objection last time was the size of the $dev
closure and now both $out and $dev combined are 20M smaller than $out on
master (see message for ac2035287f), this
should be unobjectionable.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-05 07:13:19 -05:00
Vladimír Čunát 552143224a net_snmp: fix build by autoreconfing 2014-01-05 11:19:07 +01:00
Shea Levy a589bfae17 Update and fix kernel packages to new kernel build
In most cases, this just meant changing kernelDev (now removed from
linuxPackagesFor) to kernel.dev. Some packages needed more work (though
whether that was because of my changes or because they were already
broken, I'm not sure). Specifics:

* psmouse-alps builds on 3.4 but not 3.10, as noted in the comments that
  were already there
* blcr builds on 3.4 but not 3.10, as noted in comments that were
  already there
* open-iscsi, ati-drivers, wis-go7007, and openafsClient don't build on
  3.4 or 3.10 on this branch or on master, so they're marked broken
* A version-specific kernelHeaders package was added

The following packages were removed:

* atheros/madwifi is superceded by official ath*k modules
* aufs is no longer used by any of our kernels
* broadcom-sta v6 (which was already packaged) replaces broadcom-sta
* exmap has not been updated since 2011 and doesn't build
* iscis-target has not been updated since 2010 and doesn't build
* iwlwifi is part of mainline now and doesn't build
* nivida-x11-legacy-96 hasn't been updated since 2008 and doesn't build

Everything not specifically mentioned above builds successfully on 3.10.
I haven't yet tested on 3.4, but will before opening a pull request.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-04 21:17:04 -05:00
Vladimír Čunát 9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
Eelco Dolstra e9211e60ac postgresql-jdbc: Fix build 2014-01-03 14:33:17 +01:00
Eelco Dolstra e1f7144aa8 postgresql-jdbc: Update to 9.3-1100 2014-01-03 11:56:41 +01:00
Eelco Dolstra 0c93c758bf 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/
2014-01-03 11:54:52 +01:00
Eelco Dolstra ca8de63797 postgresql-8.3: Remove
The 8.3 branch is no longer maintained so it shouldn't be used.
2014-01-03 11:51:02 +01:00
Mathijs Kwik adffa870cf xf86-video-vmware: xatracker2 patch to build with mesa 10 2014-01-03 09:14:22 +01:00
Bjørn Forsman 4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Vladimír Čunát f0419a0bfc xorg: update a few sub-packages 2013-12-30 22:12:22 +01:00
Peter Simons cdfd953ffa 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.
2013-12-29 12:52:54 +01:00
Vladimír Čunát e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Vladimír Čunát 50ac037864 Merge master into x-updates 2013-12-23 19:27:14 +01:00
Vladimír Čunát 4f8809a091 libXtst: forgotten security update 2013-12-23 18:24:24 +01:00
Mathijs Kwik 82d02565fc rethinkdb: /usr/bin/env is not available in chroot builds 2013-12-23 15:48:36 +01:00
Mathijs Kwik e2e923644f add rethinkdb 2013-12-23 10:21:20 +01:00
Nixpkgs Monitor 751e111a87 squids.latest: update from 3.2.2 to 3.2.13, potentially fixes CVE-2012-5643, CVE-2013-0189, CVE-2013-1839, CVE-2013-4123 2013-12-23 05:18:34 +02:00
Vladimír Čunát 2b24f1349a Merge master into x-updates 2013-12-21 10:20:55 +01:00
Nixpkgs Monitor 335cfe188d zabbix20.agent: update from 2.0.9 to 2.0.10 2013-12-21 02:28:26 +02:00
Nixpkgs Monitor 156ff88ed2 zabbix.agent: update from 1.8.18rc1 to 1.8.19, potentially fixes CVE-2013-6824 2013-12-21 02:28:26 +02:00
Vladimír Čunát 4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
Nixpkgs Monitor 3f39947054 jetty61: update from 6.1.21 to 6.1.26 2013-12-18 18:18:33 +02:00
Nixpkgs Monitor 6b0e77f8b5 dovecot: update from 2.1.8 to 2.1.17 2013-12-18 18:18:25 +02:00
Nixpkgs Monitor 01a474bce4 bird: update from 1.3.11 to 1.4.0 2013-12-18 18:18:19 +02:00
Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Michael Raskin 397721b870 Merge pull request #1360 from tomberek/add_shellinabox
Add shellinabox
2013-12-14 22:50:47 -08:00
Vladimír Čunát 095949bdc8 xorg server: maintenance update 1.14.4 -> .5
Also drop dri-path patch which wasn't needed for several months,
and now it no longer applied. I tested that drivers are still found.
2013-12-14 23:17:15 +01:00
Carles Pagès 3dd9f61d0d rabbitmq-server: update to 3.2.1 2013-12-13 16:53:06 +01:00
Domen Kožar b239c3f3ee Merge pull request #1370 from offlinehacker/pkgs/nginx/module_moreheaders
nginx: add headers more nginx module
2013-12-13 02:45:45 -08:00
Jaka Hudoklin 1b019fe39f nginx: enable ipv6 and spdy 2013-12-13 09:42:06 +01:00
Jaka Hudoklin 698860bf7c nginx: add headers more nginx module 2013-12-13 09:38:34 +01:00
Evgeny Egorochkin 4c1981c4e0 Revert "virtuoso: update from 6.1.6 to 6.1.7"
Upstream KDE advises against 6.1.7 for now

This reverts commit 7c19a2213f.
2013-12-12 09:33:57 +02:00
Thomas Bereknyei b7a9e1a998 Add shellinabox 2013-12-11 03:52:30 -05:00
Vladimír Čunát 089da3ee5c Merge master into x-updates
Conflicts (simple):
	pkgs/top-level/all-packages.nix
2013-12-10 13:00:02 +01:00
Peter Simons 486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Evgeny Egorochkin 328d59eab6 add meta.repositories.git to several packages 2013-12-10 01:07:30 +02:00
Nixpkgs Monitor 6996067dcf apacheHttpd_2_4: update from 2.4.6 to 2.4.7 2013-12-09 10:49:00 +02:00
Nixpkgs Monitor e523fdfc47 apacheHttpd: update from 2.2.25 to 2.2.26 2013-12-09 10:47:10 +02:00
Vladimír Čunát 6690c97569 Merge branch 'master' into x-updates
Conflicts (just different styles, same semantics):
	pkgs/development/libraries/libusb1/default.nix
2013-12-07 14:17:16 +01:00
Bjørn Forsman ab98496d0b Revert "gpsd: update from 2.95 to 3.10"
This update broke gpsd because the download url changed and trying to
get version 3.10 from the old url returns an error document with a
timestamp resulting in new hashes on every build.

And more importantly, gpsd 3.10 switched to the scons build system, so
even if the download url was correct it will fail to build until the
expression is updated.

This reverts commit 3f1c26b825.
2013-12-06 19:03:43 +01:00
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Nixpkgs Monitor 3f1c26b825 gpsd: update from 2.95 to 3.10 2013-12-04 15:17:41 +02:00
Nixpkgs Monitor 7c19a2213f virtuoso: update from 6.1.6 to 6.1.7 2013-12-04 06:52:22 +02:00
Nixpkgs Monitor 3c51255820 mpd: update from 0.18.3 to 0.18.5 2013-12-04 06:19:08 +02:00
Nixpkgs Monitor 03b15f9409 mongodb: update from 2.4.5 to 2.4.8, potentially fixes CVE-2013-2132 2013-12-04 05:30:48 +02:00
Nixpkgs Monitor e72352761c tomcat6: update from 6.0.32 to 6.0.37, potentially fixes CVE-2012-0022, CVE-2012-2733, CVE-2012-3544, CVE-2012-3546, CVE-2012-4431, CVE-2012-4534, CVE-2012-5568, CVE-2012-5885, CVE-2012-5886, CVE-2012-5887, CVE-2013-2067 2013-12-04 05:07:47 +02:00
Nixpkgs Monitor b296f02449 squid: update from 3.1.15 to 3.1.23, potentially fixes CVE-2012-5643, CVE-2013-0189 2013-12-04 05:00:42 +02:00
Nixpkgs Monitor 22bd6c8efd varnish: update from 3.0.4 to 3.0.5, potentially fixes CVE-2013-4484 2013-12-04 04:57:26 +02:00
Nixpkgs Monitor 1fba241e7d polipo: update from 1.0.4 to 1.0.4.1 2013-12-04 03:41:12 +02:00
Cillian de Róiste b7aaa7ab78 nagios-plugins: fix download URL (no longer available from sourceforge) 2013-12-03 11:28:27 +01:00
Vladimír Čunát d09b722f77 Merge master into x-updates 2013-12-02 21:41:16 +01:00
Jason "Don" O'Conal 7f6b5a0472 dico: fix build 2013-11-29 00:10:23 +00:00
Michael Raskin 2f53f6c82d Fixing automatic update of Nginx 2013-11-25 10:59:39 +04:00
Michael Raskin 980c7929ab Updating Nginx to 1.4.4 2013-11-25 10:59:39 +04:00
zimbatm fb596303cf Adds beanstalkd v1.9 2013-11-24 23:13:13 +00:00
Rok Garbas a8d5881c3e varnish: update to 3.0.4 2013-11-23 15:36:20 +01:00
Vladimír Čunát 6e5c003f42 xorg xf86-video-nv: fix build via an upstream patch 2013-11-23 12:31:23 +01:00
Vladimír Čunát b5fba47147 Merge branch master into x-updates
Conflicts (not used, deleted):
	pkgs/desktops/xfce/common.nix
2013-11-23 10:22:26 +01:00
Michael Raskin 5b97997aef Merge pull request #1234 from lovek323/mpd
mpd: update to latest version
2013-11-21 00:38:24 -08:00
Rok Garbas 174f5813ef nginx: rtmp module - commited to fast. now it works. 2013-11-18 17:04:30 +01:00
Rok Garbas f73185d596 nginx: adding rtmp module 2013-11-18 16:02:33 +01:00
Bjørn Forsman 9c0e95663a lighttpd: update 1.4.32 -> 1.4.33
Changes in this version: http://www.lighttpd.net/2013/9/27/1-4-33/
2013-11-17 23:06:25 +01:00
Vladimír Čunát 68430cf3d7 Merge branch master into x-updates
Conflicts (trivial, minor update on master, major here):
	pkgs/development/libraries/mesa/default.nix
2013-11-16 20:32:44 +01:00
Bjørn Forsman 6c2ee56e4b samba: bump 3.6.18 -> 3.6.20 (security fixes)
3.6.20 is a security release in order to address CVE-2013-4475 (ACLs are
not checked on opening an alternate data stream on a file or directory)
and CVE-2013-4476 (Private key in key.pem world readable).

And 3.6.19 had some bug fixes:
http://www.samba.org/samba/history/samba-3.6.19.html
2013-11-12 20:29:45 +01:00
Moritz Ulrich 6937e0a99b yaws: Update to 1.98.
This fixes the build when compiled with Erlang 16B01 (default).

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-12 20:04:26 +01:00
Jason "Don" O'Conal 311a25648b mpd: update to latest version 2013-11-11 01:08:21 +00:00
Eelco Dolstra 10e31f6de7 Clean up the vsftpd module a bit 2013-11-07 16:38:57 +01:00
Michael Raskin 2b8cdc8434 Merge pull request #686 from ocharles/postgres92
Disable exec symlink resolution for PostgreSQL 9.2
2013-11-07 02:53:37 -08:00
Vladimír Čunát feb778507f xorg-server: remove now-upstreamed patch
I'm sorry I completely forgot to test the previous commit.
Also remove some long unused patch.
2013-11-06 20:07:35 +01:00
Vladimír Čunát 834af9c905 xorg-server: bugfix update 1.14.3 -> .4, including CVE
CVE-2013-4396, otherwise a few fixes, see
http://lists.x.org/archives/xorg-announce/2013-November/002352.html
2013-11-05 23:13:31 +01:00
Eelco Dolstra c88055e1a2 Set meta.hydraPlatforms instead of meta.platforms for some packages 2013-11-05 00:06:10 +01:00
Eelco Dolstra a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
Eelco Dolstra 01087750ba Don't build some packages on some platforms 2013-11-04 21:11:00 +01:00
Eelco Dolstra 798ce14839 apache-httpd: Update to 2.4.6 2013-11-04 21:10:59 +01:00
Rok Garbas 6d059b2ee5 ejabberd: updated to 2.1.13 2013-11-02 01:46:30 +01:00
Rok Garbas 023d74049c varnish: adding version 2.1.x 2013-11-02 01:45:27 +01:00
Mathijs Kwik f4903d890e Merge branch 'master' into x-updates 2013-11-01 08:35:16 +01:00
Mathijs Kwik 609f8dc04b Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
Carles Pagès 383bb29d23 Add qpid v0.24
It includes both the broker and the C++ client lib. I had to do some hacks to
prevent the installer from putting thins outside $out.

Close #1134.
2013-10-30 17:24:02 +02:00
Peter Simons 91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/top-level/all-packages.nix
2013-10-26 18:28:05 +02:00
aszlig ab701322dc
zabbix20: Update to now upstream version 2.0.9.
This drops the patch for ZBX-7091, because it hase been fixed upstream.

Other upstream changes can be found at the following URL:

http://www.zabbix.com/rn2.0.9.php

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-10-23 17:16:18 +02:00
Peter Simons 3af6415ab8 mailman: add version 2.1.16 2013-10-21 15:02:35 +02:00
Jaka Hudoklin 5de7170aa5 nginx: Add optional patch for syslog support.
close #1055.
2013-10-20 22:51:27 +03:00
Domen Kožar c1b9775821 Merge pull request #1090 from NixOS/munin-rework
munin: refactor package and add nixos service
2013-10-20 08:10:28 -07:00
Domen Kožar 9230ae6522 munin: refactor package and add nixos service 2013-10-20 15:08:07 +02:00
Peter Simons 6be8ad3392 Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Domen Kožar 9e33bcc54d nginx: 1.4.1 -> 1.4.3 2013-10-17 23:36:21 +02:00
Eelco Dolstra 34d61c53c2 postgresql: Update to latest versions 2013-10-17 13:29:49 +02:00
Eelco Dolstra de10c1b9be mysql: Update to 5.1.72 2013-10-17 13:25:45 +02:00
Eelco Dolstra 9255b5b81c mysql: Move all versions into the same directory 2013-10-17 13:25:13 +02:00
Eelco Dolstra fc9b53c2bc mysql: Update to 5.5.34
CVE-2013-3839
2013-10-17 13:21:58 +02:00
Eelco Dolstra 55ec87a907 mysql: Remove ancient, unsupported versions 2013-10-17 13:20:50 +02:00
Eelco Dolstra aeb3169b71 xorg-server: Fix a 20 year old security bug
CVE-2013-4396
2013-10-16 11:58:08 +02:00
Eelco Dolstra df0d362f31 Fix some more Hydra evaluation errors 2013-10-08 11:07:14 +02:00
Bjørn Forsman 083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Eelco Dolstra 9db68de9e6 polkit, pulseaudio: Drop some Linux-specific dependencies 2013-10-06 00:21:28 +02:00
Vladimír Čunát 5bcdc3efd2 xorg server: major update 1.13.4 -> 1.14.3
- The 1.13 branch gets no updates since April,
  so I thought it's a good time to switch.
- Some xorg modules needed to be updated to build,
  but some don't have the update (probably all very obscure).
- Maybe it would be good to update the intel driver (or some others),
  I don't know.
2013-10-05 22:17:01 +02:00
Bjørn Forsman 28ac782583 Some description fixes
There are many more packages to fix, this is just a start.

Rules:
 * Don't repeat the package name (not always that easy...)
 * Start with capital letter
 * Don't end with full stop
 * Don't start with "The ..." or "A ..."

I've also added descriptions to some packages and rewritten others.
2013-10-05 19:36:23 +02:00
Eelco Dolstra e5ebb59e1d zabbix: Apply fix for a SQL injection bug
https://support.zabbix.com/browse/ZBX-7091

CVE-2013-5743
2013-10-04 13:52:49 +02:00
Peter Simons ac5d5297dd Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-02 22:44:12 +02:00
Rickard Nilsson 4674d745e0 dovecot-pigeonhole: Update to 0.4.2 2013-10-02 18:51:31 +02:00
Rickard Nilsson 8c01614588 dovecot 2.2.x: Update to 2.2.6 2013-10-02 18:51:31 +02:00
Domen Kožar 43333ae57d munin: 2.0.14 -> 2.0.17 2013-09-29 22:02:45 +02:00
Domen Kožar d1ab7ca2ec Merge pull request #1002 from DriesVanDaele/master
add the mpc (mpd cli client) package
2013-09-29 04:05:16 -07:00
aszlig c9614d2d05
lighttpd: Allow to compile with magnet support.
This also adds pkgconfig to the dependency list so we don't need to
specify the path to OpenSSL anymore, because we need pkgconfig in order
to correctly find Lua anyway.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-09-27 15:23:29 +02:00
Dries Van Daele f93daff6a3 remove some whitelines 2013-09-23 21:16:14 +02:00
Dries Van Daele 6b5cbfb310 add the mpc (mpd cli client) package 2013-09-23 20:54:20 +02:00
Peter Simons 9407832de4 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
Domen Kožar 4adad8d7c0 Merge pull request #1001 from DriesVanDaele/master
update libmpdclient to version 2.8
2013-09-22 10:26:44 -07:00
Dries Van Daele bbcf67bd22 update libmpdclient to version 2.8 2013-09-22 16:47:17 +02:00
Malcolm Matalka 7aacc46f10 Pin 1.3.1 to R15B03, riak does not work with R16 2013-09-17 20:41:06 +02:00
Shea Levy 59bd1ba586 Add virtuoso 7
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-09-17 14:28:26 -04:00
Lluís Batlle i Rossell 9dcca4e3f5 Adding bird-1.3.11 2013-09-15 11:39:24 +02:00
Mathijs Kwik 2f428bbb46 Merge remote-tracking branch 'official/master' into stdenv-updates 2013-09-11 10:56:47 +02:00
Vladimír Čunát aa8e8303e1 Merge branch 'x-updates' into master 2013-09-11 08:37:03 +02:00
Vladimír Čunát bb6b42385d Merge PR #901: adding Storm
vcunat edit: use symlink instead of hardlink (failed for me with a
cross-device error), minor whitespace cleanup
2013-09-10 16:18:31 +02:00
Peter Simons 3d2caf1180 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-08 22:54:35 +02:00
Vladimír Čunát c1ed13dad0 Merge branch 'master' into x-updates 2013-09-08 12:04:20 +02:00
Jason \"Don\" O'Conal 834cd6c886 beret: Fix build on darwin (close #923) 2013-09-08 10:32:25 +02:00
Vladimír Čunát b1be46e932 Merge branch 'master' into x-updates 2013-09-07 16:19:46 +02:00
Bjørn Forsman 618fc386d7 samba: provide libnss_{wins,winbind}.so.2 symlinks for nsswitch
Glibc >= 2.1 looks for libnss_<name>.so.2 files (see man nsswitch.conf),
so provide that.
2013-09-07 15:06:55 +02:00
Danny Wilson 2ff0b8dc14 I henceforth will maintain as my Github username. 2013-09-02 18:48:29 +02:00