nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-26 07:34:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,125 Commits 198 Branches 125 Tags 9 GiB
b52336f242
Commit Graph

6940 Commits

Author SHA1 Message Date
Shea Levy
50a0b839af Linux 3.3.3 
This incorporates the btrfs fix, so remove that patch. Also, I will test
that this builds after committing, and fix it if it fails

svn path=/nixpkgs/trunk/; revision=33885
 2012-04-23 00:12:47 +00:00
Cillian de Roiste
bf3b6be157 Adding Piano Booster, a MIDI file player that teaches you how to play the piano. 
svn path=/nixpkgs/trunk/; revision=33880
 2012-04-22 16:55:12 +00:00
Eelco Dolstra
d0300a2776 * Switch to QEMU/KVM 1.0.1. 
svn path=/nixpkgs/trunk/; revision=33878
 2012-04-22 16:30:27 +00:00
Karn Kallio
1097d76801 Fix download URL for Perl Graph package. 
svn path=/nixpkgs/trunk/; revision=33871
 2012-04-21 20:23:00 +00:00
Lluís Batlle i Rossell
2eb8304fcf Adding ntop. It runs for me, if using "-P directory". 
svn path=/nixpkgs/trunk/; revision=33870
 2012-04-21 15:04:46 +00:00
Cillian de Roiste
6264f9cd91 Adding qsampler, the frontend for LinuxSampler 
svn path=/nixpkgs/trunk/; revision=33867
 2012-04-20 22:44:50 +00:00
Cillian de Roiste
45ac14621a Adding LinuxSampler and dependencies, using SVN version for SFZ support 
svn path=/nixpkgs/trunk/; revision=33865
 2012-04-20 20:39:42 +00:00
Andres Löh
8915da0a6b New GHC snapshots. 
svn path=/nixpkgs/trunk/; revision=33858
 2012-04-20 12:22:23 +00:00
Peter Simons
6242869b9d haskell-edit-distance: added version 0.2.1 
svn path=/nixpkgs/trunk/; revision=33855
 2012-04-20 11:35:17 +00:00
Peter Simons
8691ff4ea1 Updated Haskell packages. 
- certificate: updated to version 1.2.1
 - crypto-api: updated to version 0.10.1
 - crypto-conduit: patched to build crypto-api 0.10.x
 - http-conduit: updated to version 1.4.1.2
 - http-enumerator: deleted obsolete package
 - MonadCatchIO-transformers: updated to version 0.3.0.0
 - pem: updated to version 0.1.1
 - RSA: updated to version 1.2.0.0
 - skein: updated to version 0.1.0.5
 - snap-core: patched to support MonadCatchIO-transformers version 0.3.0.0
 - snap-server: patched to support MonadCatchIO-transformers version 0.3.0.0
 - tagged: updated to version 0.4.2
 - tls-extra: updated to version 0.4.5
 - tls: updated to version 0.9.3
 - yesod-auth: updated to version 1.0.1
 - yesod: updated to version 1.0.1.1

svn path=/nixpkgs/trunk/; revision=33839
 2012-04-19 11:16:36 +00:00
Peter Simons
7762bb93ee Updated Haskell packages. 
- cabal-install: added support for version 0.14.0 to GHC 7.0.4, 6.12.3, and 6.10.4
 - crypto-conduit: updated to version 0.3.1
 - haskell-src-exts: updated to version 1.13.2
 - hjsmin: updated to version 0.1.0
 - persistent: updated to version 0.9.0.2
 - wai-extra: updated to version 1.2.0.3
 - wxdirect: updated to version 0.90.0.1
 - yesod-core: updated to version 1.0.1
 - yesod-default: updated to version 1.0.1
 - yesod-form: updated to version 1.0.0.2
 - yesod-routes: updated to version 1.0.1
 - yesod: updated to version 1.0.1

svn path=/nixpkgs/trunk/; revision=33838
 2012-04-19 10:22:03 +00:00
Eelco Dolstra
46ec48923b * Updated Cache::FastMmap etc. 
svn path=/nixpkgs/trunk/; revision=33820
 2012-04-17 20:39:09 +00:00
Peter Simons
b8a6e4d2dc haskell-cabal-install: added version 0.14.0 
svn path=/nixpkgs/trunk/; revision=33819
 2012-04-17 17:41:57 +00:00
Peter Simons
5b8103b57c wxHaskell: updated to version 0.90 based on wxGTK version 2.9.3 
- wx: updated to version 0.90
 - wxcore: updated to version 0.90
 - wxdirect: updated to version 0.90
 - wxc: this project contains no native Haskell code -- only C++ glue -- so we cannot run Haddock on it

svn path=/nixpkgs/trunk/; revision=33813
 2012-04-17 13:56:34 +00:00
Peter Simons
39c9ece183 wxGTK-2.9: updated the development version of wxGTK to 2.9.3 
I deleted older snapshots because my attempts to use 2.9.0 or 2.9.1 ran into
problems with our recent version of libpng. The 2.9.3 version seems to work
fine, though. If you still need the older versions, please feel free to
reinstate them.

svn path=/nixpkgs/trunk/; revision=33812
 2012-04-17 13:56:30 +00:00
Peter Simons
eec2c680c7 Updated Haskell packages. 
- HsOpenSSL: updated to version 0.10.3
 - RSA: downgraded to version 1.0.6.3
 - language-javascript: updated to version 0.5.1
 - maude: fixed build
 - pem: added version 0.1.0

svn path=/nixpkgs/trunk/; revision=33811
 2012-04-17 13:56:27 +00:00
Michael Raskin
f699257450 Adding blobby volleybal 
svn path=/nixpkgs/trunk/; revision=33810
 2012-04-17 13:06:12 +00:00
Lluís Batlle i Rossell
a01828abd5 Made mosh use boostHeaders, and not boost. A much lighter dependency, of great 
help on the Sheevaplug.

I'm not sure of the name 'boostHeaders' and 'boostHeaders149'. Changes welcome.


svn path=/nixpkgs/trunk/; revision=33806
 2012-04-16 22:16:38 +00:00
Lluís Batlle i Rossell
526b207211 Adding a headers-only version of boost. I wrote it in a new file, replicating 
the 'src', because to me this way looks simpler despite the copy of src..


svn path=/nixpkgs/trunk/; revision=33805
 2012-04-16 22:13:27 +00:00
Lluís Batlle i Rossell
682690bd71 Adding mosh. 
svn path=/nixpkgs/trunk/; revision=33804
 2012-04-16 21:44:12 +00:00
Peter Simons
d775e93f90 Updated Haskell packages. 
- HTTP: added version 4000.2.3
 - RSA: updated to version 1.2.0.0
 - RepLib: updated to version 0.5.2.1
 - conduit: updated to version 0.4.1.1
 - data-accessor: updated to version 0.2.2.2
 - deepseq-th: updated to version 0.1.0.3
 - explicit-exception: updated to version 0.1.7
 - ghc-mod: updated to version 1.10.15
 - gitit: updated to version 0.9.0.1
 - hakyll: updated to version 3.2.7.2
 - hjsmin: updated to version 0.0.16
 - http-conduit: updated to version 1.4.1
 - iteratee: updated to version 0.8.8.2
 - language-javascript: updated to version 0.5.0
 - reactive-banana: updated to version 0.5.0.1
 - repa: updated to version 3.1.1.1
 - rvar: updated to version 0.2.0.1
 - semigroups: updated to version 0.8.3
 - simple-sendfile: updated to version 0.2.3
 - storable-record: updated to version 0.0.2.5
 - unbound: updated to version 0.4.0.2
 - wxc: added version 0.90.0.2

svn path=/nixpkgs/trunk/; revision=33802
 2012-04-16 12:07:58 +00:00
Nicolas Pierron
7b7dd238fc Add dulwich (git filesystem in python). 
Add bugz (command line tool for bugzilla)
Add gitBz (bugzilla in git)

svn path=/nixpkgs/trunk/; revision=33800
 2012-04-15 23:48:11 +00:00
Nicolas Pierron
82b308bf11 Add armv7l support. 
svn path=/nixpkgs/trunk/; revision=33798
 2012-04-15 23:41:25 +00:00
Nicolas Pierron
6a9ac1f016 Add opentyrian game. 
svn path=/nixpkgs/trunk/; revision=33797
 2012-04-15 23:38:38 +00:00
Lluís Batlle i Rossell
163c7375a3 Adding a version of sqlite with more things, based on the upstream repository src. 
svn path=/nixpkgs/trunk/; revision=33788
 2012-04-14 21:40:55 +00:00
