3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1762 commits

Author SHA1 Message Date
Shea Levy 2db4171978 Add jetty 9.2.5 2014-11-23 19:27:11 -05:00
Jaka Hudoklin 444bda1936 Merge pull request #4991 from offlinehacker/nixos/etcd
nixos: add etcd module
2014-11-22 12:05:35 +01:00
Shea Levy d123f1faf0 solr: bump 2014-11-21 15:10:59 -05:00
Jaka Hudoklin bcf9da32f7 etcd: update to v0.5.0-alpha3 2014-11-21 13:54:45 +01:00
Emery Hemingway e6f70fd2b3 icecast: update 2.3.3 to 2.4.0
now with opus support
2014-11-20 17:41:22 -05:00
Mateusz Kowalczyk 5fc61b7fa0 mpd: update to 0.19.4 2014-11-20 13:30:01 +00:00
David Virgilio 9a2b2e7b34 new package: xwayland 2014-11-20 06:21:47 -06:00
Domen Kožar 49a933c596 Revert "zmq: initial package"
This reverts commit b9c7f8dba1.

Conflicts:
	pkgs/servers/zeromq/default.nix
	pkgs/top-level/all-packages.nix
2014-11-20 10:08:52 +01:00
Rob Vermaas 0aa742989f mysql_jdbc: update from 5.1.31 to 5.1.32, potentially fixes CVE-2012-0075, CVE-2012-0087, CVE-2012-0101, CVE-2012-0102, CVE-2012-0112, CVE-2012-0113, CVE-2012-0114, CVE-2012-0115, CVE-2012-0116, CVE-2012-0118, CVE-2012-0119, CVE-2012-0120, CVE-2012-0484, CVE-2012-0485, CVE-2012-0490, CVE-2012-0492, CVE-2012-0540, CVE-2012-0553, CVE-2012-0572, CVE-2012-0574, CVE-2012-0583, CVE-2012-0882, CVE-2012-1688, CVE-2012-1689, CVE-2012-1690, CVE-2012-1696, CVE-2012-1697, CVE-2012-1702, CVE-2012-1703, CVE-2012-1705, CVE-2012-1734, CVE-2012-2102, CVE-2012-2749, CVE-2012-3150, CVE-2012-3158, CVE-2012-3160, CVE-2012-3163, CVE-2012-3166, CVE-2012-3167, CVE-2012-3173, CVE-2012-3177, CVE-2012-3180, CVE-2012-3197, CVE-2012-5060, CVE-2013-0375, CVE-2013-0383, CVE-2013-0384, CVE-2013-0385, CVE-2013-0389, CVE-2013-1492, CVE-2013-1506, CVE-2013-1521, CVE-2013-1548, CVE-2013-1552, CVE-2013-1555, CVE-2013-2378, CVE-2013-2389, CVE-2013-2391, CVE-2013-2392, CVE-2013-3802, CVE-2013-3804, CVE-2013-3808, CVE-2013-5908, CVE-2014-0386, CVE-2014-0393, CVE-2014-0401, CVE-2014-0402, CVE-2014-0412, CVE-2014-0437 2014-11-18 16:06:44 +01:00
Charles Strahan 973794b24a bundixify riemann-dash 2014-11-18 03:31:56 +00:00
Charles Strahan 44cdf4eac7 bundixify consul-ui 2014-11-18 03:06:56 +00:00
William A. Kennington III 583ab7512d consul: 0.4.0 -> 0.4.1 2014-11-17 13:19:30 -08:00
Eelco Dolstra a0f3faf34e Merge remote-tracking branch 'origin/glibc-2.20' into staging 2014-11-16 22:17:36 +01:00
William A. Kennington III 478e4b46d1 pgpool: Add derivation 2014-11-15 01:23:25 -08:00
Mateusz Kowalczyk 89e38c692f mpd: update to 0.19.3 2014-11-15 01:54:00 +00:00
Vladimír Čunát b4af993c3f Merge branch 'master' into staging
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
Gavin Rogers ec3e96683a zeromq: renamed package from zmq 2014-11-13 23:00:53 +00:00
Gavin Rogers b9c7f8dba1 zmq: initial package 2014-11-12 23:08:05 +00:00
Vladimír Čunát 4a62542f55 xorg.xf86-video-intel: use the new versions
The old driver wasn't updated since August 2013, and e.g. won't compile
with glibc-2.20. Distros like Arch or Ubuntu are using newer one for a long time.

(cherry picked from commit 515dcb0f66)
 because the old driver won't compile with new X server.
