BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
75792 commits 1 branch 0 tags 3.8 GiB
Commit graph

2516 commits

Author SHA1 Message Date
Rodney Lorrimar
96f81e3be5 longview: Linode metrics collector 
Longview is a perl script used for sending server metrics to Linode
virtual private server hosting.
 2015-11-22 12:37:00 +00:00
Shea Levy
db995a95ee Merge remote-tracking branch 'origin/master' into staging 2015-11-21 07:46:55 -05:00
Jude Taylor
852988348d Merge branch 'staging' of https://github.com/NixOS/nixpkgs into sandbox-profiles 2015-11-20 19:58:46 -08:00
Bob van der Linden
f65ebd022d darkhttpd: init at 1.11 2015-11-19 14:51:14 +01:00
goibhniu
e9c31d9368 Merge pull request #11034 from zimbatm/webfs-1.21 
webfs: init at 1.21
 2015-11-18 19:19:28 +01:00
William A. Kennington III
baf30718ca Merge branch 'master.upstream' into staging.upstream 2015-11-18 02:36:33 -08:00
William A. Kennington III
f9f3b47c72 xkbcomp: 1.3.0 -> 1.3.1 2015-11-18 02:36:18 -08:00
William A. Kennington III
4da7935a8e xinput: 1.6.1 -> 1.6.2 2015-11-18 02:36:18 -08:00
William A. Kennington III
b52f2f6401 xorg-server: 1.18.0 -> 1.17.4 
There were lots of issues with the proprietary nvidia driver on 352.63
and we don't yet have a proprietary AMD driver.
 2015-11-18 02:34:26 -08:00
Pascal Wittmann
c283a3da68 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-18 11:34:09 +01:00
William A. Kennington III
ee153a619a xorg: Fix hashes 2015-11-17 21:25:15 -08:00
William A. Kennington III
2e595e32f6 xf86-video-ati: 7.5.0 -> 7.6.1 2015-11-17 21:15:30 -08:00
William A. Kennington III
2792b9228c xf86-input-synaptics: 1.8.2 -> 1.8.3 2015-11-17 21:15:04 -08:00
William A. Kennington III
7a2283b08e xf86-input-libinput: 0.14.0 -> 0.15.0 2015-11-17 21:14:46 -08:00
William A. Kennington III
5b3bbd1ac1 xf86-input-evdev: 2.9.2 -> 2.10.0 2015-11-17 21:14:18 -08:00
William A. Kennington III
020f6cfadc xorg-server: 1.17.2 -> 1.18.0 2015-11-17 21:11:53 -08:00
Pascal Wittmann
7fd2796e99 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01:00
Jaka Hudoklin
be067811ff Merge pull request #11048 from offlinehacker/pkgs/influxdb/update_0.9.4 
influxdb: 0.8.3 -> 0.9.4, fix module
 2015-11-17 17:18:24 +01:00
Jaka Hudoklin
7955be7a82 Merge pull request #11051 from offlinehacker/pkgs/bosun/update_0.5.0 
bosun: 0.3.0 -> 0.5.0-alpha, udpate module
 2015-11-17 17:17:44 +01:00
Jaka Hudoklin
0667fe29c9 Merge pull request #11061 from offlinehacker/nixos/heapster/add 
heapster module: init
 2015-11-17 17:17:01 +01:00
Jaka Hudoklin
69a1b3977b Merge pull request #11055 from offlinehacker/pkgs/grafana/update_2.5.0 
grafana: 2.0.0-beta1 -> 2.5.0
 2015-11-17 17:14:23 +01:00
aszlig
d81fc427da
xf86-video-intel: 2015-11-13 -> 2015-11-14 
Fixes quite an annoying and reproducable memory leak when I was using
multiple heads. This is the fix in question:

http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=2d26643cab33a32847afaf13b50d326d09d58bf7

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-11-17 14:46:52 +01:00
Pascal Wittmann
743151e9f3 Merge pull request #11054 from makefu/acng_init 
apt-cacher-ng: init at 0.8.6
 2015-11-16 20:00:01 +01:00