Eelco Dolstra
4d8e2180b5 * Set the channel name to "nixpkgs". 
svn path=/nixpkgs/trunk/; revision=33784
 2012-04-14 14:19:13 +00:00
Ludovic Courtès
cf250029e0 samba_light: Drop dependency on libunwind. 
svn path=/nixpkgs/trunk/; revision=33781
 2012-04-14 10:26:09 +00:00
Lluís Batlle i Rossell
713b7ecdbb Removing a commented patch that is not needed for kernels newer than 2.6.36 
iirc. The patch got upstream back then.


svn path=/nixpkgs/trunk/; revision=33778
 2012-04-13 17:52:29 +00:00
Michael Raskin
ef6bff049a GCL needs gmp4 
svn path=/nixpkgs/trunk/; revision=33770
 2012-04-13 05:40:05 +00:00
Michael Raskin
d34679a9db Extreme Tux Racer still requires libpng 1.2 
svn path=/nixpkgs/trunk/; revision=33769
 2012-04-13 05:32:12 +00:00
Eelco Dolstra
205dbbd991 * Update euca2ools. 
svn path=/nixpkgs/trunk/; revision=33762
 2012-04-12 14:16:23 +00:00
Michael Raskin
5cdb676ac7 Adding FSharp compiler 
svn path=/nixpkgs/trunk/; revision=33758
 2012-04-12 11:39:40 +00:00
Eelco Dolstra
7c2e04a8ff * Apply the CIFS timeout patch to Linux 3.2. 
svn path=/nixpkgs/trunk/; revision=33740
 2012-04-10 22:48:27 +00:00
Eelco Dolstra
e40f598035 * Change the default Linux kernel to 3.2, since 2.6.35 is old and 
unmaintained.

svn path=/nixpkgs/trunk/; revision=33737
 2012-04-10 21:46:08 +00:00
Lluís Batlle i Rossell
b35d2c6b89 Adding a patch for linux 3.3 for btrfs regarding ENOSPC. 
This should solve the problem I had, where I could not boot either 3.3 or 3.3.1
in my system, as I got ENOSPC all the time.


svn path=/nixpkgs/trunk/; revision=33714
 2012-04-09 21:02:17 +00:00
Ludovic Courtès
1e13bf5b12 GNU Shishi 1.0.1. 
svn path=/nixpkgs/trunk/; revision=33709
 2012-04-09 20:51:54 +00:00
Lluís Batlle i Rossell
0684ca8745 Adding the memtest86 from memtest86.com, and renaming the top-level attribute 
name of memtest86+ to memtest86plus.

I think it makes more sense for the attribute memtest86 to point to the
upstream memtest86.com version.


svn path=/nixpkgs/trunk/; revision=33689
 2012-04-09 19:54:34 +00:00
Mathijs Kwik
107c8325e5 added extra package for gnupg 2.1 git pre version. 
contains the merge of gnupg-ecc, enabling ecdsa and other algorithms.

I mainly need this because I use ecdsa for my ssh keys, and want
gpg-agent to be able to handle them.

svn path=/nixpkgs/trunk/; revision=33682
 2012-04-09 10:17:40 +00:00
Mathijs Kwik
0765ca769a libassuan: added extra package with current git version 
needed for upcoming gnupg 2.1

svn path=/nixpkgs/trunk/; revision=33681
 2012-04-09 10:17:36 +00:00
Mathijs Kwik
9779ae082a npth: successor of the pth library, used by upcoming versions of gnupg and its libraries 
svn path=/nixpkgs/trunk/; revision=33680
 2012-04-09 10:17:32 +00:00
Arie Middelkoop
2b18ccf305 * Added "easytag", a GUI for organizing id3tags in mp3s. 
* Updated some ocaml packages.
* Updated coccinelle.

svn path=/nixpkgs/trunk/; revision=33674
 2012-04-09 09:42:20 +00:00
Peter Simons
fc1bc797bd Updated Haskell packages. 
- file-embed: updated to version 0.0.4.2
 - mtl: added version 2.1
 - texmath: updated to version 0.6.0.5
 - text: added version 0.11.2.0
 - removed obsolete overrides

svn path=/nixpkgs/trunk/; revision=33671
 2012-04-08 11:14:28 +00:00
Cillian de Roiste
3ec76c0a25 Adding a2jmidid, a daemon for exposing legacy ALSA sequencer applications in JACK MIDI system 
svn path=/nixpkgs/trunk/; revision=33668
 2012-04-08 00:28:37 +00:00
Peter Simons
7b00953c70 haskell-hoogle: fixed build 
svn path=/nixpkgs/trunk/; revision=33660
 2012-04-07 13:16:33 +00:00
Peter Simons
9b0323859f Updated Haskell packages. 
- cabal2nix: updated to version 1.31
 - gloss: updated to version 1.7.2.1
 - repa-algorithms: updated to version 3.1.0.1
 - repa-bytestring: deleted obsolete package
 - repa-examples: updated to version 3.1.0.1
 - repa-io: updated to version 3.1.0.1
 - repa: updated to version 3.1.0.1
 - semigroups: updated to version 0.8.0.1

svn path=/nixpkgs/trunk/; revision=33659
 2012-04-07 11:59:28 +00:00
Peter Simons
8beb891d52 xscreensaver: updated to version 5.15 (and moved to pkgs/misc/screensavers hierarchy) 
svn path=/nixpkgs/trunk/; revision=33655
 2012-04-06 19:30:30 +00:00
Eelco Dolstra
9f2068ac9b * Don't build Boost on Cygwin. It takes way too long. 
svn path=/nixpkgs/trunk/; revision=33648
 2012-04-06 13:10:19 +00:00
Lluís Batlle i Rossell
3e923680d2 Making gnash build with the default firefox xulrunner. 
I have not checked if gnash needs it; I only changed it from the
xulrunner of iceweasel (which does not build) to that more maintained xulrunner
that builds.


svn path=/nixpkgs/trunk/; revision=33647
 2012-04-06 13:01:55 +00:00
Eelco Dolstra
6e195330d6 * Lower priority for stdenv jobs. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=33644
 2012-04-06 11:19:48 +00:00
Ludovic Courtès
725745c5b4 Add VRPN. 
svn path=/nixpkgs/trunk/; revision=33640
 2012-04-06 08:32:50 +00:00
Cillian de Roiste
cbded3238d Adding dbus-cplusplus, c++ bindings for dbus 
svn path=/nixpkgs/trunk/; revision=33639
 2012-04-05 23:53:20 +00:00
Cillian de Roiste
bbd76bc29a Adding ffado, Linux Firewire audio drivers 
svn path=/nixpkgs/trunk/; revision=33634
 2012-04-05 21:53:42 +00:00
Cillian de Roiste
3bf7f18d4d Adding libconfig, a simple library for processing config files 
svn path=/nixpkgs/trunk/; revision=33633
 2012-04-05 21:12:12 +00:00
Ludovic Courtès
c0172418ab hurdPartedCross: Make overridable. 
svn path=/nixpkgs/trunk/; revision=33630
 2012-04-05 17:32:02 +00:00
Peter Simons
5474f1e523 Updated Haskell packages. 
- aeson: updated to version 0.6.0.2
 - attoparsec-conduit: updated to version 0.4.0
 - authenticate: updated to version 1.2.0.1
 - blaze-builder-conduit: updated to version 0.4.0
 - certificate: updated to version 1.1.1
 - conduit: updated to version 0.4.0.1
 - crypto-conduit: updated to version 0.3.0.1
 - hakyll: patched to support the latest version of hamlet
 - hamlet: updated to version 1.0.1
 - happstack-happstack-hamlet: patched to support the latest version of hamlet
 - happstack-server: updated to version 7.0.0
 - hoogle: patched to accept the latest versions of wai, warp, and conduit
 - http-conduit: updated to version 1.4.0.2
 - monadcryptorandom: added version 0.4
 - persistent-sqlite: updated to version 0.9.0
 - persistent-template: updated to version 0.9.0
 - persistent: updated to version 0.9.0
 - pool-conduit: updated to version 0.1.0
 - reactive-banana: updated to version 0.5.0.0
 - shakespeare-css: updated to version 1.0.1
 - shakespeare-i18n: updated to version 1.0.0
 - shakespeare-js: updated to version 1.0.0
 - shakespeare-text: updated to version 1.0.0
 - shakespeare: updated to version 1.0.0
 - simple-sendfile: updated to version 0.2.2
 - texmath: updated to version 0.6.0.4
 - tls-extra: updated to version 0.4.4
 - tls: updated to version 0.9.2
 - wai-app-static: updated to version 1.2.0
 - wai-extra: updated to version 1.2.0.2
 - wai: updated to version 1.2.0
 - warp: updated to version 1.2.0
 - xml-conduit: updated to version 0.7.0.1
 - yaml: updated to version 0.7.0
 - yesod-auth: updated to version 1.0.0
 - yesod-core: updated to version 1.0.0
 - yesod-default: updated to version 1.0.0
 - yesod-form: updated to version 1.0.0
 - yesod-json: updated to version 1.0.0
 - yesod-persistent: updated to version 1.0.0
 - yesod-routes: updated to version 1.0.0
 - yesod-static: updated to version 1.0.0
 - yesod: updated to version 1.0.0
 - zlib-conduit: updated to version 0.4.0
 - zlib-enum: updated to version 0.2.2

