Thomas Tuegel
8fd5dd89ac
Merge branch 'master' into staging
2015-03-24 17:49:30 -05:00
Thomas Tuegel
5d1f6ad57c
qt5: make qt-5.4.1 default
2015-03-24 17:14:56 -05:00
Luca Bruno
4a1c3760e0
pitivi: cleanup and fix icons on non-nixos
2015-03-23 11:24:34 +01:00
lethalman
fc7511f9a0
Merge pull request #6863 from bencef/jack2mplayer
...
mplayer: add (optionally) jack to NIX_LDFLAGS
2015-03-23 10:55:14 +01:00
Bence Fabian
2aa9da5a06
mplayer: Remove --enable-jack
...
If provided then configure won't use the pkgconfig of jack.
2015-03-23 10:42:37 +01:00
Peter Simons
f30743b86b
Revert "VLC wants a newer version of libdvdnav"
2015-03-19 13:19:17 +01:00
Mateusz Kowalczyk
2b8fd8d4e9
Merge pull request #6857 from k0ral/mpv
...
mpv: 0.8.2 -> 0.8.3
2015-03-19 00:16:03 +00:00
Peter Jones
05d6d77c8e
VLC wants a newer version of libdvdnav
...
* Updated libdvdnav/libdvdread to latest versions
* Removed libdvdnav patches since they have been incorporated into the
latest release
* Added `--enable-dvdnav` configure flag to VLC to ensure that if this
happens again VLC will fail to build
2015-03-18 14:37:12 -06:00
Luca Bruno
ff0ca7fced
p2pvc: remove dot at the end of description
2015-03-18 10:11:41 +01:00
hmuehlhans
ec9f528961
p2pvc: new package
...
Added myself to maintainers
2015-03-17 21:04:05 +01:00
koral
ebba9e6681
mpv: 0.8.2 -> 0.8.3
2015-03-17 17:31:35 +00:00
Pascal Wittmann
30ec369a99
xine-ui: update from 0.99.7 to 0.99.9
2015-03-16 18:38:47 +01:00
Vincent Laporte
d38c414d94
Adds Qarte
...
Qarte allows you to browse into the archives of arte+7 & arteLiveWeb sites
and to record your preferred videos.
Homepage: https://launchpad.net/qarte
2015-03-13 22:17:32 +01:00
Mateusz Kowalczyk
af3caf8cb1
Merge pull request #6761 from k0ral/mkvtoolnix
...
mkvtoolnix: 7.6.0 -> 7.7.0
2015-03-12 01:36:38 +00:00
Edward Tjörnhammar
afeed64bbe
kodiPlugins.{genesis,svtplay}: version bumps
2015-03-11 19:52:35 +01:00
koral
ab1f4ac92e
mkvtoolnix: 7.6.0 -> 7.7.0
2015-03-11 16:46:30 +00:00
James Cook
7b67e3fe35
Enable aalib support in mplayer.
2015-03-08 23:58:48 -07:00
Arseniy Seroka
ff58ecdce2
Merge pull request #6660 from flosse/zdfmediathk
...
pkgs: zdfmediathk 8 -> 9
2015-03-05 23:59:18 +03:00
koral
e8dd8ac456
mpv: 0.8.0 -> 0.8.2
2015-03-05 07:36:29 +00:00
Markus Kohlhase
c9afdef66d
pkgs: zdfmediathk 8 -> 9
2015-03-04 19:18:13 +00:00
Domen Kožar
362ba73ac6
vlc: 2.1.5 -> 2.2.0
2015-02-28 23:24:10 +01:00
Jaka Hudoklin
c4ae25e827
Merge pull request #6587 from offlinehacker/pkgs/kdenlive/icons
...
kdenlive: Add icons to propagatedUserEnvPkgs.
2015-02-28 03:55:04 +01:00
Jaka Hudoklin
bf02236701
kdenlive: Add icons to propagatedUserEnvPkgs.
2015-02-27 14:12:03 +01:00
AndersonTorres
5347a1c8a1
MPV: upgrade to 0.8.0
2015-02-23 23:43:59 -03:00
Thomas Tuegel
8cf78bf5f4
update various packages to use Qt 5.4
2015-02-21 11:39:20 -06:00
Arseniy Seroka
18ec13d9d2
Merge pull request #6483 from qknight/kino-1.3.4-build-fix
...
kino-1.3.4 fixes
2015-02-21 13:32:40 +03:00
Joachim Schiele
1a35a0ad34
kino-1.3.4 fixes; thanks to gentoo
2015-02-20 22:44:10 +01:00
Shea Levy
2f061ff16b
Merge remote-tracking branch 'origin/staging'
...
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
Vincent Laporte
c3380ce3b0
smplayer: update from 14.9.0 to 14.9.0.6690
2015-02-16 13:31:13 +01:00
Shea Levy
127efcd6f6
Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging
...
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv
Conflicts:
pkgs/applications/audio/ncmpcpp/default.nix
2015-02-11 19:37:22 -05:00
Mateusz Kowalczyk
6e479db730
mkvtoolnix: update to 7.6.0
2015-02-09 12:43:09 +00:00
Edward Tjörnhammar
e546997042
makemkv: 1.9.0 -> 1.9.1
2015-02-08 22:40:25 +01:00
Eric Seidel
e08b9ab8d3
kill libiconvOr*
...
Conflicts:
pkgs/applications/networking/mailreaders/sup/default.nix
pkgs/development/compilers/ghc/7.8.3-binary.nix
pkgs/development/interpreters/php/5.3.nix
pkgs/development/interpreters/ruby/patches.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/poppler/default.nix
pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Domen Kožar
f8dacd8528
Merge pull request #6090 from richardlarocque/xbmc_rtmp
...
xbmc: Add rtmp support
2015-02-03 23:22:52 +01:00
Nikolay Amiantov
9b631cd0f8
bomi: rename from cmplayer and update
2015-02-03 14:27:43 +03:00
Shea Levy
c45372f038
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
...
Partial staging merge, including cc-wrapper fixes
Conflicts:
pkgs/applications/audio/spotify/default.nix
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Edward Tjörnhammar
f8038b0c6c
kodi: 14.0 -> 14.1, added myself as maintainer
2015-02-02 20:15:52 +01:00
Richard Larocque
d221fd91a3
xbmc: Add rtmp support
2015-02-01 13:56:26 -08:00
devhell
5c0be2f8c9
mpv: 0.7.2 -> 0.7.3; waf: 1.8.1 -> 1.8.5
2015-01-30 20:42:11 +00:00
Edward Tjörnhammar
6bbec634a7
Merge pull request #5850 from edwtjo/kodi-plugins
...
XBMC to Kodi migrations
2015-01-24 14:17:14 +01:00
Mateusz Kowalczyk
9b57b3d44b
mpv: update from 0.7.1 to 0.7.2
2015-01-23 19:41:27 +00:00
Cillian de Róiste
b23fc6c811
simplescreenrecorder: update from 0.3.2 to 0.3.3
2015-01-22 12:05:41 +01:00
Vincent Laporte
2d22013ee7
smtube: update from 14.12.0 to 15.1.0
2015-01-22 09:06:05 +01:00
lethalman
b214a6ab72
Merge pull request #5532 from bobvanderlinden/mjpg-streamer
...
add package MJPG-streamer
2015-01-21 10:16:38 +01:00
Bob van der Linden
7ee3b0023f
mjpg-streamer: use postFixup instead of dontPatchElf and NIX_LDFLAGS
2015-01-20 10:24:27 +01:00
Edward Tjörnhammar
8d1657b463
Migrating the XBMC plugin wrapper and plugins to Kodi.
2015-01-19 22:14:36 +01:00
Eric Seidel
f3c6827373
rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc
2015-01-14 20:27:55 -08:00
Ludovic Courtès
41b53577a8
unmaintain a bunch of packages
2015-01-13 22:33:49 +01:00
aszlig
dcbcc85fea
miro: Fix build by adding sqlite to buildInputs.
...
The dependency on sqlite was propagated through to miro by libsoup, but
with f570f97
, it's no longer propagated anymore so we need to pass it to
the miro derivation directly.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-12 03:05:40 +01:00
Arseniy Seroka
cc17ebdca8
Merge pull request #5689 from k0ral/mkvtoolnix
...
Added mkvtoolnix-cli = mkvtoolnix without GUI dependencies.
2015-01-12 02:07:40 +03:00