Commit graph

19091 commits

Author SHA1 Message Date
Yury G. Kudryashov 5299c1f6fb svn merge ^/nixpkgs/trunk
- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
2012-03-31 20:01:40 +00:00
Yury G. Kudryashov d789eb6a05 Fix gnome-doc-utils
svn path=/nixpkgs/trunk/; revision=33499
2012-03-31 19:50:54 +00:00
Shea Levy 5f01a1d8b6 Let virtualbox build on linux 3.3+
svn path=/nixpkgs/trunk/; revision=33498
2012-03-31 15:57:35 +00:00
Shea Levy 7f5520bfba Update btrfsProgs
svn path=/nixpkgs/trunk/; revision=33497
2012-03-31 14:51:36 +00:00
Lluís Batlle i Rossell 45b546c83d It looks like libreoffice was still providing a catalan interface for en_US
locale users.
I was told en_US was always included, but it seems like not so.


svn path=/nixpkgs/trunk/; revision=33496
2012-03-31 13:53:34 +00:00
Lluís Batlle i Rossell 3153e80659 Adding tp_smapi.
Patch by Rok Garbas, who also adds himself as a maintainer.


svn path=/nixpkgs/trunk/; revision=33495
2012-03-31 13:40:34 +00:00
Shea Levy 938ba8c526 man-pages-3.38
svn path=/nixpkgs/trunk/; revision=33493
2012-03-30 19:31:57 +00:00
Yury G. Kudryashov 3f44fb8f2f Drop telepathy-farsight
It is not used, and it is deprecated by telepathy-farstream.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33491
2012-03-30 12:28:50 +00:00
Cillian de Roiste cbb7aef23c Fixing the url (Thanks to Shea Levy)
svn path=/nixpkgs/trunk/; revision=33490
2012-03-30 10:38:07 +00:00
Michael Raskin a6b434974b Fixing how bzip2 is passed to nixCustom
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33489
2012-03-30 10:18:25 +00:00
Yury G. Kudryashov 6eb45d767f telepathy-qt: farsight -> farstream
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33488
2012-03-30 09:03:35 +00:00
Peter Simons 9db8eaac7f Updated Haskell packages.
- SHA: updated to version 1.5.0.1
 - bmp: updated to version 1.2.1.1

svn path=/nixpkgs/trunk/; revision=33487
2012-03-30 08:27:56 +00:00
Michael Raskin 19320cf6cc Updating autogen - builds now
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33485
2012-03-30 07:32:54 +00:00
Michael Raskin d388527f21 Update ripmime; builds now
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33484
2012-03-30 05:30:09 +00:00
Michael Raskin ba2343ba12 Update Squid-3.2; builds now
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33483
2012-03-30 05:21:56 +00:00
Shea Levy b7f90b3406 libicns claims it can use openjpeg at build time, but at run time says it's not supported. Use jasper instead
svn path=/nixpkgs/trunk/; revision=33482
2012-03-30 01:42:13 +00:00
Shea Levy ef084be97b Add libicns
svn path=/nixpkgs/trunk/; revision=33481
2012-03-30 01:36:38 +00:00
Eelco Dolstra 5fd376da83 * Update nixUnstable.
svn path=/nixpkgs/trunk/; revision=33480
2012-03-29 22:10:24 +00:00
Peter Simons a39f417ad7 Updated Haskell packages.
- RSA: updated to version 1.0.6.3
 - derive: updated to version 2.5.7
 - hakyll: updated to version 3.2.7.0
 - happstack-hamlet: updated to version 7.0.0
 - idris: updated to version 0.9.2.1

svn path=/nixpkgs/trunk/; revision=33479
2012-03-29 20:52:37 +00:00
Yury G. Kudryashov f943cf8d81 nut-2.6.3: add freeipmi support
svn path=/nixpkgs/trunk/; revision=33478
2012-03-29 20:44:20 +00:00
Yury G. Kudryashov c6c798df43 Add nut-2.6.3 without HAL support
I'm not a nut user, so I didn't touch the default nut expression, and set
meta.priority to 10.

svn path=/nixpkgs/trunk/; revision=33477
2012-03-29 19:01:42 +00:00
Yury G. Kudryashov 0ad6c091e7 pam_usb: drop hal dependency
It doesn't use hal, though many functions are named *_hal_*. All d-bus calls
actually ask UDisks.

svn path=/nixpkgs/trunk/; revision=33476
2012-03-29 18:02:10 +00:00
Yury G. Kudryashov ce85d430bc Batch update telepathy-related packages
Some of these packages need glib-2.30.x, so I commit it to this branch.

Add sofia-sip and telepathy-rakia.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33475
2012-03-29 16:33:32 +00:00
Shea Levy 742894471d Add rEFInd
svn path=/nixpkgs/trunk/; revision=33474
2012-03-29 14:54:17 +00:00
Yury G. Kudryashov ded7dae81d glibmm-2.30.1
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33473
2012-03-29 14:29:54 +00:00
Yury G. Kudryashov e5fd55a954 glib-2.30.3
Build with system pcre.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33472
2012-03-29 14:29:50 +00:00
Peter Simons c031fccf5e Dropped obsolete Haskell packages.
- convertible-text: deprecated by author
 - failure: obsolete version 0.1.2
 - attempt: obsolete version 0.3.1.1