svn path=/nixpkgs/trunk/; revision=33629
 2012-04-05 16:51:59 +00:00
Yury G. Kudryashov
b4e5ce8de5 avahi: use libiconv if needed 
svn path=/nixpkgs/trunk/; revision=33624
 2012-04-05 15:11:19 +00:00
Yury G. Kudryashov
e1743e57be qt-4.8.1, kde-4.8.2 
svn path=/nixpkgs/trunk/; revision=33621
 2012-04-05 13:50:34 +00:00
Michael Raskin
12e1751e93 Adding Julia programming language 
svn path=/nixpkgs/trunk/; revision=33614
 2012-04-05 12:22:55 +00:00
Mathijs Kwik
c742116695 haskell reactive banana 
svn path=/nixpkgs/trunk/; revision=33606
 2012-04-05 08:22:42 +00:00
Mathijs Kwik
a6c996735c audacity: upgraded to 2.0.0 
I took out some dependencies and compile flags that didn't seem
needed. If this breaks something please give a shout.

svn path=/nixpkgs/trunk/; revision=33605
 2012-04-05 08:22:38 +00:00
Lluís Batlle i Rossell
5d15ef0e7c Updating vimprobable2 to 1.0.0 
I took mainly the patch from Alexandr Foremny, but I had to solve conflicts.

Moreover it required the old webkit.


svn path=/nixpkgs/trunk/; revision=33596
 2012-04-04 21:30:49 +00:00
Ludovic Courtès
36200a3ef3 hurdPartedCross: Use `.override' instead of reimporting. 
svn path=/nixpkgs/trunk/; revision=33592
 2012-04-04 21:09:04 +00:00
Ludovic Courtès
3226d8b91d GNU: Avoid `__overrides' altogether, by using a non-recursive attrset. 
Thanks to Eelco for the suggestion.

svn path=/nixpkgs/trunk/; revision=33587
 2012-04-04 20:25:51 +00:00
Rob Vermaas
9a22323099 add svneverever and updated pysvn 
svn path=/nixpkgs/trunk/; revision=33572
 2012-04-04 16:16:07 +00:00
Yury G. Kudryashov
9105d0546d Drop old kdevplatform/kdevelop 
svn path=/nixpkgs/trunk/; revision=33571
 2012-04-04 16:14:57 +00:00
Yury G. Kudryashov
e0b69cfc26 Let hydra build qt-4.8.1 
svn path=/nixpkgs/trunk/; revision=33570
 2012-04-04 16:07:47 +00:00
Peter Simons
1726c930cd Updated Haskell packages. 
- fgl-visualize: added meta.maintainers
 - gtk2hs-buildtools: added version 0.12.3
 - network-conduit: added version 0.4.0
 - path-pieces: updated to version 0.1.1
 - void: added version 0.5.5

svn path=/nixpkgs/trunk/; revision=33551
 2012-04-03 06:31:11 +00:00
Peter Simons
943904a809 haskell-SourceGraph: fixed build 
svn path=/nixpkgs/trunk/; revision=33545
 2012-04-02 18:44:09 +00:00
Peter Simons
ba8b234c85 haskell-hoogle: fixed build 
svn path=/nixpkgs/trunk/; revision=33544
 2012-04-02 18:44:06 +00:00
Peter Simons
5187b22115 haskell-fgl-visualize: added version 0.1 
svn path=/nixpkgs/trunk/; revision=33543
 2012-04-02 18:44:03 +00:00
Eelco Dolstra
29b0341589 * GMP updated to 5.0.4. 
* By default, QEMU's CPUID identifies the CPU as GenuineIntel, family
  6, model 2.  Since there never was a physical 64-bit CPU like that,
  64-bit GMP calls abort().  This causes every program linked against
  libgmp to fail under QEMU (unless an appropriate -cpu or -M flag is
  used), which is rather bad, especially for users of hosting
  providers who cannot change QEMU's flags.  The patch causes GMP to
  be more liberal (i.e., use non-CPU-specific implementations).

svn path=/nixpkgs/branches/stdenv-updates/; revision=33531
 2012-04-01 22:17:00 +00:00
Peter Simons
25fe5d43fe Updated Haskell packages. 
- MemoTrie: updated to version 0.4.11
 - X11: updated to version 1.6.0
 - derive: updated to version 2.5.8
 - gloss: updated to version 1.7.1.1
 - haskell-src-exts: updated to version 1.13.0
 - haskell-src-meta: updated to version 0.5.1.2
 - hlint: updated to version 1.8.28

svn path=/nixpkgs/trunk/; revision=33528
 2012-04-01 19:51:53 +00:00
Eelco Dolstra
1405f49820 * With a nice bit of hackery, get the Google Talk plugin to work. Yay 
for proprietary software.  Tested with Firefox and Chrome.

svn path=/nixpkgs/trunk/; revision=33519
 2012-04-01 15:21:30 +00:00
Shea Levy
0264a886c7 clang can be built with stdenv now 
svn path=/nixpkgs/trunk/; revision=33517
 2012-04-01 14:17:27 +00:00
Cillian de Roiste
5f5d21bbeb Adding Qsynth (GUI) and fluidsynth (CLI), Soundfont2 based synthesizer 
svn path=/nixpkgs/trunk/; revision=33504
 2012-03-31 20:22:19 +00:00
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
Shea Levy
7f5520bfba Update btrfsProgs 
svn path=/nixpkgs/trunk/; revision=33497
 2012-03-31 14:51:36 +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
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
Shea Levy
ef084be97b Add libicns 
svn path=/nixpkgs/trunk/; revision=33481
 2012-03-30 01:36:38 +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
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
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
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
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
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
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
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
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
Eelco Dolstra
bb311ce1d0 * Boto updated to 2.3.0. 
svn path=/nixpkgs/trunk/; revision=33437
 2012-03-27 10:48:45 +00:00
