1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 22:50:49 +00:00
Commit graph

1971 commits

Author SHA1 Message Date
aszlig 0ccf34039c
xorg.mxfontscale: Fix segfault with some fonts.
The update to version 1.1.2 in 9c22c1b introduces a segfault when
mkfontscale is processing fonts where the family name is missing.

Applies a patch from Stefan Dirsch <sndirsch@suse.com> to be found at:

https://bugs.freedesktop.org/show_bug.cgi?id=89409

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-03-11 16:57:21 +01:00
Vladimír Čunát 6c20e1d0bd xf86-video-vmware: drop patch included in update 2015-03-09 15:55:28 +01:00
Vladimír Čunát a3e0ee10e5 xf86-video-vmware: update 2015-03-09 15:55:23 +01:00
Vladimír Čunát 9c22c1b3d7 xorg: update various modules 2015-03-09 15:55:23 +01:00
William A. Kennington III b8d5a9b689 Merge pull request #6683 from unaizalakain/influxdb0.8.3
Bump InfluxDB to 0.8.3
2015-03-08 16:06:12 -07:00
Michael Raskin 09e74005b0 update nginx unstable 2015-03-09 01:03:01 +03:00
William A. Kennington III c410664d8b mongodb: 2.6.7 -> 2.6.8 2015-03-06 14:11:45 -08:00
Eelco Dolstra f72ae4da79 samba4: Fix evaluation
http://hydra.nixos.org/build/20173661
2015-03-06 14:07:45 +01:00
Unai Zalakain bf286c587b Bump InfluxDB to 0.8.3
- Prevents the automatic creation of shards that was causing too many shards
  being created when used with grafana.
