MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
54926 commits 258 branches 124 tags 6 GiB
Commit graph

1598 commits

Author SHA1 Message Date
Aristid Breitkreuz
3c6b3c587d Merge pull request #4603 from exlevan/master 
mysql: make cleaner directory layout for 5.5.*
 2014-10-23 21:24:58 +02:00
Vladimír Čunát
2cf17b0802 Merge recent master into staging 
Hydra nixpkgs: ?compare=1156478
 2014-10-23 17:40:41 +02:00
Rob Vermaas
6596dccfd9 zabbix.server: update from 1.8.20 to 1.8.21 2014-10-22 15:29:05 +02:00
Michael Raskin
6b727e8d68 Merge pull request #4596 from abbradar/rpmextract 
Add "rpmextract" script and use it
 2014-10-20 22:00:59 +04:00
Alexey Levan
4ea7e3e97b mysql: make cleaner directory layout for 5.5.* 2014-10-20 19:39:48 +03:00
Nikolay Amiantov
307af9148b use rpmextract in some packages 2014-10-20 03:16:59 +04:00
Vladimír Čunát
9877fdb39d xorg: updates some modules; mostly minor changes 2014-10-19 20:10:19 +02:00
Mateusz Kowalczyk
67a1a96b49 mpd: update to 0.19.1 2014-10-19 17:34:13 +01:00
Domen Kožar
74fde7c388 Merge pull request #4495 from NixOS/pythonFull_improvements 
PythonFull improvements
 2014-10-16 13:24:18 +02:00
Rickard Nilsson
91be9d5796 dovecot: Update from 2.2.13 to 2.2.14 2014-10-16 08:14:46 +02:00
Joachim Schiele
9d5431d1a2 Merge pull request #4536 from flosse/prosody 
prosody: updated to v0.9.5
 2014-10-15 09:41:48 +02:00
Joachim Schiele
13298fcbb9 Merge pull request #4535 from flosse/lua-bitop 
lua-packages: added lua-bitop to add websocket support for prosody
 2014-10-15 09:41:32 +02:00
Markus Kohlhase
0f3f017f3e prosody: updated to v0.9.5 2014-10-15 04:11:24 +02:00
Markus Kohlhase
5308d3284b prosody: added websocket support 2014-10-15 03:57:00 +02:00
Rickard Nilsson
d1d39dea3d elasticsearch: Update from 1.3.2 to 1.3.4 2014-10-14 19:06:03 +02:00
Domen Kožar
a2a7abc67c pythonFull -> python with all modules, pythonFullWithPkgs -> buildEnv 2014-10-13 21:35:21 +02:00
Longrin Wischnewski
6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Joachim Schiele
df95acd13c Merge pull request #3960 from flosse/prosody-service 
Prosody service
 2014-10-11 23:10:05 +02:00
Markus Kohlhase
d86c2c30c5 prosody: packaged as a service 
Conflicts:
	nixos/modules/misc/ids.nix
 2014-10-11 18:53:43 +02:00
Mateusz Kowalczyk
01854619cd mpd: fix URL 
Stable is now 0.19; we're not updating to 0.19 yet because upstream
forgot to include a necessary file in the 0.19 tarball.

FTR 0.19 requires boost and icu as dependencies

cc @astsmtl
 2014-10-11 14:32:51 +01:00
Austin Seipp
37b9a2bad5 mariadb: 10.0.13 -> 10.0.14 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-10-09 17:01:06 -05:00
Domen Kožar
1f284665fa add patches for openafs-client on kerel 3.17 2014-10-09 13:12:52 +02:00
Eelco Dolstra
811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv 
Conflicts:
	pkgs/tools/security/gnupg/default.nix
 2014-10-09 10:57:57 +02:00
Aristid Breitkreuz
7a9bf3540e thttpd: update from 2.25b to 2.26, potentially fixes CVE-2013-0348 2014-10-08 20:23:26 +02:00
William A. Kennington III
ee8a97a25e corosync: Add package 2014-10-08 01:46:23 -07:00
William A. Kennington III
3efcae2652 net_snmp: openssl must be propagated as it required when linking against libnetsnmp 2014-10-08 01:37:46 -07:00
Aristid Breitkreuz
28b5e2b685 memcached: update from 1.4.17 to 1.4.20 2014-10-07 22:50:46 +02:00
Aristid Breitkreuz
a5ca3f3e0e mpd: update from 0.18.12 to 0.18.16 2014-10-07 21:50:40 +02:00
Aristid Breitkreuz
5e426e753a redis: update from 2.8.9 to 2.8.17 2014-10-07 21:07:41 +02:00
Aristid Breitkreuz
0d2989f438 postgresql84: update from 8.4.21 to 8.4.22 2014-10-07 20:54:22 +02:00
Aristid Breitkreuz
4d133363d4 couchdb: update from 1.6.0 to 1.6.1 2014-10-06 22:03:42 +02:00
Aristid Breitkreuz
a839129fde Merge pull request #4388 from NixOS/minecraft-sound 
Minecraft sound with Pulseaudio
 2014-10-06 20:08:29 +02:00