Ludovic Courtès
95703347b6 GCC 4.7: Fix the `name' attribute. 
svn path=/nixpkgs/trunk/; revision=33432
 2012-03-26 17:47:47 +00:00
Ludovic Courtès
f6af9b84c6 GCC 4.7.0. 
svn path=/nixpkgs/trunk/; revision=33431
 2012-03-26 15:36:43 +00:00
Eelco Dolstra
e1b49fe69d * Drop some recurseIntoAttrs calls. 
svn path=/nixpkgs/trunk/; revision=33425
 2012-03-26 14:22:28 +00:00
Eelco Dolstra
a559cc270e * Let nix-env only search Python 2.7 packages. Reported by Konrad 
Hinsen.

  We should add a check to enforce that every package/version pair in
  "nix-env -qa" is unique :-)

svn path=/nixpkgs/trunk/; revision=33424
 2012-03-26 14:07:34 +00:00
Eelco Dolstra
b62900880a * Fix the build of Task::Catalyst::Tutorial (http://hydra.nixos.org/build/2307296). 
svn path=/nixpkgs/trunk/; revision=33423
 2012-03-26 11:38:49 +00:00
Eelco Dolstra
2d0e07c242 * Don't recurse into perl510Packages. It confuses nix-env -u since it 
can't distinguish between 5.10 and 5.14 packages.  (We should
  probably include the Perl version number in the name of Perl
  packages, like GHC packages.)

svn path=/nixpkgs/trunk/; revision=33422
 2012-03-26 10:22:27 +00:00
Russell O'Connor
ec5dda12d2 Reparing stable build of Matita. 
Also correcting the version and simplifying the prerelease package of Matita.


svn path=/nixpkgs/trunk/; revision=33420
 2012-03-25 21:27:30 +00:00
Russell O'Connor
510308e039 Adding a package for a preview release of Matita. 
svn path=/nixpkgs/trunk/; revision=33418
 2012-03-25 20:43:00 +00:00
Lluís Batlle i Rossell
f389901fd2 Adding 'tabbed'. I think Alexander Foremny wanted to send this patch 
long ago, but I could not find it.


svn path=/nixpkgs/trunk/; revision=33414
 2012-03-25 20:10:25 +00:00
Shea Levy
343fb0be1e Add kmod, the replacement for the now-defunct module-init-tools 
The kmod tools appear to take a flag to name the location of the modules
directory, so we may not need to migrate our module-init-tools patches

svn path=/nixpkgs/trunk/; revision=33413
 2012-03-25 20:05:36 +00:00
Peter Simons
d44e55866a Updated Haskell packages. 
- cabal2nix: updated to version 1.30
 - cmdargs: updated to version 0.9.5
 - derive: updated to version 2.5.6
 - hlint: updated to version 1.8.25
 - io-choice: added version 0.0.1

svn path=/nixpkgs/trunk/; revision=33411
 2012-03-25 19:33:53 +00:00
Peter Simons
a058381657 haskell-ghc-mod: updated to version 1.10.11 
This expression can now be generated by cabal2nix. Note that it doesn't
propagate Emacs and haskell-mode, though, these dependencies must be
installed by the user in addition to ghc-mod.

To active ghc-mod, add the following snippet to your ~/.emacs file:

  (autoload 'ghc-init "ghc" nil t)
  (add-hook 'haskell-mode-hook (lambda () (ghc-init)))

svn path=/nixpkgs/trunk/; revision=33410
 2012-03-25 19:33:48 +00:00
Peter Simons
48ce33903a haskell-hoogle: added version 4.2.10 
svn path=/nixpkgs/trunk/; revision=33409
 2012-03-25 18:22:20 +00:00
Lluís Batlle i Rossell
fa183b675b Adding wrapFirefox for midori and vimprobable2, so they can enjoy the flash plugin. 
OTH, I'd prefer naming the attributes like "midoriWrapped" instead of "midoriWrapper". 
But I chose the 2nd to follow the example of those already in all-packages.


svn path=/nixpkgs/trunk/; revision=33406
 2012-03-25 13:59:17 +00:00
Lluís Batlle i Rossell
2ccec99d8c Making webkit build further. They want an older perl. 
svn path=/nixpkgs/trunk/; revision=33401
 2012-03-25 11:27:13 +00:00
Michael Raskin
99f198ab9f Update/fix Midori 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33400
 2012-03-25 11:22:32 +00:00
Arie Middelkoop
797c0f86fa Recovered OCaml 3.11 by using version 3.11.2 and a patch from ocaml's bugtracker. 
svn path=/nixpkgs/trunk/; revision=33399
 2012-03-24 22:59:08 +00:00
Cillian de Roiste
d2d41e9b78 Adding mhwaveedit, a sample editor 
svn path=/nixpkgs/trunk/; revision=33397
 2012-03-24 18:59:26 +00:00
Cillian de Roiste
a305102589 Adding Petri-Foo, a fork of the Specimen sampler project 
svn path=/nixpkgs/trunk/; revision=33395
 2012-03-24 13:22:14 +00:00
Peter Simons
e7403a7f63 haskell-permutation: added version 0.4.1 
svn path=/nixpkgs/trunk/; revision=33389
 2012-03-23 21:03:04 +00:00
Yury G. Kudryashov
eeb95637ac Add ksshaskpass 
Patch supplied by Kirill Elagin, edited by Yury Kudryashov.

svn path=/nixpkgs/trunk/; revision=33386
 2012-03-23 18:56:35 +00:00
Peter Simons
062c35144d haskell-monad-control: added version 0.3.1.1 
svn path=/nixpkgs/trunk/; revision=33379
 2012-03-23 12:03:21 +00:00
Peter Simons
952626fc94 haskell-transformers: added version 0.3.0.0 
svn path=/nixpkgs/trunk/; revision=33378
 2012-03-23 12:03:18 +00:00
Peter Simons
3837c965ad haskell-zlib-bindings: added version 0.1.0 
svn path=/nixpkgs/trunk/; revision=33373
 2012-03-23 12:03:04 +00:00
Mathijs Kwik
c690fb832b haskell-arrows 
svn path=/nixpkgs/trunk/; revision=33365
 2012-03-22 22:37:17 +00:00
Mathijs Kwik
25fe36ff15 haskell-Stream 
svn path=/nixpkgs/trunk/; revision=33364
 2012-03-22 22:37:13 +00:00
Mathijs Kwik
01e0c31bae haskell-lazysmallcheck 
svn path=/nixpkgs/trunk/; revision=33363
 2012-03-22 22:37:08 +00:00
Cillian de Roiste
438f877d82 Removing specimen, the release doesn't work and the svn repo is no longer available :( 
svn path=/nixpkgs/trunk/; revision=33362
 2012-03-22 19:56:48 +00:00
Peter Simons
0c842e7620 Updated Haskell packages. 
- cautious-file: updated to version 1.0.1
 - hmatrix: updated to version 0.14.0.1
 - random-fu: updated to version 0.2.2.0
 - resourcet: added version 0.3.0
 - sendfile: updated to version 0.7.6
 - test-framework: added version 0.6

svn path=/nixpkgs/trunk/; revision=33354
 2012-03-22 11:17:49 +00:00
Yury G. Kudryashov
c4b9da5949 Add libgweather 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33344
 2012-03-22 08:39:08 +00:00
Yury G. Kudryashov
268146472c Add libgtop 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33343
 2012-03-22 07:32:08 +00:00
Lluís Batlle i Rossell
07c583c3d4 Adding rpcbind. 
Patch by Rickard Nilsson.


svn path=/nixpkgs/trunk/; revision=33341
 2012-03-21 20:35:15 +00:00
Michael Raskin
8dddfbeea6 Update/fix Uzbl 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33340
 2012-03-21 19:14:34 +00:00
Shea Levy
0728828fac Remove old Thunderbird with Eelco's blessing 
svn path=/nixpkgs/trunk/; revision=33335
 2012-03-21 17:15:39 +00:00
Michael Raskin
4233eece19 Update and fix WebKit 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33323
 2012-03-21 10:47:00 +00:00
Shea Levy
f67b9d8f2d Thunderbird: Blind update 
svn path=/nixpkgs/trunk/; revision=33320
 2012-03-21 01:26:21 +00:00
Eelco Dolstra
b449705587 * Firefox 11 (contributed by Kirill Elagin). Unfortunately it's not 
called "Firefox" anymore when built without official branding.
  Apparently that was a SNAFU in Firefox 10.

svn path=/nixpkgs/trunk/; revision=33319
 2012-03-20 23:59:09 +00:00
Lluís Batlle i Rossell
b2d61a850d Enabling nfsv4 and nfsv41 in nfsUtils (or at least I think so). 
svn path=/nixpkgs/trunk/; revision=33315
 2012-03-20 23:17:45 +00:00
Lluís Batlle i Rossell
2ce433c26c Removing go-oo. It neither builds neither upstream continues it. 
svn path=/nixpkgs/trunk/; revision=33314
 2012-03-20 22:19:48 +00:00
Shea Levy
8d1d247e02 Add nouveau xorg video driver 
svn path=/nixpkgs/trunk/; revision=33300
 2012-03-20 16:29:22 +00:00
Yury G. Kudryashov
34fcba81be Add new release of kdevelop 
I'll remove the old release when Hydra will build the new one, and I'll test the
result.

svn path=/nixpkgs/trunk/; revision=33296
 2012-03-20 14:12:53 +00:00
Yury G. Kudryashov
ba7f02630a Add gtkmm-3.x 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33294
 2012-03-20 11:46:42 +00:00
Yury G. Kudryashov
aa47fca2f6 Restore libchamplain 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33291
 2012-03-20 11:16:06 +00:00
Yury G. Kudryashov
f0039537ce Restore clutter-gtk 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33290
 2012-03-20 11:16:01 +00:00
Shea Levy
f272acd501 Add a module for the pommed tool for Apple laptop keyboards. 
svn path=/nixpkgs/trunk/; revision=33286
 2012-03-20 04:41:13 +00:00
Shea Levy
6fe5413cb7 xf86-input-multitouch seems to be abandoned, update it with the mtrack fork 
svn path=/nixpkgs/trunk/; revision=33283
 2012-03-20 01:48:09 +00:00
Yury G. Kudryashov
0d90c06ba1 Remove some packages with Qt3 dependency 
kde3.k3b: use kde4.k3b instead
kde3.kphone: there are many other SIP phones
valknut: last version from 2009, doesn't support new ADC protocol
qdu: latest release in 2004, use kde4.filelight

REVIEWBOARD:5

svn path=/nixpkgs/trunk/; revision=33273
 2012-03-19 18:31:02 +00:00
Eelco Dolstra
626d364e37 * Build Bison 2.5. 
svn path=/nixpkgs/trunk/; revision=33258
 2012-03-19 13:49:39 +00:00
Peter Simons
69adc0d433 Update Haskell packages. 
- gd: updated to version 3000.7.3
 - hakyll: updated to version 3.2.6.2
 - HaskellForMaths: updated to version 0.4.4
 - haskell-src-meta: updated to version 0.5.1.1
 - mwc-random: dropped obsolete version 0.10.0.1.
 - persistent-template: updated to version 0.8.2
 - snap-core: updated to version 0.8.0.1
 - snap-server: updated to version 0.8.0.1
 - unordered-containers: dropped obsolete version 0.1.4.6.

svn path=/nixpkgs/trunk/; revision=33255
 2012-03-19 11:15:39 +00:00
Yury G. Kudryashov
abec146924 Add libwnck3 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33254
 2012-03-19 04:36:51 +00:00
Yury G. Kudryashov
b113433d51 Move libwnck to top-level 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33253
 2012-03-19 04:36:47 +00:00
Yury G. Kudryashov
3d0b778848 Move gnome-doc-utils and gtk-doc to top-level 
Add compatibility attrs.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33252
 2012-03-19 04:36:41 +00:00
Eelco Dolstra
b4d308f672 * Update some Perl packages that had gone missing. 
svn path=/nixpkgs/trunk/; revision=33250
 2012-03-19 03:55:37 +00:00
Shea Levy
dfcd4dd559 Add a kernel patch for the efi boot stub to read a config file when booted without arguments, and base removable media booting off of that patch 
The patch is currently being discussed on LKML and hopefully will be included
in mainline in some form in the future. Note that booting from the livecd has
to do a lot of work before anything is output to the console, so if the drive
is still busy don't assume the boot has hanged

svn path=/nixpkgs/trunk/; revision=33235
 2012-03-18 17:14:52 +00:00
Lluís Batlle i Rossell
a544da22fc Adding latencytop. 
svn path=/nixpkgs/trunk/; revision=33233
 2012-03-18 11:45:53 +00:00
Lluís Batlle i Rossell
b4955eea65 Adding qemu 1.0.1. 
svn path=/nixpkgs/trunk/; revision=33232
 2012-03-18 10:31:15 +00:00
Mathijs Kwik
54a5f7f328 gtypist, typing tutor 
Now all I need is time to practise :)

svn path=/nixpkgs/trunk/; revision=33228
 2012-03-18 08:11:17 +00:00
Yury G. Kudryashov
168a3d7101 Add qt4_for_skype 
This build disables some optional features. I'm going to pass this to
skype_linux to reduce the size occupied by i686 packages on x86_64 system.

svn path=/nixpkgs/trunk/; revision=33217
 2012-03-17 20:57:28 +00:00
Yury G. Kudryashov
d68c80932a Remove libjingle 
It seems that every japper/jingle implementation ships a modified version of
libjingle.

svn path=/nixpkgs/trunk/; revision=33207
 2012-03-17 17:20:39 +00:00
Yury G. Kudryashov
f94501bfa2 Remove tuxracer 
"tuxracer = ..." string was commented for 3 years.

svn path=/nixpkgs/trunk/; revision=33206
 2012-03-17 17:20:34 +00:00
Yury G. Kudryashov
a466941945 Move last piece o gnome3 to top-level 
Since there is no common release schedule, I'd prefer to avoid gnome3 set at
all.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33203
 2012-03-17 16:46:12 +00:00
Yury G. Kudryashov
d1860f6def Move gnome3.GConf to GConf3 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33201
 2012-03-17 16:46:02 +00:00
Yury G. Kudryashov
ddb01436a0 Move gnome3.libgnome_keyring to libgnome_keyring3 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33200
 2012-03-17 16:45:56 +00:00
Yury G. Kudryashov
d96524476d Move libsoup to development/libraries 
It is used in many packages outside of gnome2 set.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33197
 2012-03-17 16:45:37 +00:00
Yury G. Kudryashov
0e397758ee dragonegg-3.0 
The old version fails to build, thus I commit it instead of review request.

svn path=/nixpkgs/trunk/; revision=33193
 2012-03-17 15:25:00 +00:00
Marco Maggesi
0d06448ac2 Remove lowPrio to ocaml-3.12.1 
svn path=/nixpkgs/trunk/; revision=33192
 2012-03-17 15:03:12 +00:00
Lluís Batlle i Rossell
ef1437585d Adding kexectools. 
svn path=/nixpkgs/trunk/; revision=33175
 2012-03-16 21:17:13 +00:00
Yury G. Kudryashov
75207a6a90 Try to update slr 
Still fails to build because atlas doesn't provide full blas.

svn path=/nixpkgs/trunk/; revision=33164
 2012-03-16 17:15:52 +00:00
Ludovic Courtès
105ad5e503 GCC 4.7: Update. 
svn path=/nixpkgs/trunk/; revision=33161
 2012-03-16 15:32:03 +00:00
Shea Levy
d30947aef3 Move NixosBootPkg into NixOS 
svn path=/nixpkgs/trunk/; revision=33149
 2012-03-16 11:53:50 +00:00
Yury G. Kudryashov
2aed4ebe88 Add telepathy-salut 
svn path=/nixpkgs/trunk/; revision=33143
 2012-03-16 06:58:03 +00:00
Yury G. Kudryashov
01b8506708 Add libsoup to top-level 
svn path=/nixpkgs/trunk/; revision=33142
 2012-03-16 06:57:58 +00:00
Shea Levy
d7533209a1 Add NixosBootPkg 
You almost certainly don't want to use this. It's a very stupid,
overspecialized application that's only needed by the efiBootStub NixOS
module in corner cases.

svn path=/nixpkgs/trunk/; revision=33134
 2012-03-16 02:05:38 +00:00
Yury G. Kudryashov
d477e709c8 Add telepathy-farstream 
svn path=/nixpkgs/trunk/; revision=33128
 2012-03-15 21:50:02 +00:00
Yury G. Kudryashov
0239640def Add farstream 
svn path=/nixpkgs/trunk/; revision=33127
 2012-03-15 21:49:54 +00:00
Ludovic Courtès
eaab66d11a forceSystem: Inherit crossSystem' and platform'. 
svn path=/nixpkgs/trunk/; revision=33119
 2012-03-15 20:27:41 +00:00
Peter Simons
ee402fac15 haskell-bloomfilter: added version 1.2.6.8 
svn path=/nixpkgs/trunk/; revision=33115
 2012-03-15 18:07:45 +00:00
Yury G. Kudryashov
785d18e02b svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33111
 2012-03-15 15:09:36 +00:00
Yury G. Kudryashov
bbc9d6670d Add RBTools 
svn path=/nixpkgs/trunk/; revision=33103
 2012-03-15 10:54:48 +00:00
Lluís Batlle i Rossell
fb013d4bd6 Giving the zip without NLS to libreoffice; I think this may fix a permission denid error 
at perl Archive/Zip.


svn path=/nixpkgs/trunk/; revision=33098
 2012-03-15 08:06:45 +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
03875e0bce Make nixpkgs ready to gtkLibs attrset removal 
svn path=/nixpkgs/trunk/; revision=33091
 2012-03-14 22:44:41 +00:00
Yury G. Kudryashov
68fe867e19 Get rid of most references to gtkLibs 
svn path=/nixpkgs/trunk/; revision=33088
 2012-03-14 21:57:32 +00:00
Yury G. Kudryashov
da0a96d06c glib and gtk are now in top-level namespace 
svn path=/nixpkgs/trunk/; revision=33084
 2012-03-14 19:59:41 +00:00
Yury G. Kudryashov
f105c2353b Pass libgnome_keyring, not gnome_keyring 
svn path=/nixpkgs/trunk/; revision=33082
 2012-03-14 19:35:55 +00:00
Yury G. Kudryashov
8167b5a2a7 No need to inherit glib, gtk etc. from gnome/gtkLibs 
svn path=/nixpkgs/trunk/; revision=33081
 2012-03-14 19:35:49 +00:00
Yury G. Kudryashov
c9da6ff736 Move dev/libs/telepathy-* to a subdir 
svn path=/nixpkgs/trunk/; revision=33079
 2012-03-14 19:35:41 +00:00
Yury G. Kudryashov
4d9fb0a594 Move gstreamer packages to top-level 
This will make callPackage work with gst.
* Rename gstCamelCase to gst_with_underscores.
* Add compatibility attributes.

svn path=/nixpkgs/trunk/; revision=33078
 2012-03-14 19:35:35 +00:00
Peter Simons
45e9207c4c all-packages.nix: use mesaPlatforms list to determine whether wxGTX should be built with OpenGL support or not 
svn path=/nixpkgs/trunk/; revision=33070
 2012-03-14 17:45:13 +00:00
Sander van der Burg
7ccc8fc78f OOPS: typo 
svn path=/nixpkgs/trunk/; revision=33068
 2012-03-14 17:25:49 +00:00
Sander van der Burg
a315685cd8 Added pgfplots package 
svn path=/nixpkgs/trunk/; revision=33067
 2012-03-14 17:05:21 +00:00
Yury G. Kudryashov
0a7c3ff061 Add telepathy-mission-control 
svn path=/nixpkgs/trunk/; revision=33066
 2012-03-14 16:28:11 +00:00
Yury G. Kudryashov
4874ff1144 Move some IM clients to instant-messengers/ 
svn path=/nixpkgs/trunk/; revision=33065
 2012-03-14 15:41:44 +00:00
Yury G. Kudryashov
dc2d99ec96 Move telepathy-gabble to applications 
svn path=/nixpkgs/trunk/; revision=33064
 2012-03-14 15:41:37 +00:00
Yury G. Kudryashov
cddd413130 Add KDE-Telepathy 
It compiles but I haven't tried to run it.

svn path=/nixpkgs/trunk/; revision=33063
 2012-03-14 09:52:21 +00:00
Lluís Batlle i Rossell
3418970f3b Making libreoffice have a configured fontconfig. I hope this will make some cppunit tests work, and thus we would not need to disable them. 
I update the patch that disables tests with one more test disabled, but I don't
use it because I hope the build with fonts.conf will work fine. If that is the case,
I'll remove the patch file later. If the fonts.conf trick does not work, I may want
to extend the patch to disable all failing cases.


svn path=/nixpkgs/trunk/; revision=33062
 2012-03-14 09:40:26 +00:00
Peter Simons
b24eb9855c haskell-unordered-containers: updated to version 0.2.1.0 
svn path=/nixpkgs/trunk/; revision=33061
 2012-03-14 09:23:49 +00:00
Shea Levy
6cf8e4f815 EDK2: Significant cleanup and 
modularization, and add OVMF as an example of how to use it

svn path=/nixpkgs/trunk/; revision=33059
 2012-03-14 06:57:58 +00:00
Shea Levy
853dd7266b Add Intel's EDK 
svn path=/nixpkgs/trunk/; revision=33058
 2012-03-14 04:18:52 +00:00
Shea Levy
0017d80aa5 GNU EFI development libraries 
svn path=/nixpkgs/trunk/; revision=33057
 2012-03-14 01:23:31 +00:00
Lluís Batlle i Rossell
12cfef03f8 Simpler code, to try to use wxGTK without mesa for non-linux. 
svn path=/nixpkgs/trunk/; revision=33052
 2012-03-13 21:56:24 +00:00
Lluís Batlle i Rossell
b3456f8bdd Making mesa optional in wxGTK, and using on non-linux the non-mesa wxGTK for gnuplot and wxmaxima. 
That may make them build further.


svn path=/nixpkgs/trunk/; revision=33051
 2012-03-13 21:54:17 +00:00
Lluís Batlle i Rossell
63b934c36f Next attempt at building libreoffice. I reached it to build it in the build environment, 
but I don't know if make install will succeed.

I also added the translations, that could work with luck.

I removed the force field.


svn path=/nixpkgs/trunk/; revision=33048
 2012-03-13 21:23:25 +00:00
Yury G. Kudryashov
b904117beb Add telepathy-farsight 
svn path=/nixpkgs/trunk/; revision=33045
 2012-03-13 19:07:03 +00:00
Yury G. Kudryashov
941d15af7a telepathy-gabble-0.15.4 
svn path=/nixpkgs/trunk/; revision=33044
 2012-03-13 19:06:54 +00:00
Yury G. Kudryashov
8398beefc2 Remove tapioca-qt 
svn path=/nixpkgs/trunk/; revision=33043
 2012-03-13 19:06:45 +00:00
Yury G. Kudryashov
fb422d45dd farsight-0.0.31 
svn path=/nixpkgs/trunk/; revision=33041
 2012-03-13 19:06:32 +00:00
Yury G. Kudryashov
c6830bdf6a libnice-0.1.1 
svn path=/nixpkgs/trunk/; revision=33040
 2012-03-13 19:06:24 +00:00
Yury G. Kudryashov
db0158f292 gupnp-igd 
svn path=/nixpkgs/trunk/; revision=33039
 2012-03-13 19:06:17 +00:00
Ludovic Courtès
3167c78224 Perl: Add Switch. 
svn path=/nixpkgs/trunk/; revision=33035
 2012-03-13 17:10:38 +00:00
Lluís Batlle i Rossell
6b88ad4b16 I try to package libreoffice 3.5, as there was a weird segfault in 3.4, and they 
changed the build system in 3.5. It still does not build either... hopefully
by more reachable troubles.

svn path=/nixpkgs/trunk/; revision=33022
 2012-03-12 20:15:08 +00:00
Eelco Dolstra
29df27f469 * Fix some Hydra dependencies that broke due to the Perl upgrade. 
svn path=/nixpkgs/trunk/; revision=33020
 2012-03-12 15:31:14 +00:00
Peter Simons
c86a90c4e9 Updating Haskell packages. 
- Agda-executable: updated to version 2.3.0.1
 - Agda: updated to version 2.3.0.1
 - gio: added version 0.12.3
 - hamlet: updated to version 0.10.9.1
 - leksah-server: updated to version 0.12.0.4
 - leksah: updated to version 0.12.0.3
 - ltk: updated to version 0.12.0.0
 - packages.nix: cosmetic change
 - pandoc: updated to version 1.9.1.2
 - polyparse: added version 1.8
 - shakespeare-css: updated to version 0.10.8
 - shakespeare-i18n: updated to version 0.0.2.1
 - shakespeare-js: updated to version 0.11.2
 - shakespeare-text: updated to version 0.11
 - shakespeare: updated to version 0.11
 - tls: updated to version 0.9.1
 - unordered-containers: updated to version 0.2.0.1
 - uuagc: updated to version 0.9.40.3
 - yesod-core: updated to version 0.10.2.2
 - yesod-form: updated to version 0.4.2.1
 - yesod: updated to version 0.10.1.4

svn path=/nixpkgs/trunk/; revision=33015
 2012-03-12 14:06:18 +00:00
Shea Levy
76832793f2 Linux 3.3-rc7 
svn path=/nixpkgs/trunk/; revision=33007
 2012-03-12 02:19:05 +00:00
Ludovic Courtès
0752b1e3d7 GCC 4.7: Make sure `stdenv.glibc' exists before using it. 
svn path=/nixpkgs/trunk/; revision=32995
 2012-03-11 17:35:45 +00:00