- It's the most recent version that allows updating from 0.7
2015-03-05 19:26:49 +00:00
William A. Kennington III 936fdc7b68 samba4: 4.1.17 -> 4.2.0 YOLO 2015-03-04 17:17:26 -08:00
Arseniy Seroka 7ce77b5752 slurm: add pkg 2015-03-02 22:10:58 +03:00
koral f1e615f6df bind: 9.9.5-W1 -> 9.10.2 + added rndc key 2015-03-01 20:02:09 +00:00
Jaka Hudoklin 4129886f2e Merge pull request #6320 from j-keck/pg9xx
postgresql: Update to 9.0.19, 9.1.15, 9.2.10, 9.3.6, 9.4.1
2015-02-28 12:31:00 +01:00
lethalman dd8c7afcf0 Merge pull request #6565 from rushmorem/cassandra-2.0
Add cassandra 2.0
2015-02-26 11:52:36 +01:00
rushmorem 925f5798f5 Add cassandra 2.0
According to the project website (http://cassandra.apache.org)
version 2.0 is the most stable version. It's the one that's
recommended if you are already in production or going into
production soon.

Cassandra 2.0 is also the version that's officially supported
by Titan (http://thinkaurelius.github.io/titan), a distributed
graph database that uses cassandra as one of it's backends.
2015-02-26 12:38:53 +02:00
lethalman d791335ac2 Merge pull request #6518 from ehmry/u9fs
U9fs
2015-02-26 09:41:18 +01:00
William A. Kennington III b866da6826 consul: Remove dependency on go-deps 2015-02-25 15:07:10 -08:00
William A. Kennington III 961ea0f492 mongodb: Support boost 1.57 2015-02-25 11:28:42 -08:00
William A. Kennington III 9240070334 consul: Update to 0.5.0 and consul_template: 0.7.0 2015-02-24 18:32:58 -08:00
Alexander V. Nikolaev 279d5af119 Proper default path for XKB config files 2015-02-24 21:38:30 +02:00
Eelco Dolstra b1ec8e6c64 apache-httpd: Update to 2.4.12
CVE-2014-3583, CVE-2014-3581, CVE-2014-8109, CVE-2013-5704.
2015-02-24 16:10:55 +01:00
Eelco Dolstra 1dd423e651 samba: Update to 3.6.25, 4.1.17
CVE-2015-0240, CVE-2014-0178
2015-02-23 17:00:08 +01:00
Tobias Geerinckx-Rice dcc61f856c cassandra 2.1.2 -> 2.1.3 2015-02-23 01:44:20 +01:00
Emery Hemingway 3f02885d06 u9fs: initial package 2015-02-22 12:13:14 -05:00
Robert Scott 4147050550 add a (slightly naive) packaging of osrm-backend and its missing dependencies 2015-02-22 14:34:24 +00:00
Arseniy Seroka f54a3a462e Merge pull request #6489 from benley/mesos-dns
New package: mesos-dns
2015-02-22 00:26:20 +03:00
Arseniy Seroka cbac300134 Merge pull request #6464 from suvash/add-mosquitto-broker
Add Mosquitto MQTT server package
2015-02-22 00:25:14 +03:00
Sander van der Burg 382f175f10 ejabberd: fix problem with missing shell while loading a backup 2015-02-21 16:08:55 +00:00
Suvash Thapaliya 81588746aa Add Mosquitto MQTT server package
as of now it is just built and copied to the right place so that
the server can be run.  hopefully i will be tweaking with the
configuration files in the future and tweak this a bit more
2015-02-21 11:38:51 +01:00
Benjamin Staffin d382667537 New package: mesos-dns 2015-02-20 17:11:49 -08:00
Rickard Nilsson 0fbe589331 elasticsearch: Update from 1.4.3 to 1.4.4 2015-02-20 12:07:31 +01:00
Rob Vermaas e1f08578aa elasticsearch: update from 1.4.2 to 1.4.3, potentially fixes CVE-2015-1427 2015-02-20 10:55:10 +00:00
tv 86cb16965a exim: add version 4.85 incl. nixos module 2015-02-20 10:49:15 +01:00
Arseniy Seroka f5ee15d694 Merge pull request #6453 from k0ral/prosody
prosody: added luaevent dependency
2015-02-19 23:42:01 +03:00
koral a57ec23d55 prosody: added luaevent dependency. 2015-02-19 21:07:23 +01:00
Nikolay Amiantov aa2fd491ad rpcbind: update 2015-02-18 19:00:54 +03:00
lethalman ee612198e7 Merge pull request #6400 from puffnfresh/package/consul-template
Add consul-template package
2015-02-18 15:29:42 +01:00
Brian McKenna 69e75d0bfb Add consul-template package 2015-02-17 11:19:14 -07:00
Peter Simons 600135bba5 Merge remote-tracking branch 'master' into staging. 2015-02-13 22:17:12 +01:00
Pascal Wittmann d7b01c8526 Merge pull request #6325 from k0ral/opensmtpd
opensmtpd: 5.4.2p1 -> 5.4.4p1
2015-02-13 13:28:04 +00:00
koral 3bc7dfdf22 opensmtpd: 5.4.2p1 -> 5.4.4p1 2015-02-13 12:38:21 +01:00
lethalman 51a7277fac Merge pull request #6312 from k0ral/sslh
sslh: added libwrap support + improved nixos module.
2015-02-13 10:03:48 +01:00
j-keck 1c45287baf postgresql: Update to 9.0.19, 9.1.15, 9.2.10, 9.3.6, 9.4.1 2015-02-12 20:38:35 +01:00
Vladimír Čunát cf1550cbbf xorg-server: security+bugfix, including CVE-2015-0255
Tested briefly against 14.12.
2015-02-12 20:15:16 +01:00
Jaka Hudoklin 36e7a61dde Merge pull request #6222 from offlinehacker/limesurvey
add limesurvey package and nixos module
2015-02-12 18:07:42 +00:00
koral cb153cfca3 sslh: added libwrap support + improved nixos module. 2015-02-12 13:21:36 +01:00
Shea Levy 127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
2015-02-11 19:37:22 -05:00
lethalman 77f160e467 Merge pull request #5867 from berdario/redis3
Add redis-3.0.0-rc2
2015-02-11 16:50:59 +01:00
berdario ef15f769fe redis3.0.0-rc3 2015-02-11 14:24:27 +00:00
lethalman 93ebaafabe Merge pull request #6170 from k0ral/sslh
New sslh module
2015-02-10 11:17:56 +01:00
Daniel Peebles d49405a5ab Fix broken URL
Fix #6219, but no longer uses the mirrors. They probably need updating
2015-02-09 23:26:20 -05:00
Mateusz Kowalczyk 9dbfac7ece mpd: update to 0.19.9 2015-02-09 11:49:12 +00:00
William A. Kennington III 5a1089d024 Merge pull request #6245 from edwtjo/samba-collate-urls
fetchurl: collate samba project urls into a mirror
2015-02-08 13:38:01 -08:00
Edward Tjörnhammar 33a8a51657 fetchurl: collate samba project urls into a mirror 2015-02-08 22:29:27 +01:00
Eric Seidel e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Jaka Hudoklin 41ae4d1af9 add limesurvey package and nixos module 2015-02-07 23:18:51 +01:00
Jaka Hudoklin 674a6dd8fb Add consul alerts 2015-02-07 22:03:23 +01:00
lethalman 8b236f2daf Merge pull request #6119 from lethalman/go
Go packages, buildGoPackage
2015-02-07 21:30:30 +01:00
William A. Kennington III 760699aea9 mariadb: 10.0.15 -> 10.0.16 2015-02-06 12:59:38 -08:00
William A. Kennington III 9121483792 mongodb: 2.6.6 -> 2.6.7 2015-02-06 12:53:10 -08:00
William A. Kennington III 07bf8ad03e samba4: Add libbsd for string manipulation functions 2015-02-05 14:21:03 -08:00
Luca Bruno 3f718a743d Add dontInstallSrc flag to buildGoPackage 2015-02-05 18:07:28 +01:00
Nikolay Amiantov f35568e705 Merge pull request #5277 from abbradar/uwsgi
Add uWSGI application server
2015-02-05 17:10:37 +03:00
koral 1439e72147 New sslh module. 2015-02-05 13:30:39 +01:00
Vladimír Čunát 100f4a4660 samba4: security update, CVE-2014-8143
Note: samba4_light fails just as before.
CC maintainer @wkennington.
2015-02-05 12:08:01 +01:00
Vladimír Čunát 1982ac0b65 xorg.xinit: fix on Linux after #6160 2015-02-05 11:09:14 +01:00
Luca Bruno d1b3874733 Port influxdb-backup to buildGoPackage 2015-02-05 10:55:50 +01:00
Eric Seidel 7f7482b6bd fix xorgserver / xquartz on darwin 2015-02-04 15:14:36 -08:00
Luca Bruno 7cd816e8da Port nsq to buildGoPackage 2015-02-04 19:03:01 +01:00
Rickard Nilsson 57d71cf8d2 More download mirrors for samba URLs 2015-02-04 17:38:39 +01:00
Rickard Nilsson 100cc6b425 samba: Add download mirror 2015-02-04 16:28:48 +01:00
Luca Bruno ee90577704 Port serfdom to buildGoPackage 2015-02-04 15:23:52 +01:00
Luca Bruno a20460462d Port etcd to buildGoPackage 2015-02-04 14:55:40 +01:00
Luca Bruno df097fe2c3 Fix and port bosun and scollector to buildGoPackage 2015-02-04 13:41:31 +01:00
Domen Kožar cb6706c22f Remove Varnish 2.1.5
Last release was in 2010, has vulns CVE-2013-4484, cc @garbas
2015-02-04 11:53:22 +01:00
Domen Kožar 98a480363c varnish: 3.0.5 -> 3.0.6 2015-02-04 11:51:57 +01:00
Domen Kožar ee74e1a055 solr: 4.10.2 -> 4.10.3, CVE-2014-3628
(cherry picked from commit 4fa25ee93a)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-02-04 11:48:28 +01:00
Shea Levy df430ab2ea Fix imake on darwin.
Taken from joelteon/nixpkgs@6b3f7e6fb0

Original author Mike Sperber <sperber@deinprogramm.de>
2015-02-04 10:00:50 +00:00
Peter Simons d034aa11ee Merge pull request #6121 from boothead/kafka
Kafka and c libraries for kafka and zookeeper
2015-02-03 20:17:22 +01:00
lethalman c6951f5420 Merge pull request #6057 from victoredwardocallaghan/ircdHybrid
ircdHybrid: update from 7.2.3 to 8.2.2
2015-02-03 13:34:43 +01:00
Ben Ford b34a1cc248 Add a kafka package 2015-02-03 08:46:25 +00:00
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
William A. Kennington III acbf8eb561 unifi: 3.2.7 -> 3.2.10 2015-02-02 18:03:23 -08:00
Nikolay Amiantov f08abb15f1 uwsgi: add package 2015-02-02 22:23:30 +03:00
Edward O'Callaghan ae93c31dde ircdHybrid: update from 7.2.3 to 8.2.2
Potentially fixes CVE-2013-0238.

Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
2015-01-29 23:54:39 +11:00
Ragnar Dahlén 736764afee apache-kafka: New package for Apache Kafka 2015-01-29 11:10:12 +00:00
Domen Kožar 2d51fe4005 Merge pull request #6031 from offlinehacker/pkgs/influxdb-backup/add
Add influxdb-backup
2015-01-28 22:41:21 +01:00
Jaka Hudoklin 9eb3b108e8 Add influxdb-backup 2015-01-28 16:28:31 +01:00
Eelco Dolstra 6f8fad2253 Remove executable bits from non-executable files 2015-01-27 18:54:38 +01:00
Peter Simons e3639c03f2 mailman: update from 2.1.17 to 2.1.18 2015-01-27 14:04:54 +01:00
Jaka Hudoklin 4631ea8ed9 rabbitmq: update 3.3.5 -> 3.4.3 2015-01-26 02:09:04 +01:00
Dario Bertini 687e83156c
Rename redis3 2015-01-24 10:40:04 +00:00
Mateusz Kowalczyk 37f1938f5c mpd: update to version 19.8 2015-01-23 19:41:28 +00:00
Charles Strahan 8d49e87dec Merge pull request #4677 from cstrahan/pleasant-ruby
Pleasant ruby
2015-01-21 23:27:38 -05:00
Charles Strahan 8085f088cb ruby: exorcise the last few remaining rubyPackages 2015-01-21 22:23:37 -05:00
Charles Strahan 317d78d145 consule: use new bundlerEnv 2015-01-21 20:33:19 -05:00
Matej Cotman 3ed3977166 owncloud: make .htaccess available 2015-01-21 22:49:22 +01:00
Matej Cotman 6fdca55e8f owncloud: add package 2015-01-21 22:49:22 +01:00
Rickard Nilsson c7c917dfff nginx: Add set-misc-nginx-module 2015-01-21 12:38:34 +01:00
Charles Strahan dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
Benjamin Staffin e1f2da5314 Riemann: update to 0.2.8
Change-Id: I42b8e5f1341df826e8424141e9f9623e60b63767
2015-01-20 14:37:28 -05:00
Georges Dubus 0c2271c579 Merge pull request #5868 from berdario/redis
Update redis to 2.8.19
2015-01-20 16:16:52 +01:00
Kurt Dietrich f101f632b7 Add game-music-emu, a decoder plugin for mpd (close #5431)
@vcunat: nitpicks and add meta.license.
2015-01-20 16:08:01 +01:00
Dario Bertini a010daa8e3 Add redis-3.0.0-rc2 2015-01-20 13:42:48 +00:00
Dario Bertini 0919d6322b
Update redis to 2.8.19 2015-01-20 10:56:53 +00:00
lethalman 5e7501cd41 Merge pull request #5864 from nckx/cassandra
cassandra 2.1.0 -> 2.1.2
2015-01-20 10:57:00 +01:00
Tobias Geerinckx-Rice f02ced85c6 cassandra 2.1.0 -> 2.1.2
The old tarball was gone. I'll maintain it while I use it.
2015-01-20 10:28:26 +01:00
Peter Simons ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
wmertens e5703d21a7 Fix glibclocales reference
Environment is auto-added if supported on the platform
2015-01-19 14:10:45 +01:00
Bjørn Forsman 412cb5a3a2 munin: remove /usr/{bin,sbin}/ references from plugins
Instead, run things out of $PATH.

Fixes errors like these (on NixOS):
  munin-available-plugins/.mysql_slowqueries-wrapped: line 67: /usr/bin/printf: No such file or directory

(Basically, this unbreaks some plugins.)
2015-01-18 14:39:57 +01:00
Domen Kožar 48bae0e685 Merge pull request #5821 from eduarrrd/pshs
pshs: 0.2.5 -> 0.2.6
2015-01-18 10:32:50 +01:00
Eduard Bachmakov 2a338357f3 pshs: 0.2.5 -> 0.2.6 2015-01-17 21:00:41 -05:00
Michael Raskin a910aa77fb Add Squid 3.5 2015-01-18 01:58:20 +03:00
Domen Kožar c222352cf8 Merge pull request #5795 from pmahoney/skarnet-2015-01-14
Skarnet release 2015-01-14
2015-01-17 15:21:27 +01:00
Vincent Laporte 4361a7a597 couchdb: fix build 2015-01-16 08:51:22 +01:00
Patrick Mahoney 50c746f983 s6: update to 2.0.1.0 2015-01-15 16:10:07 -06:00
Eric Seidel f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Eduard Bachmakov f9a5ad039b Add package pshs-0.2.5
Announcement blog post:
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/
2015-01-14 22:56:54 -05:00
Pascal Wittmann a15198e844 squids.latest: update from 3.4.9. to 3.4.11 2015-01-15 00:54:26 +01:00
Ludovic Courtès 41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
aszlig c5354fafce
lighttpd: Fix building with magnet support.
Doesn't build with LUA 5.2, so lets explicitly set LUA 5.1 as a
dependency.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-13 08:37:56 +01:00
vbgl 0b09d52085 Merge pull request #5693 from benmos/riemann-0.2.7
Upgrading Riemann 0.26 -> 0.27
2015-01-10 17:06:10 +01:00
Ben Moseley b7d72dbf5b Upgrading Riemann 0.26 -> 0.27 2015-01-10 15:17:46 +00:00
William A. Kennington III db62c43a45 389-ds-base: Fix perl scripts 2015-01-09 15:01:30 -08:00
William A. Kennington III fe9529ae3f 389-ds-base: Fix build 2015-01-09 11:05:31 -08:00
William A. Kennington III 90a641310c net-snmp: Don't propagate openssl as this may break builds
Instead, explicility specify openssl during configuration which forces
the builder to include -L${openssl}/lib whenever linking against
net-snmp libraries.
2015-01-09 10:40:29 -08:00
Rickard Nilsson 0dedcdf29d elasticsearch: Update from 1.3.4 to 1.4.2 2015-01-09 00:04:59 +01:00
Domen Kožar 1ee0ec97b7 Merge pull request #5618 from flosse/prosody-update
nixpkgs: prosody 0.9.6 -> 0.9.7
2015-01-08 01:52:50 +01:00
William A. Kennington III c82410eeda java: Normalize to the default jre / jdk 2015-01-07 14:55:41 -08:00
j-keck 021e557be3 postgresql: remove 9.4betaX
final version 9.4.0 added per commit: 73839ca
2015-01-07 13:59:38 +01:00
j-keck 356d05dbc0 postgresql: add version 9.4.0 2015-01-07 13:21:18 +01:00
Markus Kohlhase 6989736730 nixpkgs: prosody 0.9.6 -> 0.9.7 2015-01-07 09:55:22 +00:00
Jaka Hudoklin a6fd4673b0 Merge pull request #5555 from offlinehacker/pkgs/nginx/syslog_fix_rev
nginx: syslog extension, fix git revision
2015-01-05 13:25:00 +01:00
Oliver Charles 4092a7cdd6 bosun: Update to 20141215200935 2015-01-05 10:35:20 +00:00
William A. Kennington III b50a73cab3 samba: Fixes for build and paths 2015-01-03 21:45:16 -08:00
William A. Kennington III cc73af1d10 samba: Add version 4 as the default 2015-01-03 21:45:16 -08:00
Jaka Hudoklin 9e766dcc6b nginx: syslog extension, fix git revision 2015-01-03 20:08:33 +01:00
Michael Raskin 187646f071 Return proper 404 when path is missing 2015-01-03 16:56:05 +03:00
John Wiegley bff056703a xquartz: depend on font binaries instead of source 2015-01-03 07:53:08 -05:00
John Wiegley 7715e7e108 dovecot: conditionalize some dependencies for Linux 2015-01-03 07:53:08 -05:00
Michael Raskin d64160ec99 Add optional IPv6 support for nix-binary-cache 2015-01-03 03:05:26 +03:00
Cillian de Róiste e75f0a7f86 yaws: update from 1.98 to 1.99 2015-01-02 23:49:15 +01:00
Peter Simons 8235e8c544 Switch users of 'pandoc' to the lean version. 2015-01-02 14:56:24 +01:00
Kurt Dietrich 4e0160d296 Added jack support flag for mpd. 2015-01-01 14:45:23 -05:00
Peter Simons 37ae6de95d s6: don't depend on GNU Make 4.0
The website gives no indication that version 4.x is required to build
this package, and even it if were, then there should be an override in
all-packages.nix instead of referring to the 'gnumake40' attribute
directly in this expression.
2015-01-01 20:36:58 +01:00
Peter Simons 975e623e31 openafs-client: drop trailing whitespace 2015-01-01 18:07:32 +01:00
Peter Simons 628a10480f openafs-client: un-confuse Emacs syntax highlighting 2015-01-01 18:07:32 +01:00
Peter Simons c280024811 openafs-client: fix evaluation 2015-01-01 18:07:32 +01:00
Michael Raskin fdb785f4d1 Merge pull request #5453 from pmahoney/skarnet-2.0
Update skarnet.org software for 2.0 release.
2015-01-01 16:14:17 +03:00
William A. Kennington III cd833ea6dd kerberos: Disable on darwin 2015-01-01 00:07:49 -08:00
William A. Kennington III 400cd62cfc 389-ds-base: Add derivation 2014-12-31 23:57:51 -08:00
William A. Kennington III 30db6f177d net_snmp: 5.7.2.1 -> 5.7.3 2014-12-31 23:57:51 -08:00
Michael Raskin b51dec7b77 Nginx unstable: 1.7.8 -> 1.7.9 2014-12-31 20:53:58 +03:00
Charles Strahan 94dd4b9721 ruby: WIP 2014-12-30 21:05:00 -05:00
William A. Kennington III afeef240dc kerberos: Use default kerberos instead of krb5 2014-12-30 00:05:12 -08:00
Jaka Hudoklin 1b19b7a3bf Merge pull request #5491 from offlinehacker/cadvisor
Add cadvisor package and nixos module
2014-12-29 17:58:43 +01:00
Matej Cotman d28c65ff05 etcd: upgrade server and ctl 2014-12-29 01:55:40 +01:00
Charles Strahan 145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00
Jaka Hudoklin b232395a06 Add cadvisor 2014-12-28 20:20:38 +01:00
Austin Seipp 5eba046b5d nixpkgs: openresty 1.7.4.1rc2 -> 1.7.7.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-27 12:43:52 -06:00
Shea Levy 05edd656f6 Missed gcc refs 2014-12-26 12:28:15 -05:00
John Wiegley 28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Vladimír Čunát 0bc5228fd2 xorg.xf86-video-intel: maintenance update 2014-12-25 10:06:49 +01:00
Vladimír Čunát 081e5c8387 Merge #5061: add xwayland
Also resolve minor nitpicks -- *during* the merge commit.
2014-12-25 09:25:05 +01:00
Patrick Mahoney 26e74d8a3e Update skarnet.org software for 2.0 release.
New build system using configure script and GNU Make 4.0, and new
releases of the following using the new build system:

execline 2.0.0.0
s6 2.0.0.0
s6-dns 2.0.0.0
s6-linux-utils 2.0.0.0
s6-networking 2.0.0.0
s6-portable-utils 2.0.0.0
skalibs 2.0.0.0
2014-12-23 15:24:30 -06:00
Shea Levy 4e558732e7 Add newrelic-sysmond 2014-12-22 15:13:08 -05:00
Michael Raskin 90b05b8d0e Nginx-unstable: 1.7.7 → 1.7.8 2014-12-21 11:14:25 +03:00
Pascal Wittmann f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
Michael Raskin eff240d9d9 Fix missing paths 2014-12-20 21:49:02 +03:00
lethalman ce8b10ef59 Merge pull request #5320 from teh/hyperdex
Add hyperdex.
2014-12-19 10:47:44 +01:00
Valérian Galliat c09311b94c opensmtpd: fix homepage URL 2014-12-18 20:04:22 +01:00
Sebastián Bernardo Galkin 06e6d7def2 xorg-server: enable DRI3 (close #5381)
TEST needed. I tested on my NixOS Thinkpad with Optimus nvidia and intel
cards.  Testing in other architectures is needed.

This patch also improves the regular expressions that scan the build
configuration files to enable the building of a binary utility in
xf86-video-intel: intel-virtual-output. This utility is useful for some
Optimus laptops

DRI3 was added to xorg-server propagatedBuildInputs so now it's inherited
by several projects that can use it.
2014-12-18 18:17:42 +01:00
Eelco Dolstra d717fcc7b8 zabbix: Update to 1.8.22 2014-12-18 14:11:11 +01:00
Michael Raskin 6c91f23ca5 Try to defend against chroot paths in store matching derivation paths 2014-12-17 21:49:18 +03:00
Shea Levy 321e8227f0 Merge branch 'mysql-mirrors' of https://github.com/fmapfmapfmap/nixpkgs 2014-12-17 11:12:58 -05:00
Rob Vermaas f72c7e93ce icecast: update from 2.4.0 to 2.4.1, potentially fixes CVE-2014-9018 2014-12-17 15:49:48 +01:00
vi 0c49b2942e Added mirrors for MySQL. 2014-12-17 11:14:46 +00:00
William A. Kennington III 64d471073f mongodb: 2.6.5 -> 2.6.6 2014-12-16 15:18:09 -08:00
Vladimír Čunát 84d6debf46 xorg-server: security update to RC1 of 1.16.3
Close #5292. There are almost no other changes since 1.16.2
than fixing that CVE-2014-8092. See also:
http://www.x.org/wiki/Development/Security/Advisory-2014-12-09/
2014-12-16 19:28:42 +01:00
Tom Hunger 013bd9247d Add hyperdex. 2014-12-15 10:27:00 +00:00
Domen Kožar 27281f660c fix builds for rest of kernel modules on 3.18 2014-12-11 02:03:43 +01:00
Mateusz Kowalczyk 534bdc3753 mpd: update to 0.19.6 2014-12-10 07:36:17 +00:00
Domen Kožar 557114628b mariadb: 10.0.14 -> 10.0.15 2014-12-09 11:29:16 +01:00
Domen Kožar 4aa3eec330 Merge branch 'master' into staging
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
2014-12-07 14:02:48 +01:00
Jaka Hudoklin ad4ad11fbc fleet: update to 0.9.0 2014-12-07 14:01:02 +01:00
Bjørn Forsman 289ec3b5aa html-tidy: align attrname with pkgname
htmlTidy => html-tidy. Keep copy of old attribute for backward
compatibility.
2014-12-06 17:01:05 +01:00
Oliver Charles bcb9f0853c bosun: Now builds on all Unix platforms 2014-12-05 11:43:58 +00:00
Oliver Charles e56a8df827 scollector: Update to 20141204222654 2014-12-05 11:39:56 +00:00
Oliver Charles 66d234917a bosun: Update to 2014120422265 2014-12-05 11:36:48 +00:00
Mateusz Kowalczyk 4d57b0645d mpd: update from 0.19.4 to 0.19.5 2014-12-03 16:56:44 +00:00
Vladimír Čunát ea557c8fd1 xorg xf86-input-evdev: update and add needed inputs 2014-12-03 13:26:32 +01:00
Domen Kožar 7f021fe566 munin: 2.0.21 -> 2.0.25 2014-11-30 20:42:06 +01:00
Jaka Hudoklin bd32da69bc Merge pull request #5088 from offlinehacker/nixos/kubernetes
nixos: add kubernetes module
2014-11-29 16:44:42 +01:00
Jaka Hudoklin c35844aa2d etcd: update to 0.5.0-alpha.4 2014-11-29 02:27:25 +01:00
Vladimír Čunát ea1dd9fd4a xorg: revert to older xf86-input-evdev for now
How could I forget to test to build it at least :-/
2014-11-28 22:04:39 +01:00
Vladimír Čunát 442cad9cbd xorg: update some modules 2014-11-28 20:42:07 +01:00
Patrick Mahoney cf5f282940 Consolidate conf-compile steps for skarnet.org pkgs. 2014-11-28 13:10:37 -06:00
Vladimír Čunát cbd2305d4d Merge branch 'master' into staging 2014-11-28 18:59:07 +01:00
Vladimír Čunát 06c6d4696d *: fix builds by disregarding warning from new glibc
Also, in case of collectd, the -lgcc_s shouldn't be needed anymore,
as the library is in ${glibc}/lib/ now, which is practically always on RPATH.

In case of seyren it was some stdenv change uncovering the mistake of
putting src into buildInputs.
2014-11-28 18:42:03 +01:00
Oliver Charles f2e2ab6231 Bosun only builds on x86_64-linux
Reported upstream at https://github.com/bosun-monitor/bosun/issues/427
2014-11-27 12:14:38 +00:00
Vladimír Čunát abcb355453 restund, openssh_hpn: mark as broken 2014-11-27 01:19:24 +01:00
Vladimír Čunát b5ff06eda4 Merge branch 'master' into staging 2014-11-26 21:48:26 +01:00
Mathijs Kwik a5dafe7746 rethinkdb: upgrade to 1.15.2 2014-11-26 14:30:19 +01:00
Vladimír Čunát a9bad25ffe Merge branch 'master' into staging 2014-11-24 22:14:25 +01:00
Oliver Charles 9cab0e1b8a Add meta information to hbase, bosun, scollector, opentsdb 2014-11-24 14:40:48 +00:00
Oliver Charles 5a8d5f3094 bosun: Update to 20141119233013 2014-11-24 14:40:48 +00:00
Oliver Charles bc8fd69fe8 New packages: bosun and scollector 2014-11-24 14:40:47 +00:00
Oliver Charles 8964667bcd hbase: New package and NixOS module 2014-11-24 14:40:47 +00:00
William A. Kennington III b4c3eadd08 unifi: 3.2.1 -> 3.2.7 2014-11-24 00:06:07 -08:00
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