Commit Graph

702 Commits

Author SHA1 Message Date
Nikolay Amiantov
5d7847f233 bomi: update 2015-03-29 13:01:47 +03:00
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
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
aszlig
fdd9d132ca
mpv: Remove waf script from buildInputs.
Since b23dbb1a5d, if buildInputs contains
a plain file it is used as a setup hook. The waf script which is used
here in mpv however isn't a setup hook and also shouldn't be included in
buildInputs as it was kind of a no-op before already.

Failed build log:

https://headcounter.org/hydra/build/582548/nixlog/1/raw

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-15 16:47:44 +01:00
Eelco Dolstra
0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Vladimír Čunát
52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Vladimír Čunát
0ff8281b12 aegisub: do not force libiconv, use auto link flags
This fixes build after #4419.
It seems to start fine without the flags, CC maint. @AndersonTorres.
2014-11-03 12:58:54 +01:00
William A. Kennington III
a9c472d16e boost: Fix incompatible applications 2014-11-02 17:22:28 -08:00
William A. Kennington III
aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
lethalman
fae9e793b4 Merge pull request #4789 from edwtjo/xbmc-wrapper-desktop-passthroughs
xbmc: passthrough desktop and icon files
2014-11-03 00:20:46 +01:00
cillianderoiste
9d5c8a78a2 Merge pull request #4792 from titanous/titanous-maintainer
Add titanous as a maintainer to libcec and xbmc
2014-11-02 22:07:38 +01:00
Edward Tjörnhammar
8481d34cf1 Merge pull request #4790 from edwtjo/xbmc-svtplay-4.0.9
xbmcPlugins.svtplay: 4.0.8 -> 4.0.9
2014-11-02 22:00:12 +01:00
Jonathan Rudenberg
7b218ead96 Add titanous as a maintainer to libcec and xbmc 2014-11-02 15:58:11 -05:00
Edward Tjörnhammar
4a9dc44c38 xbmcPlugins.svtplay: 4.0.8 -> 4.0.9 2014-11-02 21:36:22 +01:00
Edward Tjörnhammar
78175840f0 xbmc: passthrough desktop and icon files 2014-11-02 21:30:54 +01:00
Jonathan Rudenberg
e169f3365d mythtv: 0.24.2 -> 0.27.4 2014-11-02 15:15:03 -05:00
Jonathan Rudenberg
f6a734e9e0 Add libcec support to xbmc 2014-10-28 17:45:08 -04:00
Mateusz Kowalczyk
03ee662161 mkvtoolnix: update from 7.2.0 to 7.3.0 2014-10-27 00:54:13 +00:00
Jonathan Rudenberg
8cc11f4255 makemkv: update to 1.8.14 2014-10-25 20:14:05 -04:00
AndersonTorres
76f6e8625f MPV: update to 0.6.1 2014-10-25 16:33:01 -02:00
Markus Kohlhase
bbcefd9cc6 added mediathek application 2014-10-25 16:24:29 +02:00
Damien Cassou
5ab448d944 Add byzanz 2014-10-23 10:42:56 +02:00
Edward Tjörnhammar
24dce998b4 xbmcPlugins.svtplay: 4.0.6 -> 4.0.8 2014-10-18 22:09:03 +02:00
aszlig
c1f55dcd35
miro: Add support for video/audio library sharing.
This is done using the Avahi/Bonjour compatibility library.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-14 19:46:59 +02:00
Edward Tjörnhammar
9701d58e28 xbmcPlugins.genesis: added package
Closes #4482
2014-10-12 12:35:09 +01:00
Vincent Laporte
8280d6522e smtube: new package
SMTube allows to search, play and download Youtube videos.

Homepage: http://smplayer.sourceforge.net/smtube.php
2014-10-11 10:56:00 +01:00
Vincent Laporte
826572a9e3 smplayer: update from 14.3.0 to 14.9.0 2014-10-11 10:45:45 +01:00
Cillian de Róiste
13664348f5 kde4_next.kdenlive: update from 0.9.8 to 0.9.10 2014-10-08 19:52:29 +02:00
Rickard Nilsson
1ccb2f76b5 Merge pull request #4078 from edwtjo/libretro-cores-addendum
XBMC RetroArch integration and some cores
2014-10-02 20:50:49 +02:00
Edward Tjörnhammar
37a83771e6 xmbcPlugins: svtplay added 2014-10-02 20:09:18 +02:00
Edward Tjörnhammar
9d4e344b46 xbmc: enable plugins to be picked up from the store. 2014-10-02 20:09:18 +02:00
Domen Kožar
6ac16b3660 cmplayer: fix build 2014-10-02 10:23:08 +02:00
Cillian de Róiste
258e75304e simplescreenrecorder: update from 0.3.0 to 0.3.1 2014-09-30 20:39:47 +02:00
AndersonTorres
9a6e559b9d mpv: update to 0.5.4
Also, a small update on internal let-waf expression

