Commit Graph

685 Commits

Author SHA1 Message Date
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
Tobias Geerinckx-Rice
a2f98ef4ac clipgrab 3.5.2 -> 3.5.4 2015-11-13 22:06:10 +01:00
Pascal Wittmann
bc9ec42958 mkcast: init at 2015-03-13
newcast does not work due to
https://github.com/KeyboardFire/mkcast/issues/30

closes #6333
2015-11-11 20:05:03 +01:00
Domen Kožar
0d19f68d2b popcorntime: mark as broken 2015-11-09 19:44:17 +01:00
William A. Kennington III
a26c8e9b83 Merge branch 'master.upstream' into staging.upstream 2015-11-07 15:51:51 -08:00
Tobias Geerinckx-Rice
5a162cd068 clipgrab 3.5.1 -> 3.5.2 2015-11-06 04:02:01 +01:00
William A. Kennington III
2837a5e091 Merge branch 'master.upstream' into staging.upstream 2015-11-05 10:07:28 -08:00
Ilya Novoselov
398611fb6c vlc: added live555 dependency 2015-11-05 15:47:04 +01:00
William A. Kennington III
4251612faa Merge branch 'master.upstream' into staging.upstream 2015-11-04 01:00:48 -08:00
AndersonTorres
5aad97b90b mpv: 0.9.2 -> 0.12.0 2015-11-02 16:35:00 -02:00
Stéphane Jourdois
4532d88447 mkvtoolnix: darwin fixes 2015-10-31 22:01:05 +01:00
William A. Kennington III
dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Vincent Laporte
32267c25ce qarte: 2.3.0 -> 2.4.0 2015-10-28 08:22:51 +01:00
Arseniy Seroka
170c8e08d3 avidemux: 2.5.6 -> 2.6.9 2015-10-28 02:49:48 +03:00
Spencer Janssen
a3343c3ec3 kodiPlugins.genesis: 4.0.1 -> 5.1.3 2015-10-26 10:59:23 -05:00
Spencer Janssen
0e59efc7d9 kodiPlugins.svtplay: 4.0.14 -> 4.0.15 2015-10-26 10:57:24 -05:00
Spencer Janssen
9d288f0b80 kodi: 15.1 -> 15.2 2015-10-25 22:16:29 -05:00
Vladimír Čunát
4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
Andrew Kelley
fdc3f13f2e obs-studio: 0.11.1 -> 0.12.0
Also enable PulseAudio support if unspecified.
2015-10-19 15:18:55 -07:00
William A. Kennington III
8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00
Alexei Robyn
8162085634 kodi: Fix SSA/ASS subtitle support. 2015-10-14 20:24:53 +11: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
Edward Tjörnhammar
d02869496b makemkv: 1.9.5 -> 1.9.7 2015-10-04 17:02:51 +02:00
Vincent Laporte
a4db37c4e9 smplayer: 14.9.0.6690 -> 15.9.0 2015-10-02 19:31:05 +02:00
Vincent Laporte
dad6e8d5d7 smtube: 15.8.0 -> 15.9.0 2015-10-01 08:54:00 +02:00
Thomas Tuegel
2e0589b4ca kde414: build with kdelibs-4.14.12
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
2015-09-27 15:08:12 -05:00
Thomas Tuegel
c9a6d288b5 vlc_qt5: build with Qt 5.5 2015-09-27 15:08:10 -05: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
宋文武
d79463365a pitivi: 0.93 -> 0.94 (close #9894) 2015-09-18 20:38:19 +08:00
Martin Sturm
9e0519e554 vlc: use libsamplerate
Change the sample rate converter used from default "ugly_resampler" to
libsamplerate (aka secret rabbit code).
2015-09-18 10:17:21 +02: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
21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +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
Bob van der Linden
e6e338401f popcorntime: 0.3.7.2 -> 0.3.8-3 2015-09-05 16:01:37 +02:00
William A. Kennington III
86ebd3ee25 Merge branch 'master.upstream' into staging.upstream 2015-09-03 11:15:58 -07:00
William A. Kennington III
ffd9e6a6ae gnash: Mark as broken
We should weed out any last users of this dying project and hopefully
remove it at some juncture in the future if no one steps up to maintain
it.
2015-09-02 14:35:33 -07:00
koral
fdfd9d294e mkvtoolnix: 7.9.0 -> 8.3.0 2015-09-02 21:24:35 +00:00
Vincent Laporte
cf660d03bd smtube: 15.5.17 -> 15.8.0 2015-08-26 17:38:14 +02:00
Spencer Janssen
f2ce639000 kodi: 15.0 -> 15.1 2015-08-18 17:41:48 -05:00
Jonathan Rudenberg
387517da84 kodi: Fix libcec build 2015-08-03 19:51:59 -04:00
Tobias Geerinckx-Rice
87853e7753 clipgrab: add 1080p (ffmpeg) support
Support is optional (pass ffmpeg = null), but enabled by default.
2015-08-03 01:41:56 +02:00
Tobias Geerinckx-Rice
dad99aae8e clipgrab: 3.4.11 -> 3.5.1 2015-08-03 01:41:56 +02:00
Jonathan Rudenberg
abaedd5de5 makemkv: 1.9.4 -> 1.9.5 2015-08-01 13:33:28 -04:00
Vincent Laporte
edd76966cb qarte: 2.2.0-147 -> 2.3.0 2015-07-30 20:34:02 +02:00
Nikolay Amiantov
a5ef14bb74 bomi: update package 2015-07-28 12:33:30 +03:00
Eelco Dolstra
43f331a874 mpv: Don't enable JACK support by default
Packages should not depend on JACK by default to reduce dependency
bloat.

Issue #8990.
2015-07-26 22:45:39 +02:00
Edward Tjörnhammar
323fed4284 kodi: 14.2 -> 15.0 2015-07-22 15:54:58 +02:00
Austin Seipp
6475be23bc Merge pull request #8866 from spencerjanssen/obs-version-bump
obs-studio: 0.10.0 -> 0.11.1
2015-07-19 16:56:55 -05:00