Florian Friesdorf
2b2eb19973 commented gcc47 - breaks tarball 
svn path=/nixpkgs/trunk/; revision=32993
 2012-03-11 15:59:06 +00:00
Mathijs Kwik
bd068d386e completely removed gw6c. use gogoclient. 
svn path=/nixpkgs/trunk/; revision=32989
 2012-03-11 14:35:36 +00:00
Yury G. Kudryashov
7c4a72dd77 NM-pptp: 0.9.2.0, optional GNOME support 
svn path=/nixpkgs/trunk/; revision=32986
 2012-03-11 14:07:37 +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
Eelco Dolstra
42617f5f83 * It's that time of year again. 
svn path=/nixpkgs/trunk/; revision=32976
 2012-03-10 19:23:04 +00:00
Andres Löh
a1f88264cf Binary is a GHC core package since GHC-7.2. 
svn path=/nixpkgs/trunk/; revision=32974
 2012-03-10 17:30:51 +00:00
Lluís Batlle i Rossell
7c92bab1e5 Made xbursttools have libusb and libusb1. Looks like depending on both. 
svn path=/nixpkgs/trunk/; revision=32969
 2012-03-10 11:26:55 +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
Eelco Dolstra
6bc6c61f01 * hdparm updated to 9.39. 
svn path=/nixpkgs/trunk/; revision=32963
 2012-03-09 19:24:54 +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