zimbatm
6a0ed9361b webfs: init at 1.21 2015-11-16 17:29:40 +01:00
Jaka Hudoklin
15c76d17fe heapster: init at 3057a2c07061c8d9ffaf77e5442ffd7512ac0133 2015-11-16 16:58:09 +01:00
Jaka Hudoklin
abda14309f grafana: 2.0.0-beta1 -> 2.5.0 2015-11-16 14:59:16 +01:00
makefu
8db9408ac6 apt-cacher-ng: init at 0.8.6 2015-11-16 14:45:21 +01:00
Jaka Hudoklin
c8d1e900d6 bosun: 0.3.0 -> 0.5.0-alpha 2015-11-16 14:23:54 +01:00
Jaka Hudoklin
9c1943fb6f influxdb: 0.8.3 -> 0.9.4, fix module 2015-11-16 14:22:08 +01:00
Ryan Trinkle
5d4595621d mariadb: fix missing CoreServices framework dependency on darwin 2015-11-15 14:57:06 -05:00
William A. Kennington III
6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06"" 
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
 2015-11-14 12:32:51 -08:00
William A. Kennington III
9579c9ec7f Merge commit 'cb21b77' into master.upstream 
This is a partial merge of staging for builds which are working
 2015-11-13 15:53:10 -08:00
William A. Kennington III
64f31fbc35 xf86-video-intel: 2015-11-10 -> 2015-11-13 2015-11-13 10:37:27 -08:00
Arseniy Seroka
3087ef37bb Merge pull request #10807 from joachifm/fix-hyperdex-hashes 
hyperdex: blindly fix hashes of local dependencies
 2015-11-13 17:48:08 +03:00
Christoph Hrdinka
a4ea5e4e4b nsd: 4.13 -> 4.16 2015-11-12 14:51:47 +01:00
Vladimír Čunát
dd71ccef28 gatling: fix meta evaluation 
/cc maintainer @the-kenny.
 2015-11-11 08:31:56 +01:00
William A. Kennington III
bf985091d5 xf86-video-intel: 2015-07-22 -> 2015-11-10 2015-11-10 18:27:46 -08:00
William A. Kennington III
21ddfcaffa unifi: 4.7.5 -> 4.7.6 2015-11-10 16:44:52 -08:00
Moritz Ulrich
af73b4cc2e gatling: Init at 0.13. 2015-11-10 23:59:38 +01:00
Peter Simons
adb74ad2f9 Merge pull request #10620 from gebner/postfix-3.0.3 
postfix: 2.11.5 -> 3.0.3
 2015-11-08 18:10:26 +01:00
Arseniy Seroka
848d16ca75 Merge pull request #10883 from k0ral/mpd 
mpd: 0.19.9 -> 0.19.11
 2015-11-08 17:11:14 +03:00
koral
51c0dc06dd mpd: 0.19.9 -> 0.19.11 2015-11-08 11:59:17 +00:00
William A. Kennington III
a26c8e9b83 Merge branch 'master.upstream' into staging.upstream 2015-11-07 15:51:51 -08:00
aszlig
9846e69ae2
mariadb: 10.0.21 -> 10.0.22 
Fixes the following security vulnerabilities:

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4802
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4807
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4815
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4826
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4830
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4836
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4858
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4861
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4870
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4913
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-4792

Release notes can be found here:

https://mariadb.com/kb/en/mariadb/mariadb-10022-release-notes/

Detailled changelog:

https://mariadb.com/kb/en/mariadb/mariadb-10022-changelog/

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-11-06 16:10:23 +01:00
Domen Kožar
0a05adc711 Merge pull request #10056 from pmahoney/s6-rc 
s6-rc: new derivation
 2015-11-06 11:11:56 +01:00
William A. Kennington III
1e7aa4f17d Merge branch 'master.upstream' into staging.upstream 2015-11-05 18:30:11 -08:00
William A. Kennington III
97d215deba pulseaudio: 7.0 -> 7.1 2015-11-05 18:21:43 -08:00
William A. Kennington III
4251612faa Merge branch 'master.upstream' into staging.upstream 2015-11-04 01:00:48 -08:00
Joachim Fasting
2456dd0246 hyperdex: blindly fix hashes of local dependencies 
This patch blindly fixes the source archive checksums for the local dependencies
of hyperdex. I have not looked into why those hashes changed, but I have
verified that the hyperdex package now builds successfully.
 2015-11-03 15:22:50 +01:00