Closes #4306
2014-09-28 22:46:49 +01:00
muflax
9da620a723 mplayer2: fix typo in configure
Closes #4287
2014-09-27 08:21:31 +01:00
muflax
5861898fc2 add jpeg support to mplayer and mplayer2
Closes #4288
2014-09-27 08:20:30 +01:00
Mateusz Kowalczyk
58fc36a179 mkvtoolnix: update from 7.1.0 to 7.2.0 2014-09-26 08:33:40 +01:00
AndersonTorres
a41d73e75f Aegisub: updating to 3.2.1 2014-09-24 22:06:44 +02:00
William A. Kennington III
31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07:00
William A. Kennington III
f327e9c922 boostHeaders: regular boost package now only contains headers 2014-09-21 15:18:16 -07:00
Mateusz Kowalczyk
c7bbc288b5 Merge branch 'cmplayer' of https://github.com/abbradar/nixpkgs
Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
2014-09-20 23:00:41 +01:00
Nikolay Amiantov
e4ce9e98e3 cmplayer: store patch with expression 2014-09-20 02:27:57 +04:00
Nikolay Amiantov
e81589e2c1 cmplayer: add package 2014-09-19 03:52:11 +04:00
Domen Kožar
771e2d8d09 add xvidcap to the channel for linux 2014-09-17 13:35:59 +02:00
Domen Kožar
1e85156b29 Merge pull request #4064 from eduarrrd/xbmc-libmad
xbmc: add libmad to LD_LIBRARY_PATH to enable mp3 file playback
2014-09-13 17:13:09 +02:00
Eduard Bachmakov
bee5cc43fb xbmc: add libmad to LD_LIBRARY_PATH to enable mp3 file playback 2014-09-13 10:40:44 -04:00
Cillian de Róiste
5349ff32a8 shotcut: update from 14.08 to 14.09 2014-09-13 14:02:41 +02:00
Pascal Wittmann
8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
AndersonTorres
b39e5ce957 Small style fixups
In this commit, I modified some files, conforming them to a
idiosyncratic standard - mainly, a template for meta attribs.
2014-09-10 21:34:50 -03:00
AndersonTorres
40b13e798b CImg and WxCam - New Packages #3519
In this commit, I'm including two new softwares
* CImg: A small, simple image toolkit library
* WxCam: a small, simple, wxGTK-based webcam application
2014-09-04 20:44:05 +04:00
Mateusz Kowalczyk
09afbd1f06 mkvtoolnix: update from 6.5.0 to 7.1.0 2014-08-29 14:34:24 +01:00
Michael Raskin
669969064a Merge pull request #3527 from AndersonTorres/mpv
MPV: update to 0.5.0
2014-08-29 01:41:22 +04:00
Bjørn Forsman
c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Nixpkgs Monitor
c224b5e949 xbmc: update from 13.1 to 13.2 2014-08-24 18:33:47 +02:00
Cillian de Róiste
b743dd393a keymon: update from 1.16 to 1.17 2014-08-24 15:18:08 +02:00
Rüdiger Sonderfeld
a3625b5b2b smplayer: Update to 14.3.0.
Requires mplayer to be compiled with FriBiDi support (4de6b9a).
2014-08-23 11:46:53 +02:00
Bjørn Forsman
006ebdfe78 linuxstopmotion: new package
Linux Stopmotion is a program for creating stop-motion animation movies.

http://linuxstopmotion.org/

I had to apply a small patch to make grabbing images from webcam work
(using uvccapture). I find it odd that it didn't work without the patch,
seeing that Arch Linux also have the v0.8.0 version, but with no patch.
Latest Ubuntu (14.04) has v0.7.2, which is unaffected.
2014-08-20 23:12:38 +02:00
Bjørn Forsman
c14f3e4039 uvccapture: new package
"Capture image from USB webcam at a specified interval"

I apply patches from Debian to make it build with V4L2 (instead of v1
API) and fix some warnings/bugs. Source code is also downloaded from
Debian, as uvccapture homepage is unavailable.