d6ae44060b Giving libusb1 to xbursttools. It wants it. 
svn path=/nixpkgs/trunk/; revision=32959
 2012-03-09 17:23:32 +00:00
Lluís Batlle i Rossell
6bb466ed9b Making GPL Ghostscript use the system libraries (libjpeg, libpng, ...) so 
the previous troubles with a mixture of libpng versions fade away.

I also enable back GPL Ghostscript as the default.

I checked that 'awesome' builds fine (it calls imagemagick for some pictures in
its build script), as a proof that imagemagick does not crash anymore.


svn path=/nixpkgs/trunk/; revision=32958
 2012-03-09 17:15:11 +00:00
Lluís Batlle i Rossell
31cdac999c Reverting the set of GPL ghostscript as default, because it made imagemagick crash. 
Eelco thinks it's about libpng versions mismatch.


svn path=/nixpkgs/trunk/; revision=32957
 2012-03-09 16:40:20 +00:00
Lluís Batlle i Rossell
ecb295e8c7 Setting GPL Ghostscript as default, instead of GNU ghostscript. 
It looks like GPL Ghostscript has good support from upstream, and is more up to date,
in contrast to GNU's.


svn path=/nixpkgs/trunk/; revision=32953
 2012-03-09 13:35:45 +00:00
Peter Simons
5b712643d9 swt: updated to version 3.7.2-201202080800 
Committed on behalf of "Corey O'Connor" <coreyoconnor@gmail.com> via
<CANTmfBTtRRQoc9UXCmNC8z1BNhnmiQZNVhB1TNK-PUGV-9om_w@mail.gmail.com>.

