Commit graph

414 commits

Author SHA1 Message Date
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