Homepage: http://linux-uvc.berlios.de/ (seems to have vanished...)
2014-08-20 23:12:37 +02:00
Rüdiger Sonderfeld
4de6b9a0c7 mplayer: Add GNU FriBiDi support.
This is required by new versions of SMPlayer and other distros seem to
enable it by default now as well.
2014-08-19 16:24:58 +02:00
Rüdiger Sonderfeld
033c9bd18c mplayer: Update to 1.1.1. 2014-08-19 15:19:06 +02:00
AndersonTorres
7a8cdc66a4 MPV: update to 0.5.0
Many thanks matejc for the commit!
2014-08-18 08:14:26 -03:00
AndersonTorres
526edcaf15 Aegisub: update to 3.2.0 2014-08-12 19:43:16 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Cillian de Róiste
4143d9dfef shotcut: remove obsolete patch 2014-08-03 11:46:08 +02:00
Cillian de Róiste
cc3b5291d9 shotcut: update from 14.07 to 14.08 2014-08-03 11:44:41 +02:00
Vladimír Čunát
6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Bjørn Forsman
62d0a320b3 Revert "Remove obsolete jackaudio version 1."
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-31 12:52:29 +02:00
Vladimír Čunát
be07584397 vlc: minor update 2014-07-30 09:31:24 +02:00
Cillian de Róiste
6259669355 SimpleScreenRecorder 0.2.2 -> 0.3.0 2014-07-29 00:15:53 +02:00
Peter Simons
bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Cillian de Róiste
ab7349711b Add Shotcut: A free, open source, cross-platform video editor
Includes a patch which has already been applied upstream:
mltframework/shotcut#31
2014-07-27 12:53:57 +02:00
Cillian de Róiste
2723681a59 Kdenlive: 0.9.6 -> 0.9.8, add frei0r plugins, add myself to the maintainers 2014-07-27 12:53:56 +02:00
Bjørn Forsman
f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
Vladimír Čunát
b9045a7d96 Merge branch 'x-updates' into staging
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Vladimír Čunát
923bf0a3ff mpv: major update, incl. build fix with new ffmpeg
CC @AndersonTorres. The real build fix is in previous minor updates,
but I see no reason not to have the major updates as well.
2014-07-21 10:05:50 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Bjørn Forsman
4a5cf73caa cinelerra: don't repeat package name in meta.description 2014-06-22 22:49:32 +02:00
Domen Kožar
fb9c0d53b2 xbmc: 13.0 -> 13.1 2014-06-09 20:42:57 +02:00
Philip Lykke Carlsen
e87da7761a subtitleeditor, gstreamermm: new packages 2014-06-03 22:00:47 +02:00
Vladimír Čunát
97b9deaca5 Merge #2487: add handbrake and update/patch dependents 2014-05-27 21:08:51 +02:00
Vladimír Čunát
48458b1c96 handbrake: disable unfree faac, as it doesn't build with it 2014-05-27 21:07:59 +02:00
Vladimír Čunát
8e9ead8656 berlios.de probably shut down, replace it
The shutdown was announced years ago, only now it stopped working.
2014-05-18 13:30:27 +02:00
Vladimír Čunát
137eae0b55 Merge #2630: add and use fetchpatch
fetchpatch is fetchurl that determinizes the patch.
Some parts of generated patches change from time to time, e.g. see #1983 and
http://comments.gmane.org/gmane.linux.distributions.nixos/12815
Using fetchpatch should prevent the hash from changing.

Conflicts (auto-solved):
	pkgs/development/libraries/haskell/gitit/default.nix