Nikolay Amiantov
9265cc58c3 Merge pull request #10474 from abbradar/nginx-pam-modules 
nginx: factor out modules into a separate file, add new "pam" module
 2015-11-02 01:05:54 +03:00
William A. Kennington III
dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Vladimír Čunát
4e1fdadd02 mariadb: fix non-Darwin builds after 86dae701 
I took care to get the same derivation as before that commit on Linux
and not to change derivation on Darwin.
 2015-10-30 09:29:02 +01:00
Jude Taylor
86dae70173 mariadb: fix multiple outputs on darwin 2015-10-29 12:52:30 -07:00
Lluís Batlle i Rossell
61c6597246 Bringing back eo symbols for xkb 
I port the patch for esperanto symbols removed in
1be2acd1317aadc8e1a08d17312e524fb5fc2a4300 to the current
xkeyboardconfig.

(cherry picked from commit 4a830de0323e34592a36dea660d9a3ec8348964e)
 2015-10-29 13:32:35 +01:00
Jude Taylor
e6bc23a801 Merge pull request #10603 from datakurre/datakurre-rabbitmq 
darwin: erlangR18 + rabbitmq_server: add needed inputs
 2015-10-28 17:23:11 -07:00
Jude Taylor
c749714170 clean up xquartz arguments 2015-10-28 13:56:13 -07:00
Jude Taylor
98395a07e9 mariadb: complete build on darwin 2015-10-28 13:34:53 -07:00
Domen Kožar
4355ef9e41 mailman: use python2.7 package dns 2015-10-28 18:23:17 +01:00
Domen Kožar
27d5fb07a0 pythonPackages{dns, dnspython}: merge 2015-10-28 18:20:43 +01:00
Sander van der Burg
b054207813 axis2: bump to version 1.6.3 2015-10-28 10:24:29 +00:00
Vladimír Čunát
40455f27c3 mariadb: build without snappy on 32-bit 
... to work around a build problem
https://mariadb.atlassian.net/browse/MDEV-9000

I took care not to cause a rebuild on 64-bit.
 2015-10-27 14:34:31 +01:00
Jude Taylor
5469e9c581 fix xquartz build 2015-10-26 18:37:05 -07:00
Jude Taylor
cf12f3e4d2 patch out system include in libAppleWM 2015-10-26 17:13:29 -07:00
Jude Taylor
2e29399993 update packages with new cf-private compatibility 2015-10-26 17:13:29 -07:00
Asko Soukka
3ea269a7e6 darwin: rabbitmq_server: add needed inputs for Darwin 2015-10-26 22:02:57 +02:00
Gabriel Ebner
929e734f19 postfix: 2.11.5 -> 3.0.3 2015-10-26 11:46:17 +01:00
Austin Seipp
0939e6f613 nixpkgs: plex 0.9.12.11.1406 -> 0.9.12.13.1464 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-10-25 06:32:19 -05:00
Aristid Breitkreuz
054a5ee9d9 update postgresql binaries 2015-10-25 02:39:01 +02:00
goibhniu
352a4e4a73 Merge pull request #10576 from simonvandel/tvheadend 
tvheadend: 4.0.6 -> 4.0.7
 2015-10-24 18:01:42 +02:00
Simon Vandel Sillesen
c62f051e5a tvheadend: 4.0.6 -> 4.0.7 
Also patches a file that would cause a runtime error otherwise
 2015-10-24 17:50:30 +02:00
Jude Taylor
f35f421d60 apache-httpd: add libiconv for darwin 2015-10-23 10:57:43 -07:00
Vladimír Čunát
4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
William A. Kennington III
491764afc0 samba: 4.3.0 -> 4.3.1 2015-10-21 21:49:10 -07:00
aszlig
f15420b0fe
thttpd: Fix SHA256 of the upstream tarball. 
It's a bit unfortunate to see this, but while looking online to download
the old version of the file I found that MacPorts and FreeBSD had the
same issue:

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=199562

