Commit Graph

736 Commits

Author SHA1 Message Date
Pascal Wittmann
7fd2796e99 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01: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
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
Spencer Janssen
664af7b909 obs-studio: 0.10.0 -> 0.11.1
This version also adds a curl dependency.
2015-07-16 16:43:09 -05:00
William A. Kennington III
7cda24c01e Merge branch 'master.upstream' into staging.upstream 2015-07-08 14:11:16 -07:00
Guillaume Massé
7bab5ee5d0 Following name convention for popcorntime
http://nixos.org/nixpkgs/manual/#sec-package-naming
2015-07-07 10:23:40 -04:00
Guillaume Massé
5562750cd0 Build popcorntime from ci until yts movie outage is fixed
Currently the movie tab is broken. It's fixed in the experimental branch (master)

http://status.popcorntime.io/
> * Update - Issue with the subtitles API affects Release 0.3.7-2, Experimental builds are fine
>   May 13, 22:54 EDT
> [...]
> * Identified - The issue with the YTS API (Movies) seems to be related to a bad response for one of the movies. The movies page will continue to be intermittent until the issue is resolved.
>   May 10, 21:29 EDT
> * Investigating - YTS (Movies) is currently unavailable for Popcorn Time release 0.3.7-2, but is still working for the experimental builds. We're looking into what the issue could be and why it's only affecting release 0.3.7-2
>   May 10, 18:34 EDT
2015-07-07 00:00:55 -04:00
William A. Kennington III
d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Bjørn Forsman
8f9534ccc3 popcorntime: unbreak tarball job
Fix evaluation error when srcs."${stdenv.system}" does not exist (e.g.
on darwin).
2015-07-04 20:32:45 +02:00
William A. Kennington III
612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Domen Kožar
3ff2dfb7fa Merge pull request #8423 from bobvanderlinden/popcorntime-bin
added popcorntime package
2015-06-28 10:01:45 +02:00
William A. Kennington III
12102562f7 Merge branch 'master.upstream' into staging.upstream 2015-06-27 00:18:18 -07:00
William A. Kennington III
7297255019 Convert all jack references to libjack2 2015-06-27 00:17:52 -07:00
William A. Kennington III
ef253212f4 Merge branch 'master.upstream' into staging.upstream 2015-06-26 17:25:49 -07:00
Markus Kohlhase
86dbc9b5e2 k9copy: fixed attributes to evaluate with current master 2015-06-26 10:11:49 +02:00
Bob van der Linden
bb10e48573 popcorntime: don't use pkgs in argument 2015-06-25 19:05:52 +02:00
Thomas Tuegel
a8c52d0958 Merge branch 'master' into staging 2015-06-25 09:15:05 -05:00
William Casarin
1281f51b69 obs-studio: audio support 2015-06-25 00:32:16 -07:00
Eelco Dolstra
ab8a2b0c78 vlc: Don't depend on JACK by default
To reduce dependency bloat, packages should not depend on non-standard
audio systems by default.
2015-06-24 12:20:38 +02:00
William A. Kennington III
282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
Markus Kohlhase
f50b2e5892 k9copy: init at 3.0.3 2015-06-22 12:34:00 +02:00
William Casarin
bd399f2647 add qt5.x11extras to obs-studio
fixes build
2015-06-21 21:20:01 -07:00
Bob van der Linden
e315d0599d popcorntime: allow different versions of node_webkit 2015-06-19 23:22:18 +02:00
Bob van der Linden
f2f0d98e53 popcorntime: added support for i686-linux 2015-06-19 23:22:18 +02:00
Bob van der Linden
236f8c720d added popcorntime package 2015-06-19 23:22:18 +02:00
Vladimír Čunát
61596bf405 Merge #8363: pure-darwin stdenv 2015-06-18 22:38:08 +02:00
lethalman
da28405ba2 Merge pull request #8263 from robbinch/pkg-dvd-slideshow
dvd-slideshow: Add package.
2015-06-18 14:46:48 +02:00
Luca Bruno
aa800fa0fe Merge branch 'master' into staging 2015-06-15 09:56:29 +02:00
Jonathan Rudenberg
853e87909f makemkv: 1.9.3 -> 1.9.4 2015-06-14 16:31:29 -04:00
Jonathan Rudenberg
52a1ae743b makemkv: 1.9.2 -> 1.9.3 2015-06-12 17:58:27 -04:00
Eelco Dolstra
4a57b07653 Merge remote-tracking branch 'origin/master' into staging 2015-06-11 00:18:24 +02:00
Robbin C
9d749881d6 dvd-slideshow: Removed dot at the end. 2015-06-10 19:02:09 +08:00
Robbin C
085a0e8d24 dvd-slideshow: Add package.
This adds dvd-slideshow, a suite of command line programs that creates a
slideshow-style video from groups of pictures.
2015-06-10 17:34:51 +08:00
Pascal Wittmann
e1af50c4c4 byzanz: add -Wno-error for deprecated declarations to fix the build 2015-06-09 20:38:05 +02:00
Tobias Geerinckx-Rice
cae833255f add minitube: stand-alone Youtube video player
Close #8118.
2015-06-09 20:05:23 +02:00
Richard Larocque
78f2410865 kodi: Enable RTMP support
Ports over similar XBMC changes from
d221fd91a3.
2015-06-03 23:27:39 -07:00
Vincent Laporte
2af5c8d75f qarte: minor update to rev. 147 2015-05-31 19:03:43 +02:00
Vincent Laporte
9e68371f51 smtube: update from 15.5.10 to 15.5.17 2015-05-31 19:03:43 +02:00
William A. Kennington III
b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
Peter Simons
99273a6716 Merge pull request #8047 from nckx/master
Don't use "with licenses;" for single licences
2015-05-28 22:14:53 +02:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
codyopel
ba9867fb5b mpv: refactor & fix youtube-dl support 2015-05-28 09:30:36 -04:00
Tobias Geerinckx-Rice
b2d7f4b1ba Use common licence attributes from lib/licenses.nix
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Florian Friesdorf
6ad9f8e1dd mediathekview-9 2015-05-23 12:41:14 +02:00
Mateusz Kowalczyk
4d867b0b08 mpv: update to 0.9.2 2015-05-23 01:56:39 +01:00
Luca Bruno
9adde87fea More usage of gnome3.defaultIconTheme 2015-05-19 14:44:27 +02:00
Arseniy Seroka
82d46c2c2a Merge pull request #7900 from C0DEHERO/fix/obs-studio-update
obs-studio: update 0.9.1 -> 0.10.0
2015-05-19 03:35:53 +03:00
C0DEHERO
3c94a9da90 obs-studio: update 0.9.1 -> 0.10.0 2015-05-18 19:10:03 -04:00
Nikolay Amiantov
19b4eb8208 bomi: update, add youtube-dl support 2015-05-18 17:21:08 +03:00
Luca Bruno
25f9555599 Drop GNOME 3.12 2015-05-18 12:24:08 +02:00
Spencer Whitt
01d7d24dbb libdvdnav: 4.2.1 -> 5.0.3
Keeping the old version around for now in order to support mplayer.
2015-05-14 23:26:16 -04:00
Mateusz Kowalczyk
dc1107af57 Merge pull request #7801 from codyopel/mkvtoolnix
mkvtoolnix: 7.8.0 -> 7.9.0
2015-05-12 17:17:09 +01:00