Domen Kožar
b4d12184ce elasticsearch_river_jdbc: 1.2.1.1 -> 1.3.0.4 2014-10-06 16:44:23 +02:00
Jaka Hudoklin
f719f0b230 elasticsearch: fix plugins install 2014-10-06 16:22:05 +02:00
Aristid Breitkreuz
6c7786074f fix sound in minecraft for pulseaudio users 2014-10-05 19:50:35 +02:00
Francesco Lazzarino
94a6db6cda cassandra: environment fix for cassandra shell script 2014-10-03 17:36:50 -05:00
Francesco Lazzarino
17aae5742d Apache Cassandra 2.1.0 2014-10-01 15:25:32 -05:00
Michael Raskin
4dabba4d1e Add a binary distribution of Apache Jena RDF storage system 2014-09-30 23:11:19 +04:00
Mateusz Kowalczyk
e3dc5b5072 bird: update from 1.4.0 to 1.4.4 
cc @viric
 2014-09-30 11:18:42 +01:00
Mateusz Kowalczyk
ded8bde06b elasticsearchPlugins.elasticsearch_http_basic: update from 1.2.0 to 1.3.2, potentially fixes CVE-2013-5307 2014-09-30 10:56:11 +01:00
Mateusz Kowalczyk
18476acaff elasticsearch: update from 1.2.2 to 1.3.2 2014-09-30 10:56:10 +01:00
Christoph Hrdinka
f5cd9d2460 nsd: fix description, license and platforms 2014-09-28 15:30:39 +02:00
Christoph Hrdinka
f1b3196f2d nsd: update to version 4.1.0 2014-09-28 14:43:26 +02:00
Christoph Hrdinka
29b4258622 nsd: add hrdinka to maintainers 2014-09-28 14:43:16 +02:00
Eelco Dolstra
8e40703f6c apache-httpd: Update to 2.2.29 
CVE-2014-0118, CVE-2014-0231, CVE-2014-0226, CVE-2013-5704.
 2014-09-24 21:04:24 +02:00
Domen Kožar
5853c2da91 openafs: fix on kernel 3.16 with upstream patches 2014-09-23 21:33:25 +02:00
Eelco Dolstra
cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging 
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
 2014-09-23 11:27:53 +02:00
William A. Kennington III
31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07:00
William A. Kennington III
a1d6c60e2d mongodb: Fix build 2014-09-21 15:18:16 -07:00
William A. Kennington III
f327e9c922 boostHeaders: regular boost package now only contains headers 2014-09-21 15:18:16 -07:00
Austin Seipp
9f15333589 openresty: 1.7.4.1rc1 -> 1.7.4.1rc2 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-09-20 08:21:11 -05:00
William A. Kennington III
0001e4819e nginx: 1.6.1 -> 1.6.2 
Additionally, update all extensions and convert them to fetchFromGitHub
 2014-09-19 16:42:04 -07:00