I've checked the diff as well and found no big functional changes,
except a function rename, copyright updates and changed syslog
priorities:

https://bz-attachments.freebsd.org/attachment.cgi?id=155775

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-10-21 17:15:18 +02:00
Arseniy Seroka
77803f4cb7 Merge pull request #10505 from simonvandel/tvheadend-4-0-6 
tvheadend: 4.0.4 -> 4.0.6
 2015-10-21 16:18:15 +03:00
Simon Vandel Sillesen
d495ac2957 tvheadend: 4.0.4 -> 4.0.6 
Added a comment about network download, and cleaned it up a little
 2015-10-21 09:01:42 +02:00
Jude Taylor
68087185e3 rethinkdb: build on darwin 2015-10-19 18:40:55 -07:00
Hajo Möller
0baef5b806 asterisk: 13.3.2 -> 13.6.0 2015-10-19 19:05:41 +02:00
Tobias Geerinckx-Rice
e07faf00f0 cassandra 2.1.10 -> 2.1.11 2015-10-19 18:19:00 +02:00
Nikolay Amiantov
d2fc6e6a02 nginxModules.pam: init at 1.4 2015-10-19 16:46:09 +03:00
Nikolay Amiantov
9424238d14 nginx: factor out modules in a separate file 2015-10-19 16:46:02 +03:00
Eelco Dolstra
9a3276b4b3 Merge pull request #10463 from mayflower/update-apache-httpd 
apacheHttpd: 2.4.16 -> 2.4.17
 2015-10-19 11:00:55 +02:00
Vladimír Čunát
2755d2b241 xorg: adjust generator to work with other archive types 
In the end I didn't utilize it, but it shouldn't hurt.
 2015-10-19 10:08:16 +02:00
Vladimír Čunát
b6059b2c6a xorg: add three missing video drivers - chips, s3virge, xgi 
Only building was tested.
 2015-10-19 10:06:48 +02:00
Vladimír Čunát
ff94673659 xorg.xf86-video-sis: minor update 0.10.7 -> 0.10.8 2015-10-19 09:39:32 +02:00
Vladimír Čunát
801a843bdb xorg.xorg-server: use the generated expression 
... to avoid future surprises. Also add libunwind to deps.
I don't know why libxshmfence is no longer detected.
 2015-10-19 09:35:07 +02:00
