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
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
Vincent Laporte
425935916c
smtube: update from 14.8 to 14.12
2015-01-10 19:36:22 +01:00
vbgl
967f343245
Merge pull request #5684 from k0ral/mkvtoolnix
...
mkvtoolnix: 7.3.0 -> 7.5.0
2015-01-10 14:46:32 +01:00
koral
29d7fa6525
Added mkvtoolnix-cli = mkvtoolnix without GUI dependencies.
2015-01-10 14:46:05 +01:00
koral
57090412cb
mkvtoolnix: 7.3.0 -> 7.5.0
2015-01-10 12:01:58 +01:00
Cillian de Róiste
9a5da8168d
SimpleScreenRecorder: 0.3.1 -> 0.3.2
2015-01-08 14:59:48 +01:00
Bob van der Linden
54c9c0b4a7
mjpg-streamer: added package
2015-01-02 17:49:58 +01:00
Vladimír Čunát
04d410cc4d
handbrake: fix download URL
2015-01-01 10:07:35 +01:00
Tobias Geerinckx-Rice
c64257b8e5
Fix user-facing typos (mainly in descriptions)
2014-12-30 03:31:03 +01:00
John Wiegley
28b6fb61e6
Change occurrences of gcc to the more general cc
...
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Domen Kožar
20e0da55f5
add kodi 14.0 (renamed from xbmc, new release)
2014-12-24 10:57:41 +01:00
Domen Kožar
c998edfb6d
libcec: 2.1.4 -> 2.2.0
2014-12-24 10:57:41 +01:00
Brandon Dimcheff
d76a42494b
add devede DVD creator gui
2014-12-23 12:31:45 -05:00
Pascal Wittmann
f94580da69
Fix license attribute of many bsd-like licensed packages
2014-12-21 00:00:35 +01:00
Vladimír Čunát
ca850deb9e
kde4.kmplayer: use gentoo mirror ( fixes #5407 )
...
The upstream server is down.
2014-12-20 10:34:44 +01:00
Matej Cotman
eebc60d7f9
vlc: change url
2014-12-19 15:22:31 +01:00
Mathijs Kwik
9a7d425edd
dvdauthor: fix building against glibc 2.20
...
and 2 other patches from redhat
2014-12-13 21:17:27 +01:00
Mathijs Kwik
752554cdcb
mkvtoolnix: fix to find boost lib
2014-12-13 21:17:20 +01:00
Mateusz Kowalczyk
614ea25952
mpv: update to 0.7.1
2014-12-12 03:16:17 +00:00
Vladimír Čunát
b65c8ffc37
shotcut: mark as broken for now
2014-12-10 15:36:07 +01:00
Domen Kožar
4aa3eec330
Merge branch 'master' into staging
...
Conflicts:
pkgs/development/libraries/fontconfig/default.nix
2014-12-07 14:02:48 +01:00
Peter Simons
0377be182c
cinelerra: fix download url
2014-12-04 15:57:16 +01:00
Vladimír Čunát
cbd2305d4d
Merge branch 'master' into staging
2014-11-28 18:59:07 +01:00
AndersonTorres
8d248638bb
MPV: update to 0.7.0
...
Now quvi support was dropped by upstream, and MPV uses Youtube-dl directly.
Another minor change is the update of Waf internal builder.
2014-11-27 00:27:53 -02:00
Vladimír Čunát
a9bad25ffe
Merge branch 'master' into staging
2014-11-24 22:14:25 +01:00
Jonathan Rudenberg
f5e8b86e29
makemkv: Update 1.8.14 -> 1.9.0
2014-11-22 16:24:39 -05:00
Thomas Tuegel
66ebc65cd3
phonon-backend-vlc: add Qt 5 support
2014-11-20 11:11:12 -06:00
Cillian de Róiste
aa3ba007c1
mpv: update from 0.6.1 to 0.6.2
2014-11-18 21:52:47 +01:00