svn path=/nixpkgs/trunk/; revision=32952
 2012-03-09 13:24:16 +00:00
Peter Simons
178b500c8c Updated Haskell packages. 
- Hipmunk: updated to version 5.2.0.7
 - cairo: updated to version 0.12.3
 - digest: updated to version 0.0.1.1
 - glib: updated to version 0.12.3
 - gloss: updated to version 1.6.2.1
 - gtk: updated to version 0.12.3
 - language-javascript: updated to version 0.4.10
 - pango: updated to version 0.12.3
 - zeromq-haskell: updated to version 0.8.4

svn path=/nixpkgs/trunk/; revision=32947
 2012-03-09 10:01:19 +00:00
Yury G. Kudryashov
240df3a3e0 glib-2.30, glibmm-2.30 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32940
 2012-03-09 06:13:05 +00:00
Yury G. Kudryashov
b0aa85371b Use pango-1.29 
svn path=/nixpkgs/trunk/; revision=32935
 2012-03-08 23:25:52 +00:00
Yury G. Kudryashov
b0dbd38ea6 Move libcroco and librsvg to top-level 
svn path=/nixpkgs/trunk/; revision=32933
 2012-03-08 22:57:05 +00:00
Yury G. Kudryashov
793d0c983c Move gsettings-desktop-schemas to data/misc 
svn path=/nixpkgs/trunk/; revision=32929
 2012-03-08 22:45:58 +00:00
Peter Simons
47e76fde88 haskell-unordered-containers: added version 0.1.4.6 again to fix build of snap-core 
svn path=/nixpkgs/trunk/; revision=32911
 2012-03-08 20:50:18 +00:00
Peter Simons
5ca8bc5be3 haskell-syb: revert removal of versions 0.2.2 and 0.3 
Apparently, these versions weren't as obsolete as I thought.

svn path=/nixpkgs/trunk/; revision=32909
 2012-03-08 18:53:51 +00:00
Michael Raskin
7c0d7abdd7 Adding GAP discrete algebra system 
svn path=/nixpkgs/trunk/; revision=32908
 2012-03-08 18:23:47 +00:00
Yury G. Kudryashov
1a62d14cdd Move glib-networking to top namespace 
svn path=/nixpkgs/trunk/; revision=32905
 2012-03-08 16:49:08 +00:00
Ludovic Courtès
adb08e8a97 Add GCC 4.7.0 release candidate. 
svn path=/nixpkgs/trunk/; revision=32898
 2012-03-08 15:36:50 +00:00
Joachim Schiele
dfbde3db02 updated springlobby to 141 and changed the name of the package 
svn path=/nixpkgs/trunk/; revision=32896
 2012-03-08 15:32:20 +00:00
Peter Simons
6443e4dc64 Updated haskell packages. 
- uniplate: updated to version 1.6.7
 - unordered-containers: dropped obsolete version 0.1.4.6
 - HsOpenSSL: updated to version 0.10.1.4

svn path=/nixpkgs/trunk/; revision=32889
 2012-03-08 13:22:32 +00:00
Yury G. Kudryashov
9abf1b03a9 Move libgnome-keyring to development/libraries 
svn path=/nixpkgs/trunk/; revision=32887
 2012-03-08 13:06:44 +00:00
Eelco Dolstra
7cd2bdaa58 * Add x86_64-freebsd to release-lib.nix 
svn path=/nixpkgs/trunk/; revision=32886
 2012-03-08 12:52:00 +00:00
Lluís Batlle i Rossell
f67cd2f0d7 Trying again to get perl510Packages for go_oo. 
svn path=/nixpkgs/trunk/; revision=32885
 2012-03-08 12:03:29 +00:00
Lluís Batlle i Rossell
7aa7245620 Trying to get go_oo pick perl510 packages for what it needs. 
svn path=/nixpkgs/trunk/; revision=32882
 2012-03-08 10:12:02 +00:00
Peter Simons
5e8842d808 haskell-mwc-random: updated to version 0.12.0.0 
svn path=/nixpkgs/trunk/; revision=32880
 2012-03-08 09:56:05 +00:00
Peter Simons
d5eb6c7f59 haskell-unordered-containers: added version 0.2.0.0 
svn path=/nixpkgs/trunk/; revision=32879
 2012-03-08 09:56:00 +00:00
Lluís Batlle i Rossell
bd86ae57c2 Setting perl 5.10 for the openoffice build. It uses Switch.pm. 
svn path=/nixpkgs/trunk/; revision=32872
 2012-03-07 22:41:33 +00:00
Lluís Batlle i Rossell
dc0fd8219c I take back r32860; I'll try to fix libwpd_08 
svn path=/nixpkgs/trunk/; revision=32870
 2012-03-07 22:34:54 +00:00
Lluís Batlle i Rossell
18ddc5f25c A little patch to gav, and it does not require gcc 4.1 anymore. 
svn path=/nixpkgs/trunk/; revision=32863
 2012-03-07 22:04:53 +00:00
Lluís Batlle i Rossell
65f45ef322 Updating xsane, and making it build with the old libpng. The previous url is gone. 
svn path=/nixpkgs/trunk/; revision=32862
 2012-03-07 21:59:48 +00:00
Lluís Batlle i Rossell
c62d643520 Let's see if go_oo will build without system libwpd. The libwpd required by oo.org fails to build. 
svn path=/nixpkgs/trunk/; revision=32860
 2012-03-07 21:48:26 +00:00
Lluís Batlle i Rossell
5335c6d816 Ouch, fixing my previous commit on xburst-tools. 
svn path=/nixpkgs/trunk/; revision=32859
 2012-03-07 21:40:43 +00:00
