Vladimír Čunát
6c2fbfbd77
Merge branch 'master' into staging
2016-05-12 04:53:38 +02:00
Arseniy Seroka
88b684101f
Merge pull request #15255 from jerith666/tivodecode
...
tivodecode: init at 0.2pre4
2016-05-09 10:28:08 +03:00
Matt McHenry
9b53d546e2
tivodecode: init at 0.2pre4
2016-05-08 20:35:44 -04:00
Vladimír Čunát
65a9fa8cdc
Merge branch 'master' into staging
2016-05-08 21:24:48 +02:00
Bob van der Linden
1b2fb84d75
popcorntime: removed package as discussed in #15120
2016-05-05 21:02:31 +02:00
Tuomas Tynkkynen
aadaa91379
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/applications/networking/browsers/vivaldi/default.nix
pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Joachim Fasting
b9fc31a415
popcorntime: mark as broken
...
A temporary measure, short of removal, until
https://github.com/NixOS/nixpkgs/issues/15120 has been resolved.
2016-05-03 16:09:36 +02:00
Bob van der Linden
69d5f27a13
popcorntime: 0.3.8 -> 0.4.0-2 ( #15154 )
2016-05-02 10:46:37 +02:00
Vincent Laporte
ce7181f9a8
smtube: fix build after qmakeHook
2016-04-29 07:21:31 +00:00
Vincent Laporte
5de3cfe210
smplayer: fix build after qmakeHook
2016-04-29 07:21:31 +00:00
Tuomas Tynkkynen
b465dc202f
boost: Kill unnecessary 'lib' output
...
This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
2016-04-28 00:41:28 +03:00
Tuomas Tynkkynen
4ff8f377af
Merge remote-tracking branch 'upstream/master' into staging
2016-04-28 00:13:53 +03:00
Nikolay Amiantov
7b4fc0f5a9
avidemux: use symlinkJoin
2016-04-26 15:37:43 +03:00
Nikolay Amiantov
09f02b918e
Merge branch 'master' of git://github.com/NixOS/nixpkgs into staging
2016-04-25 18:02:10 +03:00
Edward Tjörnhammar
40ea584903
kodi: 16.0 -> 16.1
2016-04-24 22:34:31 +02:00
Vladimír Čunát
e9379f7416
Merge branch 'staging'
...
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00
Thomas Tuegel
b4ff81ffd6
phonon-backend-vlc: init at 0.9.0
2016-04-22 08:11:10 -05:00
Nikolay Amiantov
46ae49fbff
dvd-slideshow: use PATH
2016-04-21 17:23:56 +03:00
Nikolay Amiantov
577ea10f68
shotcut: move to qmakeHook
...
This reverts commit dbc1605dea
.
2016-04-20 18:55:50 +03:00
Nikolay Amiantov
7e4e4799f4
qgifer: move to qmake4Hook
2016-04-20 18:55:49 +03:00
Nikolay Amiantov
35ab3d5522
minitube: move to qmake4Hook
2016-04-20 18:55:49 +03:00
Nikolay Amiantov
09394ae019
linuxstopmotion: move to qmake4Hook
2016-04-20 18:55:49 +03:00
Nikolay Amiantov
3656842478
clipgrab: move to qmake4Hook
2016-04-20 18:55:49 +03:00
Nikolay Amiantov
2816ad29e5
bomi: move to qmakeHook
2016-04-20 18:55:49 +03:00
Brad Ediger
d8d00ae043
makemkv: 1.9.9 -> 1.9.10
2016-04-18 10:45:52 -05:00
Spencer Janssen
a3d6602c39
kodi: fix build after pcre split ( #14714 )
2016-04-15 08:57:13 +01:00
aszlig
dbc1605dea
shotcut: Fix running of {pre,post}Configure
...
Commit 0055c6a
introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of shotcut
override the whole configurePhase, so this hook isn't run at all.
However, this still doesn't fix the package and its already marked as
broken.
The build fails with the following error:
Project ERROR: Unknown module(s) in QT: qml quick webkitwidgets x11extras
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
Nikolay Amiantov
76281d5dec
avidemux: refactor again to fix build failures
2016-04-14 00:31:16 +03:00
Nikolay Amiantov
e88a986ca4
bomi: use wrapQtProgram
2016-04-13 16:09:40 +03:00
Vladimír Čunát
39ebb01d6e
Merge branch 'staging', containing closure-size #7701
2016-04-13 09:25:28 +02:00
joachifm
53ff168dbd
Merge pull request #14615 from layus/vlc-fix
...
vlc: fix the two windows issue with qt5
2016-04-13 01:59:44 +02:00
Guillaume Maudoux
43cf5d3369
vlc: fixes the two windows issue with qt5
...
Fixes #14610 .
2016-04-12 15:55:44 +02:00
Franz Pletz
2af7b09e06
mpv: 0.16.0 -> 0.17.0
2016-04-12 15:51:32 +02:00
Vladimír Čunát
30f14243c3
Merge branch 'master' into closure-size
...
Comparison to master evaluations on Hydra:
- 1255515 for nixos
- 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Eelco Dolstra
9c2a49e76a
mpv: 0.15.0 -> 0.16.0
2016-04-05 23:27:27 +02:00
Edward Tjörnhammar
b8755a4cdf
kodiPlugins.svtplay: 4.0.23 -> 4.0.24
2016-04-03 12:08:53 +02:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Andrew Kelley
09fe0e3c81
qgifer: init at 0.2.1
2016-03-30 04:54:13 -07:00
Nikolay Amiantov
54eb061a12
avidemux: don't depend on unfree FAAC by default
2016-03-29 16:16:36 +03:00
Nikolay Amiantov
a6e0046b75
Merge pull request #14218 from abbradar/avidemux
...
avidemux: 2.5.6 -> 2.6.12
2016-03-29 04:48:51 +04:00
Vladimír Čunát
ed47bb1ca8
qt55.vlc: fix build
...
I tested it on a video to make sure the bug doesn't appear.
2016-03-28 14:37:25 +02:00
Eike Kettner
a366aab377
makemkv 1.9.7 -> 1.9.9
2016-03-26 16:57:34 +01:00
Nikolay Amiantov
8b0076b887
avidemux: 2.5.6 -> 2.6.12
2016-03-26 17:36:41 +03:00
Brad Ediger
cdca9d64b4
dvdbackup: init at 0.4.2
2016-03-24 23:16:14 -05:00
Simon Vandel Sillesen
76ce988c50
kodiPlusings.pvr-hts: fix loading of plugin
...
The plugin was looking for pvr.hts.so.2.2.13, so as only pvr.hts.so was copied, the plugin would not load. This symlinks all variants of the name to the addons folder.
2016-03-20 17:03:12 +01:00
Edward Tjörnhammar
dcf8c1573b
kodiPlugins.svtplay: 4.0.21 -> 4.0.23
2016-03-19 22:55:41 +01:00
Edward Tjörnhammar
cf40f1f8c6
kodiPlugins.steam-launcher: 3.1.1 -> 3.1.4
2016-03-19 22:55:20 +01:00
Edward Tjörnhammar
4422731542
kodiPlugins.salts: 2.0.6 -> 2.0.19
2016-03-19 22:55:07 +01:00
Edward Tjörnhammar
c871c625c0
kodiPlugins.hyper-launcher.{plugin,service}: init at 1.2.0
2016-03-19 22:54:52 +01:00
Edward Tjörnhammar
7d0b492731
kodiPlugins.pdfreader: init at 1.0.2
2016-03-19 22:54:37 +01:00