3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2394 commits

Author SHA1 Message Date
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
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
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 4a830de032)
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