3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2000 commits

Author SHA1 Message Date
William A. Kennington III e5bf20a6c6 Merge branch 'master' into staging 2015-05-29 14:52:51 -07:00
William A. Kennington III b9a366e5c4 Fix typo 2015-05-29 14:35:23 -07:00
William A. Kennington III b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
William A. Kennington III cd52c04456 Fix more ca-bundle paths 2015-05-29 14:26:32 -07:00
Pascal Wittmann 84208c3d00 mysql55: update from 5.5.42 to 5.5.43 2015-05-29 20:52:02 +02:00
William A. Kennington III 9f0da5315b Fix krb5 reference 2015-05-29 10:25:32 -07:00
Pascal Wittmann 27ffee3631 owncloud: update from 7.0.4 to 7.0.5 (fixes CVE-2015-3012 and CVE-2014-9716) 2015-05-29 13:14:44 +02:00
Tobias Geerinckx-Rice 158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Florian Friesdorf 447adb305f cygwin: mysql patches 2015-05-28 10:53:35 +02:00
Dan Peebles 4d12ea8311 Add micro-httpd package 2015-05-28 03:16:46 +00:00
Tobias Geerinckx-Rice b2d7f4b1ba Use common licence attributes from lib/licenses.nix
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Vladimír Čunát 710df5bb78 Merge master into staging
It contains some mass-rebuild stuff as well,
so best push the changes to staging, too.
2015-05-27 20:47:23 +02:00
Vladimír Čunát edeab75913 xcompmgr: generate along with xorg stuff
Also a minor update.
/cc maintainer @astsmtl.
2015-05-26 20:06:53 +02:00
Vladimír Čunát 0e270def52 xorg.x11perf: larger update
Seems to run fine.
2015-05-26 20:06:52 +02:00
Vladimír Čunát 471a2a7ee7 xorg {xorg-docs,kbproto}: minor updates 2015-05-26 20:06:52 +02:00
Vladimír Čunát e5fa9ab0fd xlsfonts: generate along with xorg stuff
Also a minor update.
/cc maintainer @viric.
2015-05-26 20:06:51 +02:00
Vladimír Čunát 688b4ca5db xorg: add xmag and xgc apps
Tested very briefly.
2015-05-26 20:06:51 +02:00
Vladimír Čunát 1a13909173 xorg: minor updates of apps 2015-05-26 20:06:50 +02:00
Vladimír Čunát 6bddcbda8a xorg: maintenance updates of libs 2015-05-26 20:06:50 +02:00
Vladimír Čunát 3287103b00 xorg: add libXpresent and xcb-util-errors 2015-05-26 20:06:48 +02:00
Rickard Nilsson a92271f195 lua-nginx-module: Update from 0.9.15 to 0.9.16rc1
This fixes the build that has been broken since nginx was bumped to 1.8.0
2015-05-26 08:05:26 +02:00
Arseniy Seroka 54be459b7f Merge pull request #7988 from johbo/fix-mod-python
mod_python: Avoid that git is called to generate a version
2015-05-25 21:23:35 +03:00
Johannes Bornhold 2ed4587b61 mod_python: Avoid that git is called to generate a version
This failed when building mod_python and resulted in a broken
value being included in the file "version.py".
2015-05-25 18:24:22 +02:00
Arseniy Seroka 054295210c Merge pull request #7978 from benley/prometheus
More Prometheus helpers: prom2json, prometheus-mysqld-exporter, prometheus-collectd-exporter
2015-05-25 01:52:49 +03:00
William A. Kennington III 9f70b1ab31 bind: Add propagatedBuildInputs 2015-05-24 15:01:21 -07:00
Benjamin Staffin d3fe5487ad New package: prometheus-collectd-exporter 2015-05-24 14:33:39 -07:00
Vladimír Čunát 34c9d898da xorg: update randr 2015-05-24 23:28:41 +02:00
Vladimír Čunát 3c5b83262b xorg: update cirrus and libinput drivers 2015-05-24 23:26:07 +02:00
Vladimír Čunát 3115d18c53 xorg: update drivers that seem useless 2015-05-24 23:10:52 +02:00
Benjamin Staffin af142824cb New package: prometheus-mysqld-exporter 2015-05-24 14:08:16 -07:00
Benjamin Staffin adf59e7110 New package: prom2json 2015-05-24 14:08:16 -07:00
William A. Kennington III 1592c81d54 redis: 3.0.0-rc3 -> 3.0.1 2015-05-24 02:00:21 -07:00
William A. Kennington III 9b44fcf259 Merge pull request #7964 from benley/riemann-dash-0.2.11
riemann-dash: update to 0.2.11
2015-05-23 22:44:50 -07:00
William A. Kennington III 55636defbc Merge pull request #7961 from benley/prometheus
Update Prometheus and its various helper packages
2015-05-23 22:44:21 -07:00
William A. Kennington III e8392bb33f postgres: Fix maintainers 2015-05-23 22:26:23 -07:00
William A. Kennington III bb6ac771c4 dnsutils: Add smaller derivation of bind 2015-05-23 22:26:23 -07:00
William A. Kennington III c6dea6fea6 Merge pull request #7962 from benley/riemann-0.2.9
riemann: update to 0.2.9
2015-05-23 20:41:41 -07:00
William A. Kennington III e74b5704a8 bind: Enable parallel building 2015-05-23 20:07:51 -07:00
William A. Kennington III adcf1c7a90 postgresql: Fix sha256 for 9.3.7 2015-05-23 19:39:21 -07:00
William A. Kennington III 6775c0696f postgresql: 9.4.1 -> 9.4.2 2015-05-23 19:38:34 -07:00
William A. Kennington III 5486c08dc2 postgresql: 9.3.6 -> 9.3.7 2015-05-23 19:34:28 -07:00
William A. Kennington III 7174391e5b postgresql: Consolidate patches 2015-05-23 19:34:00 -07:00
William A. Kennington III d9efd0676f postgresql: Correct propagated readline 2015-05-23 19:30:30 -07:00
William A. Kennington III 601e713bb8 postgresql: 9.2.10 -> 9.2.11 2015-05-23 19:18:26 -07:00
William A. Kennington III e9d0c395d1 postgresql: Add myself as maintainer 2015-05-23 19:07:36 -07:00
William A. Kennington III 243dc10b0b postgresql: Add schema version 2015-05-23 19:07:14 -07:00
William A. Kennington III be94d4bc25 postgresql: 9.1.15 -> 9.1.16 2015-05-23 19:07:14 -07:00
William A. Kennington III 8c99f2e3d6 postgresql: 9.0.19 -> 9.0.20 2015-05-23 19:07:13 -07:00
William A. Kennington III 1bb67e514b postgresql: Refactor 8.4 into generic 2015-05-23 19:07:13 -07:00
William A. Kennington III 9c6d4533d0 mariadb: 10.0.18 -> 10.0.19 2015-05-23 19:07:13 -07:00