Commit Graph

2415 Commits

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