Marco Maggesi
2a75276c88 Update OpenAFS client to version 1.6.9 2014-09-19 23:20:23 +02:00
Jaka Hudoklin
f8284a083f seyren: udpate to 1.1.0 2014-09-17 18:33:51 +02:00
Rickard Nilsson
155053bcd9 diod: Update from 1.0.22 to 1.0.23 2014-09-16 13:53:18 +02:00
Pascal Wittmann
7bcd577bd1 mod-wsgi: update from 3.4 to 3.5, fixes CVE-2014-0240 2014-09-13 20:32:26 +02:00
Pascal Wittmann
8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Jaka Hudoklin
be2fe360db elasticsearchPlugins.elasticsearch_http_basic: set platform to build on 2014-09-13 02:24:48 +02:00
Jaka Hudoklin
f5e5815236 elasticsearchPlugins: add elasticsearch_http_basic, plugin for basic http authentication 2014-09-13 02:22:26 +02:00
William A. Kennington III
65f103175e consul: 0.3.0 -> 0.4.0 2014-09-11 15:40:41 -07:00
Jaka Hudoklin
dbae0b628e influxdb: update 0.7.0 -> 0.8.2 2014-09-11 18:06:06 +02:00
Rob Vermaas
75f8d6a19e ircdHybrid: update from 7.2.2 to 7.2.3, potentially fixes CVE-2013-0238 2014-09-11 13:37:45 +02:00
Domen Kožar
33ce850b82 fix a bunch of packages with lua5_1 2014-09-10 17:24:56 +02:00
Joel Taylor
afa1db198b fix even more clang builds 2014-09-09 13:54:57 -07:00
Joel Taylor
374648deaa X11 build purity 2014-09-09 13:54:25 -07:00
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Luca Bruno
ac724e7bbc Added TORQUE package and nixos module 
Resource management system for submitting and controlling
jobs on supercomputers, clusters, and grids

http://www.adaptivecomputing.com/products/open-source/torque
 2014-09-09 18:24:46 +02:00
Eelco Dolstra
585983bc95 Merge remote-tracking branch 'origin/staging' 
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
 2014-09-08 11:42:09 +02:00
Nixpkgs Monitor
43fdbc0bd7 mysql: update from 5.1.72 to 5.1.73, potentially fixes CVE-2013-5908, CVE-2014-0401, CVE-2014-0412, CVE-2014-0437 2014-09-06 18:20:17 +02:00
Nixpkgs Monitor
7694fcf524 mysql55: update from 5.5.37 to 5.5.39, potentially fixes CVE-2014-2494, CVE-2014-4207, CVE-2014-4258, CVE-2014-4260 2014-09-06 18:18:21 +02:00
Vladimír Čunát
06fea81c6e Merge recent master into staging 
Hydra: ?compare=1150594
 2014-09-06 16:52:45 +02:00
Michael Raskin
2e33964a6a Fix leafnode by working around the check 2014-09-06 12:44:32 +04:00
aszlig
fd9c8fa3dc
pkgs/nsd: Allow to easily override the package. 
Allowing to use nixpkgs config to provide different defaults is not
going to help us here, so we would like to use nsd.override {} in order
to supply the correct options in the module.

Eventually removing the nixpkgs config option would make sense here as
well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-09-05 02:54:39 +02:00
Aristid Breitkreuz
559045d98c fix license for postgresql packages 2014-09-04 20:38:12 +02:00
Aristid Breitkreuz
73e569bf01 add postgresql 9.4beta2 2014-09-04 20:36:43 +02:00
Matthew Brown
82b4965b08 Removed mysql dependency as it does not pick up the header files on Linux, even when specified explicitly in the config params. 2014-09-04 13:21:28 +01:00
Michael Raskin
d3c5e960b4 Merge pull request #3878 from pmahoney/ngx_lua 
nginx: add lua module
 2014-09-03 21:37:18 +04:00
Rickard Nilsson
66ee6e03e7 pulseaudio: Use group audio instead of pulse-access 2014-09-03 13:24:47 +02:00
Luca Bruno
0f6d45f6b4 sphinxsearch: fix again... 2014-09-03 12:02:25 +02:00
Luca Bruno
428cb0ea7a sphinxsearch: fix evaluation error 2014-09-03 11:26:06 +02:00
Michael Raskin
07e9016f35 Merge pull request #3195 from ederoyd46/add-sphinx-search 
Added Sphinx Search package
 2014-09-03 11:22:47 +04:00
Peter Simons
1c0d15b90e Merge branch 'origin/master' into staging. 
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
 2014-09-02 12:31:03 +02:00
Michael Raskin
3ad91106f1 Merge pull request #3704 from sfultong/upstream-master 
tomcat: update to upstream master
 2014-09-02 02:09:18 +04:00
Emery Hemingway
9aa9345a5a uhub: initial package for version 0.4.1 2014-09-01 10:53:19 +04:00
Domen Kožar
f70acd2584 munin: fix test 2014-08-31 16:54:09 +02:00
Patrick Mahoney
1e06594c0c mariadb: Patch to compile on OS X. 
* perl is required at build time on darwin. Copied from the
  mysql/5.5.x.nix