2014-11-12 16:33:20 +01:00
Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Shea Levy f207fee725 bird: bump 2014-11-11 14:27:21 -05:00
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Eelco Dolstra db4053fb59 httpd-2.2: Enable building of mod_cache and friends 2014-11-11 10:39:24 +01:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Charles Strahan cf8f4963a7 rename rubyLibs to rubyPackages 2014-11-09 22:16:58 +00:00
Domen Kožar 824879cfd4 tomcat-connectors: 1.2.32 -> 1.2.40 2014-11-08 19:48:54 +01:00
Luca Bruno 83221f3886 Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Eelco Dolstra 2819063c37 mod_evasive: Add Apache version check 2014-11-07 11:42:43 +01:00
Eelco Dolstra 690154993d mod_fastcgi: Fix building against Apache 2.4 2014-11-07 11:38:50 +01:00
Eelco Dolstra bad2955079 mod_python: Update to 3.5.0
This fixes building against Apache 2.4.
2014-11-07 11:31:04 +01:00
Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Bjørn Forsman 4f220bd0c3 munin: add missing dependency on 'NetCIDR'
Fixes

  munin-node[30100]: Can't locate Net/CIDR.pm in @INC (@INC contains: [...])

when using the 'cidr_allow' configuration directive.
2014-11-05 22:27:27 +01:00
Vladimír Čunát 52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Vladimír Čunát dcd2590c98 xorg-server: major bump 1.14.* -> 1.16.1 (incl. deps) 2014-11-05 07:55:25 +01:00
Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Rob Vermaas 40ccad06c9 mysql55: update from 5.5.39 to 5.5.40, potentially fixes CVE-2014-6464, CVE-2014-6469, CVE-2014-6491, CVE-2014-6494, CVE-2014-6496, CVE-2014-6500, CVE-2014-6507, CVE-2014-6555, CVE-2014-6559 2014-11-04 10:19:39 +01:00
lethalman 636a4c00ca Merge pull request #4801 from robberer/pkgs/zabbix-server
zabbix-server: add extraConfig option
2014-11-04 00:32:46 +01:00
Peter Simons b5fed52c43 Merge pull request #4238 from wkennington/master.boost
Make boost 156 the default
2014-11-03 23:03:01 +01:00
Michael Raskin b7f7341169 Add Nginx 1.7.7; RTMP module fails for some reason 2014-11-04 00:54:15 +03:00
Michael Raskin 09e505a4c4 Update Squid proxy 2014-11-04 00:37:42 +03:00
Mateusz Kowalczyk 81b402faf8 mpd: 0.19.1 -> 0.19.2 2014-11-03 17:14:38 +00:00
Longrin Wischnewski 7fb934c4d0 zabbix-server: add new optional build options 2014-11-03 16:51:09 +01:00
William A. Kennington III 3aa7f22228 rippled: Refactor and update to 0.26.2 2014-11-02 17:22:28 -08:00
William A. Kennington III aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
Michael Raskin 1c5baac639 Update Apache Jena 2014-11-02 23:51:59 +03:00
Edward Tjörnhammar 942085daab Merge pull request #4556 from edwtjo/elastic-river-twitter
elasticsearchPlugins.elasticsearch_river_twitter: added package
2014-11-02 21:38:12 +01:00
Luca Bruno cb2752721e mysql: use another download url, cdn.mysql.com is slow after 30% 2014-11-02 18:26:38 +01:00
Peter Simons a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
Vladimír Čunát 515dcb0f66 xorg.xf86-video-intel: use the new versions
The old driver wasn't updated since August 2013, and e.g. won't compile
with glibc-2.20. Distros like Arch or Ubuntu are using newer one for a long time.
2014-11-01 23:38:06 +01:00
Vladimír Čunát 95b475da09 xorg.xf86-input-vmmouse: fix build with glibc-2.20 2014-11-01 23:26:44 +01:00
Vladimír Čunát 4cc61d6d08 xorg.xf86-video-vmware: fix build against glibc-2.20 2014-11-01 22:29:42 +01:00
Domen Kožar 12b909bba1 mongodb: 2.6.4 -> 2.6.5 2014-11-01 13:13:15 +01:00
Aristid Breitkreuz 53c287f5cd postgresql 9.4beta3, but keep beta2 around because they are not compatible 2014-10-31 22:21:16 +01:00
Peter Simons b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Edward Tjörnhammar b69410764f elasticsearchPlugins.elasticsearch_river_twitter: added package 2014-10-30 12:28:39 +01:00
cillianderoiste 2b706f6aaf Merge pull request #4724 from flosse/prosody-update
prosody: updated to v0.9.6
2014-10-29 21:51:07 +01:00
Markus Kohlhase bc86dfa6b5 prosody: updated to v0.9.6 2014-10-29 21:11:25 +01:00
Evgeny Egorochkin 40979710f7 mediatomb: fix build by fetching a slightly newer git revision which has patches for new versions of dependencies, add more dependencies, clean up. 2014-10-29 05:09:28 +02:00
Rickard Nilsson b6f505c60a postfix: Update from 2.11.1 to 2.11.3 2014-10-27 21:48:33 +01:00
Rickard Nilsson 2d58efd3e4 dovecot: Update from 2.2.14 to 2.2.15 2014-10-27 21:24:08 +01:00
Joachim Schiele 40f24dca0f brickd: packaged version 2.1.1 2014-10-27 19:11:51 +01:00
Bjørn Forsman e8dc583eb4 tomcat: set meta.platforms 2014-10-27 18:44:25 +01:00
Eelco Dolstra f4be4f5e54 Merge remote-tracking branch 'origin/master' into staging 2014-10-24 12:24:13 +02:00
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
Jaka Hudoklin 7eb4d306fb elasticsearch: add support for plugins 2014-07-25 17:28:59 +02:00
Joel Taylor cafb12647f add ps to path for build 2014-07-24 14:19:16 -07:00
Marc Weber ba154ec9d4 apache 2_4 update, fixes some CVE's
See http://www.apache.org/dist/httpd/Announcement2.4.html It compiles,
didn't run it. I guess minor update doesn't cause much trouble even
though there are some new features
2014-07-24 18:10:10 +02:00
Bjørn Forsman f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
Vladimír Čunát b9045a7d96 Merge branch 'x-updates' into staging
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Eelco Dolstra 4f7289eec9 Don't use ensureDir 2014-07-22 11:01:32 +02:00
Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Vladimír Čunát 9b02635faa Merge recent master into x-updates
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
2014-07-21 12:05:57 +02:00
Vladimír Čunát f456abacb7 xorg.libXi: bugfix update 2014-07-20 08:38:06 +02:00
Pascal Wittmann fc7fc7ce43 mpd: use pulseaudio in buildInputs if pulseaudioSupport is true not if zipSupport is true 2014-07-18 16:56:06 +02:00
Bjørn Forsman f2d5fe86bd munin: simplify setting of PERL5PATH
Use lib.makePerlPath instead of manually duplicating
"/lib/perl5/site_perl" all over.
2014-07-18 12:37:36 +02:00
Vladimír Čunát 16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Peter Simons 75bbad8abe Merge pull request #3285 from ehmry/polipo
Polipo
2014-07-16 18:29:11 +02:00
William Roe 3af919fb08 elasticsearch: update to 1.2.2 2014-07-15 16:57:16 +01:00
Emery Hemingway 0d781369c0 polipo: update to 1.1.1 2014-07-15 10:10:28 -04:00
Eelco Dolstra ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Vladimír Čunát edec3719a6 xorg: update a few modules 2014-07-13 21:35:25 +02:00
Vladimír Čunát 5979d428b4 Merge recent master into x-updates
Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
2014-07-09 22:13:29 +02:00
Jaka Hudoklin 2cc11dd21a elasticsearch: fix darwin build 2014-07-08 00:30:20 +02:00
Eelco Dolstra 95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Matthew Brown 518daa9660 Added Sphinx Search package 2014-07-06 15:42:00 +01:00
Rok Garbas fac41b58ca couchdb: update to 1.6.0 2014-07-05 09:18:42 +01:00
Vladimír Čunát aceb30cd93 Merge master into x-updates
Adds the mass-rebuilding python update.
2014-07-02 22:54:41 +02:00
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Michael Raskin 3471744cbb Add auto-updating meta for restund 2014-07-01 11:54:09 +04:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Michael Raskin 54586a77e7 Adding a minimal script set to serve store as a dynamical binary cache 2014-06-30 00:39:54 +04:00
Benno Fünfstück e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
2014-06-28 21:06:10 +02:00
Vladimír Čunát db1afc01d2 samba: security-only updates 2.6.22 -> .24
Fixes CVE-2014-{0244,3493} and CVE-2013-4496
2014-06-26 22:23:09 +02:00
Vladimír Čunát dfd80a1b7e Merge recent master into x-updates
Hydra eval: 1131611
2014-06-26 22:05:15 +02:00
Charles Strahan 749e73afc7 consul: new package 2014-06-25 14:40:26 -04:00
John Wiegley dfd8247bc1 Merge pull request #3065 from cstrahan/nsq
add nsq package
2014-06-24 15:20:42 -07:00
John Wiegley 7fa6438281 Merge pull request #3064 from cstrahan/fleet
add fleet package
2014-06-24 15:20:30 -07:00
John Wiegley 6cc6b6f6ea Merge pull request #3062 from cstrahan/etcd
add etcd package
2014-06-24 15:20:10 -07:00
Charles Strahan 1091dde5bb add nsq package 2014-06-23 05:43:17 -04:00
Charles Strahan 693bc7d44e add fleet package 2014-06-23 05:20:41 -04:00