Ludovic Courtès
046743311d gcc_realCross: Switch to `gcc46_realCross'. 
svn path=/nixpkgs/trunk/; revision=32854
 2012-03-07 16:01:12 +00:00
Lluís Batlle i Rossell
ef568bf192 Fixing the vxl build. 
svn path=/nixpkgs/trunk/; revision=32848
 2012-03-07 10:16:53 +00:00
Lluís Batlle i Rossell
5bd4e3d8f8 Setting glibc info and glibc locales for the glibc version we use (2.13). 
svn path=/nixpkgs/trunk/; revision=32844
 2012-03-07 08:18:00 +00:00
Peter Simons
4a39ac521a haskell-syb: removed obsolete versions 0.2.2 and 0.3 
svn path=/nixpkgs/trunk/; revision=32840
 2012-03-06 22:27:24 +00:00
Peter Simons
7873ce2793 pakcs: updated to version 1.10.0 
svn path=/nixpkgs/trunk/; revision=32839
 2012-03-06 22:27:20 +00:00
Peter Simons
4d752e1cd1 gfortran: updated default version to 4.6.3. 
svn path=/nixpkgs/trunk/; revision=32838
 2012-03-06 22:27:14 +00:00
Peter Simons
d959dae915 perl-packages.nix: fixed test suite failures 
- updated Encode to version 2.44
 - updated PerlMagick to version 6.74
 - updated YAML to version 0.80

svn path=/nixpkgs/trunk/; revision=32835
 2012-03-06 21:13:41 +00:00
Yury G. Kudryashov
3fa0cbb011 zlib_latest == zlib, so remove zlib/latest.nix 
svn path=/nixpkgs/trunk/; revision=32828
 2012-03-06 14:35:37 +00:00
Yury G. Kudryashov
614d81046c Remove cmake_2_8_7: default is already 2.8.7 
svn path=/nixpkgs/trunk/; revision=32827
 2012-03-06 14:35:30 +00:00
Eelco Dolstra
b49ee92aa9 * Fix building libgdiplus with libpng15. 
svn path=/nixpkgs/trunk/; revision=32826
 2012-03-06 13:49:37 +00:00
Eelco Dolstra
8778f0b368 * Change the priority of trunk builds back. 
svn path=/nixpkgs/trunk/; revision=32823
 2012-03-06 12:21:33 +00:00
Eelco Dolstra
3c56e571af * Final sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32820
 2012-03-06 11:34:11 +00:00
Peter Simons
10ec4c4a6a all-packages.nix: xsane doesn't depend on libpng 
svn path=/nixpkgs/trunk/; revision=32818
 2012-03-06 11:05:50 +00:00
Peter Simons
4adb9195bc haskell-base64-bytestring: updated to version 0.1.1.1 
svn path=/nixpkgs/trunk/; revision=32815
 2012-03-06 11:05:42 +00:00
Michael Raskin
20c29256cf xsane needs libpng12.. 
svn path=/nixpkgs/trunk/; revision=32813
 2012-03-06 10:18:28 +00:00
Michael Raskin
fd9fedc32a XaoS wants libpng12 
svn path=/nixpkgs/trunk/; revision=32809
 2012-03-06 09:28:08 +00:00
Yury G. Kudryashov
b7642bfdfb svn merge ^/nixpkgs/trunk 
I need the latest KDE-related changes

svn path=/nixpkgs/branches/stdenv-updates/; revision=32806
 2012-03-05 21:01:47 +00:00
Peter Simons
05d92999a0 Updated haskell packages. 
- HDBC-postgresql updated to version 2.3.2.1
 - HsOpenSSL updated to version 0.10.1.3
 - hledger-web updated to version 0.17.1
 - persistent updated to version 0.8.0.2
 - xml-conduit updated to version 0.5.3.1
 - haddock: added version 2.10.0

svn path=/nixpkgs/trunk/; revision=32799
 2012-03-05 11:58:21 +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
Ludovic Courtès
e657e2c455 transfig: Keep using libpng 1.2. 
svn path=/nixpkgs/trunk/; revision=32791
 2012-03-05 09:40:36 +00:00
Mathijs Kwik
b247fa9c2c chromium: depend on libpng12 
svn path=/nixpkgs/trunk/; revision=32789
 2012-03-04 22:47:52 +00:00
Eelco Dolstra
962b01f686 * Remove unnecessary copy on sed. 
svn path=/nixpkgs/trunk/; revision=32773
 2012-03-04 15:52:41 +00:00
Eelco Dolstra
27809f0ec4 * No longer needed. 
svn path=/nixpkgs/trunk/; revision=32772
 2012-03-04 15:50:03 +00:00
Mathijs Kwik
0f81c6363f gogoclient: added to release 
svn path=/nixpkgs/trunk/; revision=32761
 2012-03-04 12:28:50 +00:00
Yury G. Kudryashov
d4ffc7332c Merge trunk right before reintegrating 
svn path=/nixpkgs/branches/libpng15/; revision=32758
 2012-03-04 09:09:21 +00:00
Ludovic Courtès
90d1e1bb83 Add UNFS3, a user-space NFSv3 server. 
svn path=/nixpkgs/trunk/; revision=32753
 2012-03-03 16:06:27 +00:00
Lluís Batlle i Rossell
5a568ee185 Updating oprofile 
svn path=/nixpkgs/trunk/; revision=32751
 2012-03-03 11:30:44 +00:00
Lluís Batlle i Rossell
53e80e5316 Adding a manpage for tar, using help2man 
svn path=/nixpkgs/trunk/; revision=32749
 2012-03-03 09:52:55 +00:00
Lluís Batlle i Rossell
55fb51c2d1 Updating opencascade to 6.5.2. 
I had to bring an older ftgl in.


svn path=/nixpkgs/trunk/; revision=32742
 2012-03-02 13:47:37 +00:00
Ludovic Courtès
a55fac1a87 util-linux: Use `--disable-partx' when cross-building for GNU. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32729
 2012-03-01 21:48:29 +00:00
Yury G. Kudryashov
1ef47d19ce udisks: avoid autoreconf 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32720
 2012-03-01 15:09:53 +00:00
Yury G. Kudryashov
84fb9ca331 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32719
 2012-03-01 15:05:27 +00:00
Yury G. Kudryashov
5a39444e76 Fix wrong merge 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32714
 2012-03-01 07:16:34 +00:00
Yury G. Kudryashov
0210e20b5a svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
 2012-03-01 07:04:39 +00:00
Peter Simons
81e6c12bb3 haskell-IfElse: added version 0.85 
svn path=/nixpkgs/trunk/; revision=32707
 2012-02-29 19:24:44 +00:00
Peter Simons
5f4c5c106a haskell-stm: updated to version 2.3 
svn path=/nixpkgs/trunk/; revision=32700
 2012-02-29 17:24:31 +00:00
Evgeny Egorochkin
cf8d3fa4b9 Apparmor: packaged 
svn path=/nixpkgs/trunk/; revision=32695
 2012-02-29 13:30:10 +00:00
Evgeny Egorochkin
bf667c9389 Vidalia: packaged 
svn path=/nixpkgs/trunk/; revision=32694
 2012-02-29 13:30:06 +00:00
Arie Middelkoop
6e8c9ea906 ocaml-mode for emacs. 
There seem to exist multiple (very old) versions.
I'm taking the one shipped with the ocaml compiler, which is hopefully the "most appropriate".

svn path=/nixpkgs/trunk/; revision=32688
 2012-02-29 12:53:13 +00:00
Lluís Batlle i Rossell
1ad3da0ca8 Taking back 32635. An older Rigs of Rods does not work better. Same throttle issues. Let's keep with 0.39.4. 
svn path=/nixpkgs/trunk/; revision=32685
 2012-02-28 23:01:25 +00:00
Eelco Dolstra
207d5aae28 * Added SQL::SplitStatement. 
svn path=/nixpkgs/trunk/; revision=32678
 2012-02-28 15:53:39 +00:00
Ludovic Courtès
051129ac79 Doxygen: Add link to the bug report. 
svn path=/nixpkgs/trunk/; revision=32677
 2012-02-28 14:22:20 +00:00
Rob Vermaas
423b5b47bc add python pkgs iptools-0.4.0 
svn path=/nixpkgs/trunk/; revision=32676
 2012-02-28 11:53:34 +00:00
Ludovic Courtès
026f6e7697 Doxygen: Reinstate version 1.7. 
svn path=/nixpkgs/trunk/; revision=32672
 2012-02-28 10:08:21 +00:00
Peter Simons
10e512f2b8 gogoclient: ipv6 tunnel 
svn path=/nixpkgs/trunk/; revision=32668
 2012-02-28 00:10:05 +00:00
Peter Simons
b2356973fe haskell-haskdogs: wrapper around hasktags that fetches sources for dependencies from hackage 
svn path=/nixpkgs/trunk/; revision=32667
 2012-02-28 00:10:02 +00:00
Peter Simons
bf4ebdc2bb haskell-HSH: shell scripting in haskell 
svn path=/nixpkgs/trunk/; revision=32666
 2012-02-28 00:09:59 +00:00
Peter Simons
be0acc8bc1 hasktags: ctags/etags for haskell sources 
svn path=/nixpkgs/trunk/; revision=32665
 2012-02-28 00:09:56 +00:00
Florian Friesdorf
962e6fb704 Revert "python site.py that loads pth files anywhere on PYTHONPATH" 
This reverts commit fac80449abd57c271dfb98d392e49e4135dfc50c.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32663
 2012-02-28 00:08:00 +00:00