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
Robin Gloster
d020caa5b2
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-18 13:49:22 +00: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
Robin Gloster
3e68106afd
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-07 21:52:26 +00:00
Eelco Dolstra
9c2a49e76a
mpv: 0.15.0 -> 0.16.0
2016-04-05 23:27:27 +02:00
Robin Gloster
696d85a62d
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-03 11:01:57 +00: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
Robin Gloster
a4e65c3639
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-30 09:01:20 +00: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
Robin Gloster
f60c9df0ba
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-28 15:16:29 +00: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
Edward Tjörnhammar
0f3618da1e
kodiPlugins: sort collection alphabetically
2016-03-19 22:54:18 +01:00
joachifm
8f0cd81708
Merge pull request #14014 from romildo/update.subtitleeditor
...
subtitleeditor: 0.41.0 -> 0.52.1
2016-03-18 15:00:14 +00:00
José Romildo Malaquias
9929ddd1a9
subtitleeditor: 0.41.0 -> 0.52.1
2016-03-18 09:29:10 -03:00
rnhmjoj
fa683ab455
popcorntime: 0.3.8-3 -> 0.3.9
2016-03-16 21:54:00 +01:00
Robin Gloster
3f45f0948d
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-15 01:44:24 +00:00
Nikolay Amiantov
363f024864
Merge pull request #13861 from abbradar/mjpg-streamer
...
mjpg-streamer: update and add NixOS service
2016-03-14 15:19:03 +03:00
宋文武
93feb5d115
drop my maintainership ( close #13881 )
2016-03-13 18:39:01 +01:00
rnhmjoj
615ea1e90c
mkvtoolnix: fix failing build
2016-03-13 01:10:03 +01:00
Nikolay Amiantov
84e8fece41
mjpg-streamer: 182 -> 2016-03-08
2016-03-12 18:52:58 +03:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz
e9fc4e7db6
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-03-07 22:08:27 +01:00
rnhmjoj
aaa443516f
mkvtoolnix: 8.4.0 -> 8.9.0
2016-03-07 19:41:28 +01:00
Franz Pletz
aff1f4ab94
Use general hardening flag toggle lists
...
The following parameters are now available:
* hardeningDisable
To disable specific hardening flags
* hardeningEnable
To enable specific hardening flags
Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.
cc-wrapper supports the following flags:
* fortify
* stackprotector
* pie (disabled by default)
* pic
* strictoverflow
* format
* relro
* bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
fed49425c5
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-03 16:11:55 +00:00
Théophane Hufschmitt
0bcf42aed3
mpv: added optional wayland support
2016-03-03 11:38:52 +01:00
Robin Gloster
d47857c3d9
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-01 21:09:17 +00:00
Carles Pagès
7eb15265d3
kodiPlugins.pvr-hts: 2.1.18 -> 2.2.13
2016-03-01 13:56:27 +01:00
Edward Tjörnhammar
9af50a2e7d
kodi: add optional joystick support
2016-02-29 19:00:46 +01:00
Robin Gloster
3b4765c9e5
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-28 16:32:57 +00:00
zimbatm
69ce5cb656
use the sourceforge mirrors everywhere
...
find pkgs -name "*.nix" -exec sed -r \
"s|https?://downloads.sourceforge.net/|mirror://sourceforge/|g" -i {} \;
2016-02-28 12:07:42 +00:00
Robin Gloster
3477e662e6
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-27 00:08:08 +00:00
Frederik Rietdijk
40ca841c5c
Merge pull request #13124 from FRidh/buildPythonApplication
...
buildPythonApplication: use new function for Python applications
2016-02-23 16:02:10 +01:00
Robin Gloster
bb2639aafc
Merge branch 'curl-7.15-fixup' of https://github.com/zimbatm/nixpkgs into hardened-stdenv
2016-02-22 01:14:22 +00:00
Edward Tjörnhammar
bc1e1c5698
kodiPlugins.salts: 1.0.98 -> 2.0.6
2016-02-21 16:15:54 +01:00
Edward Tjörnhammar
4575d58b3d
kodiPlugins.genesis: 5.1.3 -> 5.1.4
2016-02-21 16:15:13 +01:00
Edward Tjörnhammar
ad4bfe4dda
kodi: 15.2 -> 16.0
2016-02-21 15:32:12 +01:00
Pascal Wittmann
ab742b42ab
vlc: 2.2.1 -> 2.2.2 and take maintainership
2016-02-21 08:03:16 +01:00
Robin Gloster
4036e9ba8c
Merge branch 'up' into hardened-stdenv
2016-02-20 22:27:33 +00:00
Cole Mickens
e1a3b4128f
mpv: 0.14.0 -> 0.15.0
2016-02-20 03:46:37 -08:00
Frederik Rietdijk
4d06bf70f4
buildPythonApplication: use new function for Python applications
2016-02-19 13:16:41 +01:00
Vladimír Čunát
d039c87984
Merge branch 'master' into closure-size
2016-02-14 08:33:51 +01:00
Robin Gloster
a462683d10
aegisub: turn off bindnow/relro hardening
2016-02-09 14:32:47 +00:00
Vladimír Čunát
1e04d875db
videolan.org sources: prefer http://get.videolan.org
...
Some of the original URLs were broken now.
It seems that set of mirrors is preferred and faster than the others.
In the x264 case the source isn't there so http://download.videolan.org
is used instead.
2016-02-07 13:21:18 +01:00
William Casarin
c77f1f6cc9
obs-studio: 0.12.1 -> 0.13.1
2016-02-05 20:29:33 -08:00
Vladimír Čunát
ae74c356d9
Merge recent 'staging' into closure-size
...
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Vincent Laporte
4f8f5732fc
smtube: 15.11.0 -> 16.1.0
2016-01-29 10:08:29 +01:00
Vincent Laporte
ef8f074604
smplayer: 15.11.0 -> 16.1.0
2016-01-29 10:08:29 +01:00
Peter Simons
ed8b81e0df
simplescreenrecorder: update to version 0.3.6
2016-01-27 00:23:27 +01:00
Tobias Geerinckx-Rice
0c25292648
vorbis-tools: rename from old-style vorbisTools
2016-01-26 01:35:55 +01:00
Tobias Geerinckx-Rice
9fb8020e4e
Add version attribute where maintainers |= nckx
...
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Tuomas Tynkkynen
493349f82a
treewide: Mass replace 'libjpeg}/lib' to refer the 'out' output
2016-01-24 10:03:35 +02:00
Vladimír Čunát
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
Vincent Laporte
38226ea4c3
smtube: add missing build dependency
2016-01-15 10:04:06 +01:00
Edward Tjörnhammar
cee61fd115
kodiPlugins.t0mm0-common: init at 0.0.1
2016-01-13 14:29:06 +01:00
Edward Tjörnhammar
32cd7228f6
kodiPlugins.urlresolver: init at 2.10.0
2016-01-13 14:29:06 +01:00
Edward Tjörnhammar
15821e1b69
kodiPlugins.salts: init at 1.0.98
2016-01-13 14:29:06 +01:00
Edward Tjörnhammar
376e842c22
kodiPlugins.svtplay: 4.0.18 -> 4.0.21
2016-01-12 22:09:31 +01:00
Arseniy Seroka
e8a66aa4f3
Merge pull request #12327 from kragniz/mpv-0.14.0
...
mpv: 0.12.0 -> 0.14.0
2016-01-12 20:07:57 +03:00
Louis Taylor
010724bc6f
mpv: 0.12.0 -> 0.14.0
2016-01-12 07:02:11 +00:00
Tobias Geerinckx-Rice
432c0bd003
cc1394: remove dead package
...
Not updated since 2012. Broken since 2013. Sources long gone.
cc @viric
2016-01-06 01:46:16 +01:00
Tobias Geerinckx-Rice
5989c97665
tvtime: remove dead package
...
Upstream dried up in 2005. Not updated since 2012, broken since 2013.
cc @qknight
2016-01-06 01:46:16 +01:00
Mateusz Kowalczyk
1c837144f7
mkvtoolnix-cli: update from 8.3.0 to 8.4.0
2016-01-03 20:51:14 +00:00
Arseniy Seroka
a40b413b04
Revert "avidemux: 2.5.6 -> 2.6.9"
...
This reverts commit 170c8e08d3
.
2016-01-03 18:49:39 +03:00
Reno Reckling
a60418a770
bomi: fix missing build dependency
...
The build fails without specifying qtquickcontrols as a build input
2016-01-01 14:57:28 +01:00
Vladimír Čunát
f9f6f41bff
Merge branch 'master' into closure-size
...
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Tobias Geerinckx-Rice
f5b52aa382
clipgrab: 3.5.5 -> 3.5.6
2015-12-24 04:05:57 +01:00
Thomas Tuegel
5ff1c58606
Merge pull request #11839 from ttuegel/qt-5.4
...
Qt infrastructure update
2015-12-20 08:11:52 -06:00
Thomas Tuegel
85c19f8fb4
smtube: Qt 5 infrastructure update
2015-12-20 07:56:55 -06:00
Thomas Tuegel
d534d5f097
smplayer: Qt 5 infrastructure upgrade
2015-12-20 07:56:55 -06:00
Thomas Tuegel
a0bae9b571
obs-studio: Qt 5 infrastructure update
2015-12-20 07:56:44 -06:00
Thomas Tuegel
ccdbc22836
shotcut: Qt 5 infrastructure update
2015-12-20 07:56:43 -06:00
Thomas Tuegel
d405316398
bomi: Qt 5 infrastructure update
2015-12-20 07:56:43 -06:00
Tobias Geerinckx-Rice
1b6128cdc9
clipgrab: 3.5.4 -> 3.5.5
2015-12-20 03:34:43 +01:00
Domen Kožar
59455da528
Merge pull request #11799 from flosse/zdfmediathk
...
pkgs.zdfmediathk: 9 -> 10
2015-12-18 01:44:09 +01:00
Markus Kohlhase
61420e7ea9
pkgs.zdfmediathk: 9 -> 10
2015-12-18 00:43:07 +01:00
Pascal Wittmann
7dfe60b509
Merge pull request #11763 from DamienCassou/new-recordmydesktop
...
recordmydesktop: init at 0.3.8-svn602
2015-12-17 16:19:24 +01:00
Damien Cassou
1bb68f0a5b
recordmydesktop: init at 0.3.8-svn602
2015-12-17 06:47:02 +01:00
Luca Bruno
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
Sou Bunnbu
c03b26ee08
Merge pull request #11491 from bjornfor/pitivi-0.95
...
gstreamer 1.4 -> 1.6 and pitivi 0.94 -> 0.95
2015-12-11 21:00:31 +08:00
Ricardo M. Correia
c3be340ae0
handbrake: fix compilation due to missing dep
2015-12-08 17:30:25 +01:00
Bjørn Forsman
1eaf571d42
pitivi: 0.94 -> 0.95
...
Notable (hard) dependency changes:
- gstreamer >= 1.6.0
- gst-plugins-bad with GTK support (need "gstgtk" plugin)
- pygobject >= 3.14
- gst-validate
- matplotlib (used for drawing the "timeline")
Changes v1 -> v2:
pitivi no longer requires clutter, so I switched clutter-gtk => gtk3.
2015-12-06 10:24:59 +01:00
Carles Pagès
5d9148c9ad
kodiPlugins.pvr-hts: init at 2.1.18
...
Add Tvheadend HTSP PVR client addon for Kodi.
2015-12-05 08:42:45 +01:00
Vincent Laporte
a4a334bbe0
smtube: 15.9.0 -> 15.11.0
2015-12-02 19:46:23 +01:00
Vincent Laporte
da4706f72a
smplayer: 15.9.0 -> 15.11.0
2015-12-02 19:46:23 +01:00
Nikolay Amiantov
d573b1e7a9
vlc: add midi support via fluidsynth
2015-12-01 20:46:31 +03:00
Edward Tjörnhammar
9787d22142
kodiPlugins.advanced-launcher: switch repo
2015-12-01 10:02:11 +01:00
Luca Bruno
920b1d3591
Merge branch 'master' into closure-size
2015-11-29 16:50:26 +01:00
Domen Kožar
67e03d0c50
Merge branch 'buildPythonPackage+wheels'
2015-11-26 17:38:35 +01:00
Luca Bruno
a412927924
Merge remote-tracking branch 'origin/master' into closure-size
2015-11-25 21:37:30 +01:00
Nikolay Amiantov
e774cd6fc2
obs-studio: 0.12.0 -> 0.12.1
2015-11-24 17:01:18 +03:00
Edward Tjörnhammar
e33b26ce2f
kodiPlugins.steam-launcher: init plugin at 3.1.1
2015-11-22 10:32:57 +01:00
Edward Tjörnhammar
3ffae479d1
kodiPlugins.svtplay: 4.0.15 -> 4.0.18
2015-11-22 10:32:57 +01:00
Domen Kožar
704c8bab41
buildPythonPackage: fix standalone applications using it
2015-11-21 21:44:12 +01:00
Cillian de Róiste
13b339fe88
key-mon #11183 : use $GDK_PIXBUF_MODULE_FILE with makeWrapperArgs
...
This is more robust, since it won't be affected when the path to
gdk-pixbuf loaders.cache changes. Thanks @domenkozar.
2015-11-21 16:31:38 +01:00
Cillian de Róiste
d373b9d9f3
key-mon #11183 : replace makeWrapper with makeWrapperArgs
2015-11-21 16:02:57 +01:00
Cillian de Róiste
faff9ddad5
key-mon: fixes #11183
2015-11-21 15:39:52 +01:00
Vladimír Čunát
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
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