Tuomas Tynkkynen 0dbfb0fc48 Merge commit 'bd6e40c' from staging into master ...

Major changes being pulled in:

- mesa: maintenance 12.0.1 -> 12.0.2
- texlive: 2015 -> 2016

2016-09-10 23:23:44 +03:00

..

applications

mpv: 0.19.0 -> 0.20.0 (#18493)

2016-09-10 21:56:49 +02:00

build-support

nixBufferBuilders.withPackages: Make more legible, special-case proof-general.

2016-09-05 17:55:49 -04:00

data

Merge #18400: shared-mime-info: 1.5 -> 1.7

2016-09-10 11:56:22 +02:00

desktops

evolution: improve out-of-gnome use

2016-09-08 14:05:38 +02:00

development

Merge commit 'bd6e40c' from staging into master

2016-09-10 23:23:44 +03:00

games

mars: Fix build caused by missing GL/glu.h import

2016-09-09 11:28:03 +02:00

misc

uboot: Fix build

2016-09-08 02:37:11 +03:00

os-specific

grsecurity: 4.7.2-201608312326 -> 4.7.3-201609072139

2016-09-10 17:06:42 +02:00

servers

net-snmp: cosmetic fix for syntax highlighting in Emacs

2016-09-10 13:05:59 +02:00

shells

Merge branch 'master' into staging

2016-08-27 23:54:54 +01:00

stdenv

stdenv: leave SSL_CERT_FILE in shells (#15571)

2016-09-01 20:50:08 +02:00

test

…

tools

Merge #16391: texlive: 2015 -> 2016

2016-09-10 12:04:25 +02:00

top-level

Merge commit 'bd6e40c' from staging into master

2016-09-10 23:23:44 +03:00