mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 14:11:36 +00:00
Code Issues Wiki Activity
53744 commits 346 branches 124 tags 6.9 GiB
Commit graph

476 commits

Author SHA1 Message Date
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
Lluís Batlle i Rossell cb35bf15a4 ffmpeg: adding gnutls support 
I also take out the useless 'openssl' I added by error to mpv.
 2014-01-15 17:04:14 +01:00
Lluís Batlle i Rossell f046d9bd08 mpv: updating to 0.3.2. 2014-01-15 16:40:04 +01:00
William A. Kennington III b05d8d8310 vlc: Update from 2.1.1 -> 2.1.2 2013-12-29 21:35:01 +01:00
Domen Kožar 5603e611a7 xbmc: 12.2 -> 12.3 2013-12-29 17:53:40 +01:00
AndersonTorres 378f962c0e Aegisub: New Package 
Adding Aegisub: an advanced movie subtitle editor
 2013-12-25 22:24:19 +01:00
Mathijs Kwik 56cf3c115f mplayer2: upgrade to git 04/28 2013-12-23 10:21:19 +01:00
Nixpkgs Monitor ab32224e7b smplayer: update from 0.8.5 to 0.8.6 2013-12-23 05:19:26 +02:00
Lluís Batlle i Rossell a7a7e414f0 Updating mpv, and making it use ffmpeg_2 2013-12-22 19:00:05 +01:00
AndersonTorres e34aea6178 It is a first try to an expression for MPV video player. 
It certainly needs a bit of improvement and testing, but it works
nicely - so it's a good time to put it to the great public!
 2013-12-14 20:47:05 +01:00
AndersonTorres ed05981c8a It is a first try to an expression for MPV video player. 
It certainly needs a bit of improvement and testing, but it works
nicely - so it's a good time to put it to the great public!
 2013-12-14 19:46:30 +01:00
Chong Li 0e18b7cd97 Switched xbmc to pythonFull. Fixes python plugin errors. 2013-12-12 16:52:09 +01:00
Domen Kožar c1df906704 vlc: specify meta.platforms 2013-12-08 19:19:11 +01:00
Domen Kožar 32cd0be64c vlc: add mkv support 2013-12-08 19:18:59 +01:00
Nixpkgs Monitor 67f41be3dd keymon: update from 1.13 to 1.16 2013-12-04 06:44:19 +02:00
Vladimír Čunát ac6bc8c990 vlc: minor update 2.1.0 -> .1 2013-11-14 22:57:26 +01:00
Domen Kožar 2099a81487 xawtv: 3.95 -> 3.103 
- package now builds on linux
- added linux platforms
- removed patches
 2013-11-10 17:57:58 +01:00
Lluís Batlle i Rossell 1045df3197 Updating mkvtoolnix, libebml, libmatroska to latest versions. 2013-11-05 23:20:27 +01:00
Eelco Dolstra a0e21fd1ca Mark more packages as broken 2013-11-04 21:11:00 +01:00
aszlig df4a3cc9f9
miro: New package, version 6.0. 
I actually had this breeding in my nixpkgs overrides for a year and only
recently took the time to fix it and thus revive my video feeds :-)

The package uses a patch which is removing the dependency on gconf and
switches to storage within a shelve in ~/.miro/config instead.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-10-28 20:48:50 +01:00
Bjørn Forsman 083d0890f5 More description fixes 
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
 2013-10-06 12:01:38 +02:00
Domen Kožar b7b79e7000 xbmc: enable webserver 2013-09-29 21:17:26 +02:00
Mathijs Kwik d61285e658 upgrade gpac to more up-to-date svn 2013-09-28 22:00:03 +02:00
Domen Kožar 71d19afafd vlc: 2.0.8a -> 2.1.0 2013-09-26 16:37:58 +02:00
Peter Simons 682faad1a7 Merge pull request #987 from oxij/mplayer-fontconfig 
mplayer: add fontconfig support
 2013-09-18 08:08:24 -07:00