* CMake on darwin creates shared libraries with relative 'install_name'
  paths which are made absolute by fixDarwinDylibNames.

  See http://answers.opencv.org/question/4134/cmake-install_name_tool-absolute-path-for-library/

* The asm patch was needed to compile on darwin, though I do not
  understand what is going on. Error before the patch:

  [ 15%] Building C object mysys/CMakeFiles/mysys.dir/my_context.c.o
  .../nix-build-mariadb-10.0.13.drv-1/mariadb-10.0.13/mysys/my_context.c:207:Unknown pseudo-op: .cfi_escape
  .../nix-build-mariadb-10.0.13.drv-1/mariadb-10.0.13/mysys/my_context.c:207:Rest of line ignored. 1st junk character valued 48 (0).
  make[2]: *** [mysys/CMakeFiles/mysys.dir/my_context.c.o] Error 1
 2014-08-30 14:41:51 -05:00
Patrick Mahoney
2559ea7138 nginx: add lua module 2014-08-30 12:08:58 -05:00
Vladimír Čunát
e51f73652d Merge recent master into staging 
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
 2014-08-30 10:04:02 +02:00
Jaka Hudoklin
5a9cf40085 mongodb: add offline as maintainer 2014-08-29 17:56:07 +02:00
Jaka Hudoklin
ec9d2e6f2b mongodb: darwin support 2014-08-29 17:48:49 +02:00
Georges Dubus
a5143dd208 rabbitmq-server: updated to 3.3.5 2014-08-28 17:36:13 +02:00
Nathan Bijnens
ac90177cb1 Zookeeper 2014-08-27 13:01:30 +02:00
Andrew Morsillo
4933687885 Bump mongodb version from 2.6.0 to 2.6.4 2014-08-27 12:39:09 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions 
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
 2014-08-24 22:31:37 +02:00
Eelco Dolstra
2d6d43c02c Fix tarball build 2014-08-24 18:52:50 +02:00
Matthew Brown
5ef459fe2d Merge branch 'master' into add-sphinx-search 2014-08-24 11:21:41 +01:00
Matthew Brown
72df3f37e5 Updated definition file as per comments from the collaborator 2014-08-24 11:17:31 +01:00
Vladimír Čunát
0f6ae6403e xorg: fix typo from the last xorg commit 
Thanks to @falsifian for noticing it.
 2014-08-24 09:55:22 +02:00
Vladimír Čunát
99e300c4f8 xorg: add xf86-video-qxl 2014-08-23 18:55:30 +02:00
Rickard Nilsson
9bec5e1288 New package: riemann 0.2.6 2014-08-23 12:49:10 +02:00
Jaka Hudoklin
503b8afa3f Add neo4j database 2014-08-23 13:11:08 +04:00
Edward Tjörnhammar
1615be91ef Add mlmmj package and nixos module. 2014-08-23 12:30:45 +04:00
Patrick Mahoney
f254687071 s6: new package 
s6 is skarnet.org's small & secure supervision software suite.

The s6-log program is modified to call execlineb directly rather than
searching PATH.
 2014-08-22 23:42:13 -05:00
Eelco Dolstra
ce6b86cc68 Fix various evaluation problems 
http://hydra.nixos.org/build/13616685
 2014-08-22 11:57:40 +02:00
Luca Bruno
186589fdd1 leafnode: mark as broken for ZHF 2014-08-21 17:10:37 +02:00
Vladimír Čunát
59e3e06076 xorg: update probably unused modules 2014-08-21 15:13:22 +02:00
Vladimír Čunát
acf8919844 xorg.xrandr: minor bugfix update 2014-08-21 15:13:21 +02:00
Vladimír Čunát
c31c79f0dd xorg.xcb (lib+proto): update (seems mainly bug fixes) 2014-08-21 15:13:21 +02:00
Michael Raskin
b6a2f8eaa8 Fix a strange openresty build error 2014-08-21 08:42:00 +04:00
Sam Griffin
219983d6ad adding tomcat version 8 2014-08-20 23:23:44 -04:00
sfultong
c54a8ed1d0 Merge pull request #1 from sfultongv/sfultong-14.04 
updating tomcat to version 7
 2014-08-20 23:08:39 -04:00
