Tuomas Tynkkynen aba0b45b86 Merge remote-tracking branch 'upstream/master' into staging ...

Conflicts:
      pkgs/development/libraries/qt-5/5.7/qtbase/default.nix

2017-03-14 00:49:22 +02:00

..

admin

pepper: add 'pierrer' as a maintainer

2017-03-09 10:44:39 +01:00

archivers

unshield: 1.3 -> 1.4.2

2017-03-06 17:24:43 -05:00

audio

mpdris2: install locale files to correct location

2017-03-07 12:33:36 +01:00

backup

borgbackup: 1.0.9 -> 1.0.10

2017-03-05 21:14:59 +01:00

bluetooth

Remove kde4.bluedevil

2017-02-24 16:48:59 -06:00

bootloaders/refind

refind: refactorings

2016-09-01 14:51:32 +02:00

cd-dvd

dvdisaster: fix $out variable expansion (makeFlags)

2017-03-07 12:11:27 +01:00

compression

Merge remote-tracking branch 'upstream/master' into staging

2017-03-14 00:49:22 +02:00

filesystems

glusterfs: 3.9.1 -> 3.10.0

2017-03-09 18:47:38 +01:00

graphics

asymptote: 2.39 -> 2.40

2017-03-09 18:47:37 +01:00

inputmethods

fcitx: fix fcitx-qt5 attribute path

2017-03-03 08:54:32 +09:00

misc

Merge remote-tracking branch 'upstream/master' into staging

2017-03-14 00:49:22 +02:00

networking

Merge remote-tracking branch 'upstream/master' into staging

2017-03-14 00:49:22 +02:00

package-management

Update nixUnstable

2017-03-06 13:32:56 +00:00

security

Merge remote-tracking branch 'upstream/master' into staging

2017-03-14 00:49:22 +02:00

system

ipmiutil: 3.0.1 -> 3.0.2

2017-03-09 18:47:37 +01:00

text

ripgrep: install man-page

2017-03-10 07:12:16 +00:00

typesetting

fop: 1.1 -> 2.1

2017-02-28 23:29:31 +01:00

video

rtmpdump: 2015-01-15 -> 2015-12-30

2017-02-09 08:45:12 +01:00

virtualization

awless: 0.0.13 -> 0.0.14

2017-02-24 11:15:26 +08:00

X11

primus: fix if nvidia is not used

2017-03-08 23:10:43 +03:00