2014-05-17 07:31:03 +02:00
AndersonTorres
64948222ba Aegisub: update to 3.1.3 (close #2550)
New dependencies: icu, intltool, boost (default = 1.55), wxGTK 3.0
Fixes a bug on Boost detection
@vcunat: minor refactoring.
2014-05-13 12:28:47 +02:00
Peter Simons
409de114d2 Merge pull request #2511 from AndersonTorres/aegisub-update
Aegisub: update to version 3.1.3
2014-05-05 10:52:45 +02:00
AndersonTorres
14152efc5f Aegisub: update to version 3.1.3 2014-05-04 23:53:56 -03:00
Domen Kožar
a9a3cbfae3 xbmc: 12.3 -> 13.0
- add support for vaapi, bluray
- depend on gnutls
- by default enable pulseaudio
2014-05-04 18:04:22 +02:00
Wout Mertens
d93b1f80c0 Add Handbrake 0.9.9: DVD ripper
This packaging splices off the unfree faac library and forces handbrake
to use the (more recent/patched) versions of libraries in Nixpkgs.
Produces the CLI HandbrakeCLI and optionally the GTK+ version ghb.
2014-05-04 01:56:49 +02:00
Mateusz Kowalczyk
6fa0f4f904 Bump mpv to 0.3.8 2014-04-25 18:59:50 +00:00
Eelco Dolstra
d304b277bd Silence some Hydra evaluation warnings 2014-04-24 15:40:55 +02:00
aszlig
396da20739
miro: Fix desktop schema GSettings path.
The real path of the schemas is:

$out/share/gsettings-schemas/gsettings-desktop-schemas-3.10.1/glib-2.0/schemas

While the previous approach was to load schemas from:

$out/share/glib-2.0/schemas

So, we're now relying on the setup hook of glib to find the right schema
path.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-22 10:32:54 +02:00
aszlig
65fcb8d503
miro: Fix parsing of youtube feeds.
Youtube feeds now don't append a "sig" query string argument anymore, so
all those feeds would fail without this patch. For the latter, a pull
request already exists on upstream at pculture/miro#428, so I guess we
can drop our patch upon release of the next new upstream bugfix release.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-22 06:14:01 +02:00
AndersonTorres
31a94915d2 mpv: minor updates and cleanup
E.g. parameterize lua.
2014-04-20 19:46:21 +02:00
AndersonTorres
193dd39d8c mpv: update to stable version 0.3.7
Also:
* minor waf update (reflecting bootstrap.py)
* lua5_sockets inclusion (not detected yet)
2014-04-20 19:46:21 +02:00
Michael Raskin
d31cf5329e Merge pull request #2075 from iyzsong/webkit
get rid of old webkit packages
2014-04-18 10:10:29 -07:00
Luca Bruno
82744e57d6 pitivi: fix gsettings schemas, depend upon gnome-desktop 2014-04-17 13:42:51 +02:00
Mathijs Kwik
3ada08785f avidemux: make faacSupport optional 2014-04-10 11:57:20 +02:00
Evgeny Egorochkin
5d34b323a5 mpv: update from 0.3.2 to 0.3.7 2014-04-03 10:46:02 +03:00
ambrop7@gmail.com
0b1e408b6b vlc: Build with VDPAU support (close #2096) 2014-04-02 23:14:18 +02:00
宋文武
ede097adcb miro: build with webkitgtk2 2014-04-01 11:11:46 +08:00
Shea Levy
1d0eb1ae47 Merge branch 'pitivi' of git://github.com/iyzsong/nixpkgs
add pitivi, gstreamer powered non-linear video editor
2014-03-29 00:43:36 -04:00
宋文武
96d78a2804 pitivi: fix icons 2014-03-27 11:01:24 +08:00
Cillian de Róiste
de3b5b4500 Add simplescreenrecorder: an excellent screen recorder for linux 2014-03-26 23:02:33 +01:00
Matej Cotman
13bc37ed3e vlc: ncurses support (close #2012) 2014-03-23 20:21:16 +01:00
宋文武
6a981b5141 add pitivi 0.93 2014-03-22 23:09:39 +08:00
Peter Simons
ceb7673bf0 Fix broken references to 'maintainers' attribute set. 2014-03-22 10:01:42 +01:00
Peter Simons
57db4ba855 Merge pull request #1998 from AndersonTorres/master
Maintainer and license modifications for some packages
2014-03-22 09:01:07 +01:00
AndersonTorres
f7498e5a7e Adding info about maintainer (myself - AndersonTorres) and modifying the meta.license field for some packages I have made. 2014-03-22 01:12:48 -03:00
Domen Kožar
d4b1250b6c remove prefix for kazam 2014-03-18 18:23:13 +01:00
Domen Kožar
e9f3199973 add gstreamer 1.0 setup-hook and use it where appropriate 2014-02-28 02:03:07 +01:00
Evgeny Egorochkin
d380290640 vlc: update from 2.1.3 to 2.1.4 2014-02-27 18:35:34 +02:00
Domen Kožar
65a34b7f85 add kazam 2014-02-27 16:37:35 +01:00
Domen Kožar
dfa8ac64ad miro: keep quotes 2014-02-20 01:19:16 +01:00
Domen Kožar
fae6079a01 adopt rest of the packages that were failing with the buildPythonPackage changes 2014-02-20 01:19:15 +01:00
Moritz Ulrich
c7eb4982f3 vlc: update from 2.1.2 to 2.1.3 2014-02-16 16:35:35 +01:00
Cillian de Róiste
3250375f20 Remove dvswitch: I don't use it, and it's broken 2014-02-16 01:19:16 +01:00
James Cook
6e6351a376 Merge remote-tracking branch 'official/master' into firefox_27 2014-02-07 17:31:54 -08:00
James Cook
8ef2cadca4 gnash: Hack to define nullptr as NULL, since some included mozilla headers seem to want nullptr 2014-02-07 17:28:02 -08:00
Vladimír Čunát
11914108aa gnash: fix CVE-2012-1175 by upstream patch 2014-02-06 20:33:53 +01:00
Evgeny Egorochkin
37b1c1481b bangarang: fix build with gcc 4.7 2014-02-02 07:43:56 +02:00
Petr Rockai
f88de3b091 quvi: Update the CLI tool to version 0.9.5. 2014-01-28 22:08:02 +01:00
Petr Rockai
5878ffa55b quvi: Update to current upstream (0.9.4). 2014-01-28 21:48:52 +01:00