Vladimír Čunát
15f27723b3 xorg.xf86-input-libinput: update 0.12.0 -> 0.14.0 2015-10-19 09:20:13 +02:00
Robert Irelan
678c81b74d xorg.xf86-video-ast: 0.98.0 -> 1.1.5 (close #10451) 
Fix failure of 0.98.0 to compile with NixOS 15.09 (due to referencing a
symbol `IOADDRESS` that has been removed from X.org drivers).
 2015-10-19 09:06:33 +02:00
William A. Kennington III
480b289f5b mongodb: 3.0.6 -> 3.0.7 
Use the vendored wiredtiger as the system one is not compatible
 2015-10-18 17:23:51 -07:00
Robin Gloster
8521bc097c apacheHttpd: 2.4.16 -> 2.4.17 2015-10-18 17:42:55 +00:00
William A. Kennington III
e58996cba1 mariadb: Add extra dependencies for 10.1 2015-10-17 14:14:34 -07:00
William A. Kennington III
2cfb8d11cf mariadb: 10.0.21 -> 10.1.8 
Also try enabling parallel building again to see if the issue was fixed.
 2015-10-17 13:46:08 -07:00
William A. Kennington III
8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00
Nikolay Amiantov
8dec927f46 uwsgi: 2.0.11.1 -> 2.0.11.2 2015-10-15 17:07:38 +03:00
goibhniu
d7c0612f4b Merge pull request #10049 from anderslundstedt/upgradeplex 
Upgrade plex to 0.9.12.11.1406
 2015-10-10 19:49:43 +02:00
Arseniy Seroka
9c61b4fe4d Merge pull request #10216 from offlinehacker/pkgs/rippled/0.29.0-hf1 
rippled: 0.28.1 -> 0.30.0-rc1
 2015-10-09 20:32:36 +03:00
Andrey Pavlov
d9e1d3f14b rabbitmq-server: 3.4.3 -> 3.5.6 2015-10-08 12:44:03 +03:00
Tobias Geerinckx-Rice
65bb240357 cassandra 2.1.9 -> 2.1.10 2015-10-08 01:42:46 +02:00
Eelco Dolstra
741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06" 
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
 2015-10-06 15:24:20 +02:00
Arseniy Seroka
2e3f646d1b Merge pull request #10225 from aespinosa/update-fleet 
fleet: 0.9.0 -> 0.11.5
 2015-10-05 02:47:57 +03:00
Jaka Hudoklin
a6c4c9df1f rippled: 0.28.1 -> 0.30.0-rc1 2015-10-04 22:44:13 +02:00
Gabriel Ebner
8fd982ec2b spamassassin: 3.4.0 -> 3.4.1 2015-10-04 17:26:12 +02:00
Allan Espinosa
7d3b92f6c1 fleet: 0.9.0 -> 0.11.5 2015-10-04 20:20:32 +09:00
Vladimír Čunát
f7d5210677 mysql55: remove lib/*.a, as probably noone needs it 
/cc #172.
 2015-10-03 11:24:17 +02:00
Peter Simons
3018739223 mini-httpd: update to version 1.5 2015-10-02 22:13:49 +02:00
William A. Kennington III
2ef6508c7f Merge branch 'master.upstream' into staging.post-15.06 2015-10-02 12:41:09 -07:00
Gabriel Ebner
0dfddc5a54 opensmtpd: support filters. 2015-10-02 13:01:50 +02:00
Gabriel Ebner
db18b6e828 opensmtpd-extras: init at 5.7.1 2015-10-02 13:01:47 +02:00
Gabriel Ebner
c5f2f2d814 opensmtpd: 5.4.5p1 -> 5.7.1p1 2015-10-02 13:01:43 +02:00
William A. Kennington III
98172435f7 Merge branch 'master.upstream' into staging.upstream 2015-10-01 10:43:44 -07:00
Thomas Strobel
e0d5b14ce4 neard: enable support for Secure Elements 2015-10-01 15:30:34 +02:00
Arseniy Seroka
b752952a33 Merge pull request #10132 from matthiasbeyer/update-jetty 
jetty: 5.1.4 -> 6.1.4
 2015-10-01 14:21:38 +03:00
William A. Kennington III
e7bb9e1023 Merge branch 'master.upstream' into staging.upstream 2015-09-30 13:26:04 -07:00
James ‘Twey’ Kay
1b5fdd1bc9 openfire: Fix JVM test 2015-09-30 16:39:09 +01:00
Thomas Strobel
cc29a6e788 neard: add sample applications 2015-09-30 16:10:16 +02:00
Tobias Geerinckx-Rice
c7c677bc7b p910nd: init at 0.97 2015-09-30 02:29:52 +02:00
William A. Kennington III
271972de0a Merge branch 'master.upstream' into staging.upstream 2015-09-29 15:54:33 -07:00
Jaka Hudoklin
ea4850ca64 Merge pull request #10023 from offlinehacker/pkgs/modsecurity/add 
modsecurity: add modsecurity, and create nginx plugin
 2015-09-30 00:19:38 +02:00
Thomas Strobel
8d7fba9b65 neard: init at 0.15-post-git-20510929 2015-09-29 17:54:26 +02:00
Matthias Beyer
e547393fac jetty: 5.1.4 -> 6.1.4 2015-09-29 10:41:26 +02:00
Jude Taylor
4f9ef9bbfb give xquartz impure deps to make it build 2015-09-28 14:45:45 -07:00
Charles Strahan
25e582c497 meteor: init at 1.2.0.1 
closes #10064
 2015-09-28 10:39:37 -04:00
Matthias Beyer
0f1620c887 taskserver: 1.0.0 -> 1.1.0 2015-09-27 13:13:11 +02:00
lethalman
3e4bbe048a Merge pull request #10038 from pmahoney/skarnet 
Skarnet updates
 2015-09-25 15:15:53 +02:00
Jaka Hudoklin
5d6500fee8 Merge pull request #10028 from itkovian/elasticsearch-1.7.2 
elasticsearch: 1.5.2 -> 1.7.2
 2015-09-25 11:10:10 +02:00
Jaka Hudoklin
0322596721 Merge pull request #10040 from maxxk/libmemcached-darwin 
libmemcached on darwin
 2015-09-25 11:09:23 +02:00
Anders Lundstedt
00244d0713 upgrade plex to 0.9.12.11.1406 2015-09-25 04:53:21 +02:00
Patrick Mahoney
d4e0b35f18 s6: move to tools/system 
Matches runit, a similar process supervisor.
 2015-09-24 20:18:03 -05:00
Patrick Mahoney
560674ae83 s6 2.1.3.0 -> 2.2.1.0 2015-09-24 20:13:22 -05:00
William A. Kennington III
83ac62eb5d pulseaudio: 6.0 -> 7.0 2015-09-24 16:33:57 -07:00
William A. Kennington III
0f85ef3982 unifi: 4.6.6 -> 4.7.5 2015-09-24 16:15:31 -07:00
Maxim Krivchikov
7216159cbe memcached: build on darwin 
Versions up to 1.4.24 are broken when building with clang:
https://code.google.com/p/memcached/issues/detail?id=409
 2015-09-24 23:06:22 +03:00
Andy Georges
cdf13a0a06 elasticsearch: 1.5.2 -> 1.7.2 2015-09-24 00:18:29 +02:00
William A. Kennington III
d3f4ba9d6f Merge branch 'master.upstream' into staging.upstream 2015-09-23 14:44:21 -07:00
William A. Kennington III
5cfe893cc4 Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream 
This is a partial commit from staging in an attempt to make merges
smaller.
 2015-09-23 14:35:36 -07:00
Jaka Hudoklin
46828582ab nginx: add support for modescurity 2015-09-23 20:35:28 +02:00
Vladimír Čunát
76ef7a93e3 Merge: xlibs and x11 attribute cleanup 
Frequently using multiple *almost* identical attributes is bad.
 2015-09-23 10:42:34 +02:00
Jude Taylor
76a6539829 work on making xquartz buildable in a pure environment 2015-09-22 16:27:51 -07:00
Hoang Xuan Phu
4ac4f2dcd9 nginx: add an option to build the stream module 2015-09-22 13:09:11 +08:00
Hoang Xuan Phu
942d2798c5 nginx: bump lua module to fix build error 
(https://github.com/openresty/lua-nginx-module/pull/500)
 2015-09-22 13:08:42 +08:00
William A. Kennington III
6e09223627 Merge branch 'master.upstream' into staging.upstream 2015-09-18 17:16:27 -07:00
William A. Kennington III
58a45a4459 samba: 4.2.3 -> 4.3.0 2015-09-18 14:52:51 -07:00
William A. Kennington III
37bba4ec2c mongodb: 3.0.5 -> 3.0.6 2015-09-18 14:52:51 -07:00
Jude Taylor
d78936131a preparation for being able to build xquartz 2015-09-17 16:11:18 -07:00
William A. Kennington III
ecd90e61cc bind: 9.10.2-P4 -> 9.10.3 2015-09-17 14:12:38 -07:00
Bjørn Forsman
0b9d83737c lighttpd: 1.4.35 -> 1.4.37 2015-09-16 07:46:34 +02:00
Austin Seipp
bab211893b nixpkgs: rethinkdb 2.0.4 -> 2.1.3 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-09-15 18:42:12 -05:00
William A. Kennington III
773b4deb7c Merge commit 'a6f6c0e' into master.upstream 
This is a partial merge of staging where we have up to date binaries for
all packages.
 2015-09-15 12:16:49 -07:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg 
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
 2015-09-15 12:54:34 +02:00
Vladimír Čunát
0c74f18e4c xlibs.xlibs: remove 
It was really ugly that `xlibs.xlibs` meant something else than `xlibs`,
especially when using `with xlibs`, such as in wine.
Also, now `xlibs` is the same as `xorg`.
 2015-09-15 11:59:33 +02:00