Jonas Hoersch 786ff721c8 vlc: update to version 2.0.8a 
this new release together with an updated ffmpeg solves segfaults
errors, i was having for some videos.
 2013-09-16 07:08:43 +02:00
Jan Malakhovski afcda36c46 mplayer: add fontconfig support 2013-08-26 19:16:18 +00:00
Jonas Hoersch e72c2ddee4 vlc: update to version 2.0.8 2013-08-19 22:03:54 +02:00
Evgeny Egorochkin cea107c07f More mirror:// URL fixes 2013-07-14 03:31:12 +03:00
Peter Simons 2eb36d2a7a Merge pull request #669 from iyzsong/kmplayer 
kmplayer: update to 0.11.3d
 2013-07-01 02:54:13 -07:00
Eelco Dolstra acba9240cd nixos.org/tarballs -> tarballs.nixos.org 
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
 2013-06-25 14:12:16 +02:00
Rickard Nilsson 97bf9fbbc8 xbmc: Make it read /etc/zoneinfo 2013-06-25 12:20:10 +02:00
Song Wenwu f305fe1c02 kmplayer: minor fixes 
Wrap mplayer into PATH
Remove unneeded dependency on gtk
 2013-06-25 07:32:04 +08:00
Song Wenwu 4cad420d5c smplayer: add platform and set license to stdenv.lib.licenses.gpl3Plus 2013-06-23 21:26:43 +08:00
Song Wenwu 48e1e1cae6 add smplayer 0.8.5 2013-06-23 17:48:21 +08:00
Song Wenwu c74b3e26f7 kmplayer: update to 0.11.3d 2013-06-23 14:53:18 +08:00
Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
 2013-06-13 17:12:43 +04:00
Vladimír Čunát f724a5314b flac: update, enable tests 
Fix includes in VLC.
Tried a few other programs using it, seems fine.
 2013-06-11 15:48:42 +02:00
Vladimír Čunát 7af694700c Merge branch 'master' into x-updates 
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
 2013-06-05 12:59:47 +02:00
Vladimír Čunát 341aadaba1 kdenlive+mlt: enabling some subcomponents, parallel builds 2013-06-05 00:30:44 +02:00
Vladimír Čunát b770365574 ReRevert Merge x-updates into master 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
 2013-05-29 23:25:02 +02:00
Domen Kozar afe180f74c xbmc: 12.1 -> 12.2 2013-05-26 20:53:20 +02:00
aszlig b08d6a39f8
mplayer(2): Add support and library for bs2b. 
This also adds a new package "libbs2b", which is needed in order to support
Bauer stereophonic-to-binaural DSP as an audio filter.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-05-25 19:01:43 +02:00
Vladimír Čunát ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates 
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
 2013-05-08 13:46:46 +02:00
Lluís Batlle i Rossell ce7c7dece5 kdenlive: update to 0.9.6 2013-05-07 12:19:38 +02:00
Vladimír Čunát 8fc5fb6ecc Merge branch 'master' into x-updates 2013-05-01 08:14:15 +02:00
Mathijs Kwik 2f036a21d7 mkvtoolnix: upgrade to 6.2.0 2013-04-30 09:27:02 +02:00
Vladimír Čunát 5fce03c561 gnash: fix build via using pangox_compat 2013-04-18 11:28:03 +02:00
Mathijs Kwik ca392fb8a9 vlc: upgrade to 2.0.6 2013-04-12 11:40:33 +02:00
Lluís Batlle i Rossell d8f98d1a85 Adding avxsynth. 
To add it, I also add ffms and log4cpp.
 2013-04-10 15:12:37 +02:00
Mathijs Kwik fd76305a9b vlc: enable support for the opus codec 2013-04-08 08:38:10 +02:00
Lluís Batlle i Rossell 48f534bce9 mplayer2: add reference to libXxf86vm 
Otherwise, playing h264 with vdpau complains about not able to sync to vsync.
 2013-04-05 10:45:03 +02:00
Lluís Batlle i Rossell d0d4e66652 ffmpeg: update to 1.2 (and patching mplayer2) 
Simple patch required by mplayer2 to build with ffmpeg 1.2.
 2013-04-04 23:07:23 +02:00