Rickard Nilsson
bf0e265a61 diod: Update from 1.0.21 to 1.0.22 2014-08-20 16:10:20 +02:00
Austin Seipp
a8b59789d0 nagios-plugins: 2.0 -> 2.0.3 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-20 01:59:02 -05:00
Austin Seipp
53adb67395 nagios: 4.0.7 -> 4.0.8 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-20 01:58:50 -05:00
Austin Seipp
db2a37514d mariadb: 10.0.11 -> 10.0.13 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-20 01:48:42 -05:00
Austin Seipp
47c443bede nixpkgs: openresty 1.7.4.1rc1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-20 00:38:49 -05:00
John Wiegley
8b13100710 Merge pull request #3658 from cstrahan/xquartz-cleanup 
Remove old comment, and delete confusing LaunchDaemon
 2014-08-18 16:17:23 -05:00
Vladimír Čunát
99b0271712 pulseaudio: fix CVE-2014-3970 by upstream patch 2014-08-18 17:56:26 +02:00
Charles Strahan
6f2bd70fd0 Remove old comment, and delete confusing LaunchDaemon 2014-08-18 11:36:34 -04:00
Austin Seipp
ec42370aee nginx: 1.6.0 -> 1.6.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-08-17 06:35:40 -05:00
Jaka Hudoklin
953643bb0f elasticsearch: fix darwin, needs getopt 2014-08-16 12:55:23 +02:00
Daniel P. Wright
7f9eba573d Add taskserver package (close #3269) 2014-08-15 00:28:41 +02:00
John Wiegley
06a324f7dc Merge pull request #3101 from cstrahan/xquartz 
Use XQuartz on Darwin
 2014-08-14 16:33:46 -05:00
Vladimír Čunát
78118328b5 virtuoso7: disable i686-linux, as it's unsupported 2014-08-14 18:16:48 +02:00
Vladimír Čunát
b2a7b213be consul*: fix evaluation 
CC #2955.
 2014-08-14 14:36:34 +02:00
Vladimír Čunát
0cc668bc1a Merge master into PR 
Conflicts:
	pkgs/top-level/all-packages.nix
 2014-08-14 14:27:54 +02:00
Charles Strahan
5ea8497933 get xorg/x11 working on Darwin 2014-08-12 20:40:57 -04:00
Vladimír Čunát
52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Rickard Nilsson
629f7d055a mpd: Update from 0.18.11 to 0.18.12 2014-08-08 19:14:35 +02:00
Eelco Dolstra
8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Peter Simons
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Rob Vermaas
9092499154 Merge pull request #3470 from tailhook/beanstalkd_1.10 
beanstalkd: upgrade to v1.10
 2014-08-06 17:03:54 +02:00
William A. Kennington III
ede3e60a3c unifi: Add wkennington as a maintainer 2014-08-05 21:48:19 -05:00
William A. Kennington III
0652ee16e4 unifi: Add derivation 2014-08-05 16:18:41 -05:00
Paul Colomiets
d2d4b8477f beanstalkd: upgrade to v1.10 2014-08-05 15:56:02 +03:00
Patrick Mahoney
b947cde3a5 bind: Expand to all unix platforms. 2014-08-04 15:09:07 -05:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
Vladimír Čunát
6295a3ca36 Merge recent master into x-updates 
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-08-02 05:08:07 +02:00
Vladimír Čunát
91b53aaebc xorg.libXext: minor update 2014-08-02 04:43:19 +02:00
Bjørn Forsman
62d0a320b3 Revert "Remove obsolete jackaudio version 1." 
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
 2014-07-31 12:52:29 +02:00
Eelco Dolstra
e4e5502966 postgresql: Update to 9.0.18, 9.1.14, 9.2.9, 9.3.5 2014-07-30 18:13:51 +02:00
Peter Simons
bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-07-28 11:30:49 +02:00
Domen Kožar
c8cd4275a3 openfire: get rid of builderDefs 2014-07-27 13:54:37 +02:00
Domen Kožar
a219db3cb2 fix tarball job 2014-07-27 13:36:25 +02:00
Evgeny Egorochkin
8024d6ee3c RabbitMQ server: bump to 3.3.4 2014-07-26 14:33:53 +03:00
Jaka Hudoklin
b459a93533 Merge pull request #3364 from joelteon/mysql-ps 
On Darwin, add /bin/ps to path during MySQL build
 2014-07-26 02:34:10 +02:00
Jaka Hudoklin
b035be7b44 Merge pull request #3292 from offlinehacker/elasticsearch_plugins 
elasticsearch: add support for plugins
 2014-07-26 02:23:46 +02:00
William Roe
845d24d86c Update Serf to 0.6.3 2014-07-25 16:51:54 +01:00