svn path=/nixpkgs/trunk/; revision=33470
2012-03-29 11:17:31 +00:00
Peter Simons d5b7235de1 Updated Haskell packages.
- blaze-html: updated to version 0.4.3.3
 - failure: updated 0.2.0.1
 - resourcet: updated to version 0.3.2
 - zlib-bindings: updated to version 0.1.0.1

svn path=/nixpkgs/trunk/; revision=33469
2012-03-29 11:17:28 +00:00
Yury G. Kudryashov a0474636d4 Remove some unused files
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33468
2012-03-29 10:34:47 +00:00
Michael Raskin 3decf956d4 Porting a fix from nixpkgs trunk - vimprobable2 now builds (against obsolete WebKit/GTK2)
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33467
2012-03-29 10:30:47 +00:00
Yury G. Kudryashov 3c72ac97eb Fix typo
svn path=/nixpkgs/trunk/; revision=33466
2012-03-29 10:17:40 +00:00
Ludovic Courtès a2c6280413 gfortran: Attempt to use Apple's GCC on Darwin.
svn path=/nixpkgs/trunk/; revision=33465
2012-03-29 09:20:15 +00:00
Rob Vermaas 076946d277 add fortune
svn path=/nixpkgs/trunk/; revision=33462
2012-03-29 07:15:40 +00:00
Yury G. Kudryashov ec15b98631 Add memcached
Patch by Corey O'Connor, see http://reviewboard.loegria.net/r/15/

svn path=/nixpkgs/trunk/; revision=33461
2012-03-28 22:30:13 +00:00
Lluís Batlle i Rossell 3551d159d8 Updating the JDK6 to u32b03 due to some important security fix.
http://www.h-online.com/open/news/item/Critical-Java-hole-being-exploited-on-a-large-scale-1485681.html


svn path=/nixpkgs/trunk/; revision=33460
2012-03-28 20:42:54 +00:00
Lluís Batlle i Rossell 33e42bdd8e Removing usernixos from nixpkgs trunk.
I placed a repository starting at this same svn content removed at:
http://viric.name/cgi-bin/usernixos


svn path=/nixpkgs/trunk/; revision=33459
2012-03-28 20:18:56 +00:00
Yury G. Kudryashov a87c8d9bee Add telepathy-logger
svn path=/nixpkgs/trunk/; revision=33457
2012-03-28 19:23:42 +00:00
Yury G. Kudryashov 613a8ecaf9 Remove some trailing spaces
svn path=/nixpkgs/trunk/; revision=33456
2012-03-28 15:43:39 +00:00
Yury G. Kudryashov defd86049c Merge ^/nixpkgs/trunk.
This merge leads to a big rebuild, but this wouldn't hurt as I'm going to
reintegrate this branch soon.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455
2012-03-28 15:42:42 +00:00
Yury G. Kudryashov 49b7f13128 Upgrading dssi to 1.1.1 (cherry-pick trunk@33360)
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33454
2012-03-28 15:11:50 +00:00
Peter Simons db8f709430 Updated Haskell packages.
- derp: updated to version 0.1.6
 - happstack-server: updated to version 6.6.5
 - hlint: updated to version 1.8.26

svn path=/nixpkgs/trunk/; revision=33453
2012-03-28 13:49:20 +00:00
Peter Simons e94fd0e83c all-packages.nix: stripped trailing whitespace
svn path=/nixpkgs/trunk/; revision=33452
2012-03-28 13:49:16 +00:00
Peter Simons b575fa1259 all-packages.nix: removed virtmanager and virtinst attributes, which point to non-existent files
svn path=/nixpkgs/trunk/; revision=33451
2012-03-28 13:49:14 +00:00
Joachim Schiele 37e67f9888 wgetpaste is a handy shell utility getting things pasted on pasting services online
svn path=/nixpkgs/trunk/; revision=33450
2012-03-28 13:21:42 +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
Lluís Batlle i Rossell 6d23fe4501 Adding meta to busybox, and setting me as maintainer, and asking hydra to build it.
svn path=/nixpkgs/trunk/; revision=33446
2012-03-27 22:05:03 +00:00
Lluís Batlle i Rossell 68b5044cc0 Adding 'usernixos', where I start a modular kind-of-nixos that can go into
"nix-env -i" profiles, as a container for flexible configuration at the style
of nixos, to be defined in .nixpkgs/config.nix, with the main target of
generating an activation script.


svn path=/nixpkgs/trunk/; revision=33445
2012-03-27 20:33:49 +00:00
Shea Levy db28c68df0 mkDerivation handles propagatedUserEnvPkgs properly now
svn path=/nixpkgs/trunk/; revision=33444
2012-03-27 15:20:37 +00:00
Shea Levy 092487c1fb Update rubygems
svn path=/nixpkgs/trunk/; revision=33443
2012-03-27 15:14:13 +00:00
Eelco Dolstra a0f057e805 * Updated jdiskreport.
svn path=/nixpkgs/trunk/; revision=33440
2012-03-27 11:31:25 +00:00