Domen Kozar 16672fc8b1 xbmc: add pulse support, lame, avahi, libdvdcss 2013-04-01 17:13:00 +02:00
Lluís Batlle i Rossell a76a9f783e Adding omxplayer, for the raspberrypi. 2013-03-29 21:54:29 +01:00
Domen Kozar 65057975c8 xbmc: bump to 12.1 2013-03-28 17:21:20 +01:00
Domen Kozar acf4697a5f upgrade xbmc to 12.0 2013-03-12 01:35:16 +01:00
Domen Kozar 65a4f741fd Set platform and maintainer for xbmc pkg 2013-03-11 18:12:46 +01:00
Shea Levy e13c058fd2 Merge branch 'makemkv.130223.0' of git://github.com/jcumming/nixpkgs 
This adds the proprietary makemkv package to convert dvd and blu-ray
videos to mkv.

I've tested that it builds, nothing more.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-08 17:26:53 -05:00
Eelco Dolstra 674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Mathijs Kwik 45aea0bf52 mkvtoolnix: upgrade to 6.1.0 2013-03-04 22:40:22 +01:00
Jack Cummings 58a9875789 missing semicolon, found after push.. 2013-03-01 01:26:19 -08:00
Sergey Mironov bd49c22ea1 mplayer: install desktop icon when X11 is enabled 2013-03-01 00:20:52 +04:00
Jack Cummings ae35f74dbe Add makemkv descriptions 2013-02-24 02:17:24 -08:00
Jack Cummings dbc343c49a makemkv-1.8.0 2013-02-23 19:37:16 -08:00
Domen Kozar 6506f9b070 add nasm to xbmc dependencies 2013-02-16 23:23:15 +01:00
Eelco Dolstra a25b27a7f8 buildNativeInputs -> nativeBuildInputs 2013-02-15 13:38:07 +01:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Lluís Batlle i Rossell 6ee6cd5ec9 Updates: kdenlive-0.9.4 mlt-0.8.8 
Upstream kdenlive suggests mlt-0.8.8.
 2013-02-14 20:06:54 +01:00
Lluís Batlle i Rossell 511f3b7a61 Adding mplayer2, a mplayer fork. 
It can play files very well with "vdpau". It has a reworked
vdpau pipeline compared to mplayer1. Mplayer1 fails to play well in
my computer.
 2013-01-31 00:26:30 +01:00
Eelco Dolstra ecee1be7f1 RealPlayer: Remove 
This package hasn't built in ages, is unfree, and is not needed
anymore.
 2013-01-28 16:31:23 +01:00
Rickard Nilsson 0e8f9adb07 xbmc: Add libvdpau to LD_LIBRARY_PATH, so xbmc can find it at runtime 2013-01-21 19:05:08 +01:00
Eelco Dolstra 5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Eelco Dolstra bb6db816fe mplayer: Disable use of unfree binary codecs by default 2013-01-14 23:08:27 +01:00
Eelco Dolstra f59881fc30 mplayer: Change directory name / attribute name from MPlayer to mplayer 2013-01-14 14:38:24 +01:00
Vladimír Čunát 479b58d706 Update vlc (minor bugfix). 2013-01-14 12:21:22 +01:00
Jan Malakhovski 4b041ea0b7 xbmc: add version 11 2013-01-05 23:33:50 +01:00
Lluís Batlle i Rossell b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates 
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
 2012-12-28 23:28:16 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Mathijs Kwik 6776756882 mkvtoolnix: upgrade to 5.9.0 2012-12-13 14:00:28 +01:00
Mathijs Kwik d4d4528833 new package: GPAC 2012-12-01 12:23:23 +01:00
Mathijs Kwik 4c8d63d549 mkvtoolnix: upgrade to 5.8.0 2012-12-01 12:23:23 +01:00
Eelco Dolstra 5553546c21 Remove a bunch of unreferenced files 
Plus a small number of obsolete packages (like old versions of qemu).
 2012-11-29 13:43:37 +01:00
Cillian de Róiste 27f3a41754 Add key-mon 
a utility to show live keyboard and mouse status for teaching and screencasts
 2012-11-11 18:13:04 +01:00
Mathijs Kwik 977337716a dvdauthor: upgrade to 0.7.1 2012-11-08 10:41:22 +01:00
Michael Raskin 6c48c3c230 Add libpng dependency to MPlayer - screenshots now work 2012-11-04 21:58:13 +04:00
Eduard Carreras 76d8f6b7be VLC: update to v2.0.4 2012-10-19 18:57:19 +02:00
Eelco Dolstra c1719a5835 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-05 17:57:45 -04:00
Mathijs Kwik e3ae9289e0 MPlayer: upgrade to 1.1 
- big cleanup of optional dependency handling
I hope I didn't miss any cases.

- XVID
xvid support seams broken, both built-in as external.
I didn't notice any issues playing xvid video's though, as ffmpeg's
default mpeg4 decoder handles xvid-encoded files just fine.
It seems the only users affected by this are users who still encode
xvid with mencoder (instead of plain ffmpeg). If this really is an
issue to anyone, please let me know, so I can look into it some more,
or retain an older mplayer version next to this one.
 2012-10-04 10:40:52 +02:00
Eelco Dolstra d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates 
Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix
 2012-09-26 14:51:51 -04:00
Yury G. Kudryashov db81ec4242 bangarang-2.1 2012-08-31 12:09:38 +04:00
Yury G. Kudryashov 834884ae7b Explicitly pass SDO 2012-08-31 12:09:11 +04:00
Lluís Batlle i Rossell 184ea61eb6 vlc: updating to 2.0.3 
I hadd problems with how 2.0.1 disabled and reenabled DPMS on xorg. Let's see
if anything improves with 2.0.3.
 2012-07-28 22:47:15 +02:00
Florian Friesdorf 471a9615a2 fix mpich2 and mplayer 2012-07-24 14:17:45 +02:00
Shea Levy 1a0baad6b2 Update some (seemingly very old) packages that hard-coded the path to make-wrapper.sh 2012-07-15 03:32:50 -04:00
Lluís Batlle i Rossell 8a764b7891 xine-ui: update to 0.99.7 2012-07-02 23:04:12 +02:00
Mathijs Kwik 42ea23675e ogmtools: new package 2012-06-28 11:41:58 +02:00
Mathijs Kwik b40092010c mkvtoolnix: upgraded to 5.6.0 
svn path=/nixpkgs/trunk/; revision=34465
 2012-06-11 17:40:55 +00:00
Cillian de Roiste da4c1e38fd Removed patch, no longer necessary 
svn path=/nixpkgs/trunk/; revision=34363
 2012-06-05 17:50:22 +00:00
Cillian de Roiste 1067f51f92 Updating Kdenlive to 0.9.2, and also updating mlt to 0.8.0 since it's a dependency 
svn path=/nixpkgs/trunk/; revision=34362
 2012-06-05 16:52:11 +00:00
Mathijs Kwik aac9492dde mplayer: enabled speex support 
I enabled it by default, as ffmpeg/libav/vlc/xine all have speex enabled by
default too, so it's probably on most systems already

svn path=/nixpkgs/trunk/; revision=34024
 2012-05-09 10:01:35 +00:00
Lluís Batlle i Rossell 97abdd38a5 Adding the Allied Technologies libdc1394 variant and the cc1394 viewer. 
svn path=/nixpkgs/trunk/; revision=34013
 2012-05-08 09:50:58 +00:00
Lluís Batlle i Rossell 9b2efc0a33 Adding support in VLC for 1394 cameras. 
svn path=/nixpkgs/trunk/; revision=34012
 2012-05-08 09:49:38 +00:00
Lluís Batlle i Rossell 593eeb54d0 Fixing a typo, semicolon, in the coriander expression. 
svn path=/nixpkgs/trunk/; revision=33980
 2012-05-03 12:07:45 +00:00
Lluís Batlle i Rossell 6209407d7a Adding the license meta for two packages I added today. 
svn path=/nixpkgs/trunk/; revision=33977
 2012-05-03 09:41:11 +00:00
Lluís Batlle i Rossell f9526cd7f1 Adding coriander. I don't know how to make its gconf thing work, so it shows a 
warning at gui start.


svn path=/nixpkgs/trunk/; revision=33976
 2012-05-03 09:38:36 +00:00
Karn Kallio 2dbe2887ed Fix build of dvdauthor; also advance version to 0.7.0 
svn path=/nixpkgs/trunk/; revision=33873
 2012-04-22 00:25:20 +00:00
Lluís Batlle i Rossell e7b964ba33 Updating gnash. I'm not sure it builds... it takes a lot of time to build; at 
least it does not fail very early.


svn path=/nixpkgs/trunk/; revision=33635
 2012-04-05 22:34:11 +00:00
Mathijs Kwik a6238bce68 avidemux: upgraded to 2.5.6 
- added support for vp8 (libvpx)
- added support for xvid
- added support for libva output

svn path=/nixpkgs/trunk/; revision=33447
 2012-03-28 08:40:41 +00:00
Cillian de Roiste 9810e6110f Upgrading to 2.0.1, bugfix for smb error. Thanks to Kirill Elagin 
svn path=/nixpkgs/trunk/; revision=33398
 2012-03-24 19:52:46 +00:00
Yury G. Kudryashov 707bf75144 mythth-0.24.2 
New dependencies:
* Qt4
* Pulseaudio (optional but I've hardcoded it)
* fftw (single precision)

svn path=/nixpkgs/trunk/; revision=33180
 2012-03-16 22:26:26 +00:00
Yury G. Kudryashov fe1115caf4 Make nixpkgs ready for gst_all attrset removal 
svn path=/nixpkgs/trunk/; revision=33092
 2012-03-14 22:44:52 +00:00
Yury G. Kudryashov a38ba26fbe cinelerra: drop esound support 
I'm going to remove esound from nixpkgs in a few minutes.

svn path=/nixpkgs/trunk/; revision=32981
 2012-03-11 14:07:19 +00:00
Yury G. Kudryashov eb81f33244 Remove zapping, zvbi and rte 
Feel free to revert&fix compile if you need these packages.

svn path=/nixpkgs/trunk/; revision=32966
 2012-03-09 20:16:02 +00:00
Joachim Schiele 92c04c80c7 tvtime is now on nixos, thanks to the patches taken from the portage team! 
svn path=/nixpkgs/trunk/; revision=32962
 2012-03-09 18:21:10 +00:00
Lluís Batlle i Rossell 749df87304 Removing a patch not needed anymore, for vlc. 
svn path=/nixpkgs/trunk/; revision=32856
 2012-03-07 20:36:42 +00:00
Yury G. Kudryashov 57fd764a39 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
 2012-03-05 10:00:23 +00:00
Yury G. Kudryashov 3652c61aed svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32522
 2012-02-23 20:35:33 +00:00
Yury G. Kudryashov 38e3d7bc86 svn merge ^/nixpkgs/trunk 
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
 2012-02-23 20:06:21 +00:00
Peter Simons e91b090577 upgraded vlc to 2.0 - with bluray support 
svn path=/nixpkgs/trunk/; revision=32487
 2012-02-22 20:29:33 +00:00
Eelco Dolstra 8dc12887e1 * Fix building VLC with zlib 1.2.6. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32385
 2012-02-18 17:23:17 +00:00
Yury G. Kudryashov e5027e5b36 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
 2012-02-16 15:02:26 +00:00
Yury G. Kudryashov 070874c5f1 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32321
 2012-02-16 11:23:36 +00:00
Eelco Dolstra 848f583ba3 * VLC: build with xcb-util-keysyms instead of xcb-util, otherwise the 
keyboard doesn't work properly.  (xcb-util-keysyms was split from
  xcb-util.)

svn path=/nixpkgs/trunk/; revision=32300
 2012-02-15 15:42:59 +00:00
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk 
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
 2012-02-06 23:03:12 +00:00
Yury G. Kudryashov df037ddafd svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31987
 2012-02-02 20:36:11 +00:00