alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
24122 commits 217 branches 121 tags 4.5 GiB
Commit graph

6064 commits

Author SHA1 Message Date
Eelco Dolstra 05d240ceda thunderbird: Update to 15.0.1 2012-10-05 16:15:56 -04:00
Jack Cummings e7f3ff803e - zfs 0.6.0-rc11, spl 0.6.0-rc11 2012-10-05 09:11:25 -07:00
Jack Cummings ccad09d3b9 Revert " - zfs-0.6.0-rc11, and spl-0.6.0-rc11" 
This reverts commit 8eb9491a22.
 2012-10-05 09:07:33 -07:00
Cyril Roelandt 172abb4b26 Add a "smatch" package. 
Signed-off-by: Cyril Roelandt <tipecaml@gmail.com>
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
 2012-10-05 10:41:44 +02:00
Jack Cummings 8eb9491a22 - zfs-0.6.0-rc11, and spl-0.6.0-rc11 2012-10-05 00:09:49 -07:00
Jack Cummings 22ece175a0 - openttd 1.2.2, rili 2.0.1, widelands-build17, uqm-0.7.0 2012-10-04 23:32:34 -07:00
Eelco Dolstra bc9bff1da4 Remove obsolete versions of Flash 2012-10-04 21:18:44 -04:00
Shea Levy a08ca4c04a openjdk: Don't use the official build system's boostrapping, do our own. 
The openjdk BOOT_CYCLE bootstrap doesn't use the binaries built in the first stage for the second stage, so we get a bunch of errors like:
  /bin/sh: /nix/store/wdgl7xl9b72hn212l0672ad5sn7vh44y-openjdk-bootstrap/bin/native2ascii: No such file or directory
Instead, just build each stage as a separate derivation
 2012-10-04 16:56:41 -04:00
Mathijs Kwik 4c96b8587b logic cleanup 2012-10-04 10:40:52 +02:00
Mathijs Kwik 488b43586c vlc: use ffmpeg 1.0 2012-10-04 10:40:51 +02:00
Michael Raskin 0013b8faa5 Add reptyr, tool to change controlling terminal of a process under Linux 2012-10-04 09:17:09 +04:00
Andres Loeh a84ad8010a Add haskell-platform-2012.4.0.0 release candidate. 2012-10-03 21:12:46 +02:00
Eelco Dolstra 31f89ba349 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-03 14:43:10 -04:00
aszlig 59a75fc985
Fix typo introduced by e6077fbc46. 
Already created a line note about that in the commit, but somehow it went
unnoticed and most other typos introduced by that commit are already fixed by
now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-10-02 03:46:42 +02:00
aszlig 5908f6c28f
linuxconsoletools: New package, version 1.4.3. 
This is a small set of tools useful for testing and calibrating joysticks,
gamepads and various other input devices.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-10-02 03:46:41 +02:00
Cillian de Róiste 21271fee8d Add the LV2 version of the SWH audio plugins (used for audio production) 2012-10-02 01:00:13 +02:00
Eelco Dolstra b78256fbd7 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-01 11:43:43 -04:00
Shea Levy 359355e150 Linux 3.6 2012-10-01 07:01:31 -04:00
Lluís Batlle i Rossell cb7e161361 ffmpeg: adding 1.0 back as an attribute apart. 2012-09-30 12:20:55 +02:00
Eelco Dolstra 006002d16f Remove cups-pdf-filter 
It has been obsoleted by the cups-filters package.
 2012-09-28 15:09:14 -04:00
Eelco Dolstra 7f053d6157 Remove HAL 
It's obsolete.  There was only one package still using it (nut) but it
builds fine without it.
 2012-09-28 12:15:12 -04:00
Eelco Dolstra f021420036 Revert "gtk+: Update to 3.6.0" 
This reverts commit 6cbb674895.
 2012-09-27 17:42:46 -04:00
Eelco Dolstra 40eaa8657c Add Harfbuzz, an OpenType text shaping engine 2012-09-27 17:23:36 -04:00
Eelco Dolstra 6cbb674895 gtk+: Update to 3.6.0 2012-09-27 17:22:56 -04:00
Eelco Dolstra 4cdca52f7e glib: Update to 2.34.0 2012-09-27 16:16:52 -04:00
Peter Simons dfaab992c2 spamassassin: enable more plugins and provide gpg for sa-update 2012-09-27 15:29:01 +02:00
Cillian de Róiste d8e8ff1fe9 Typo, fix the googleTalkPlugin 2012-09-26 23:45:35 +02:00
Eelco Dolstra 2ca9fc3a32 Make Firefox 15 the default (for realz this time) 2012-09-26 17:29:07 -04:00
Eelco Dolstra 599517668c Fix Firefox config option processing 2012-09-26 17:27:20 -04:00
Eelco Dolstra 948aa32e46 atk: Update to 2.6.0 2012-09-26 15:17:54 -04: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
Lluís Batlle i Rossell 62c5eab5cd Adding opus-tools. 
At least a program that uses libopus.
 2012-09-25 20:08:01 +02:00
Lluís Batlle i Rossell 664ee28936 Adding libopus 
I still don't know any program that can use it.
 2012-09-25 20:01:56 +02:00
Lluis Batlle 839f124ba1 ocaml: native code building for ARM on 3.12 and 4.00 
I think it already works. I'll test more throughly tomorrow.
 2012-09-25 19:38:06 +02:00
Lluís Batlle i Rossell 1bd6ee6556 Adding umurmur and protobuf-c. 2012-09-25 19:35:03 +02:00
Lluís Batlle i Rossell ad0b63265c picocom: adding picocom, 1.7 2012-09-25 19:23:34 +02:00
Peter Simons d3dc95834a boost-headers: update to version 1.51.0 2012-09-25 12:16:01 +02:00
Peter Simons bae4524eee boost: delete obsolete version 1.50.0 2012-09-25 12:15:59 +02:00
Michael Raskin 1527b10016 Adding restund 2012-09-25 10:34:45 +04:00
Michael Raskin 732811700a Added BareSIP 2012-09-24 21:03:02 +04:00
Peter Simons f1bfc3055d dovecot: drop obsolete versions 1.0.3 and 1.1.1 2012-09-24 10:03:10 -04:00
Lluís Batlle i Rossell 57b578189b Adding cryptodev-linux, and made openssl use it optionally. 
I'm trying to get the CESA of the sheevaplug available to openssl.
 2012-09-23 20:51:15 +02:00
Michael Raskin 37418b3f70 Add farstream support to gajim 2012-09-23 21:39:26 +04:00
Eelco Dolstra 0874615fcc Remove User Mode Linux 
It hasn't built in a long time and it's obsolete IMHO.
 2012-09-21 13:32:37 -04:00
Eelco Dolstra a18bf8bc7b Remove obsolete Xfce 4.6 2012-09-21 10:58:06 -04:00
Eelco Dolstra e6077fbc46 Remove getConfig helper function 
An expression like ‘getConfig [ "cabal" "libraryProfiling" ] false’
can be written more concisely as ‘config.cabal.libraryProfiling or false’.
 2012-09-19 13:56:56 -04:00
Eelco Dolstra 0062d0f11d Mark alternative stdenvs as lowPrio 2012-09-19 13:13:34 -04:00
Peter Simons 7ba33d813e popa3d: add version 1.0.2 2012-09-19 01:16:01 +02:00
Eelco Dolstra 167df7ad32 Add tzdata 
Glibc 2.16 no longer contains timezone data (yay!) so provide tzdata
instead.
 2012-09-18 14:00:18 -04:00
Peter Simons aa2d8d1e02 dovecot: rename file for version 1.0.3 to improve consistency 2012-09-18 15:08:28 +02:00
Mathijs Kwik baa6223904 node-packages: ability to build npms that have native extensions 2012-09-17 09:56:49 +02:00
aszlig b2392c09a0
aewan: New package, version 1.0.01. 
This adds a small ASCII art drawing tool, which supports drawing with multiple
layers. Might be especially helpful for larger "images", which become quite
tedious to do using vim.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-09-14 23:24:10 +02:00
aszlig cb94852ae3
hexedit: New package, version 1.2.12. 
A typical three-pane style hex editor, which is somewhat similar than bvi, but
smaller and without vi-like keybindings.

(Don't ask me why I use both, I just can't tell why I'm sometimes in bvi and
sometimes in hexedit mood... there simply is no rational explanation)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-09-14 23:24:10 +02:00
Rickard Nilsson 7c43b041d9 Add nss-pam-ldapd version 0.8.10 
nss-pam-ldapd is a fork of nss_ldap that uses a daemon (nslcd) to
connect to the LDAP server, instead of going directly from PAM/NSS.
This improves performance and separation, and increases security
if you connect to LDAP with a password, since only the nscd daemon
needs to know the password, not every user of PAM/NSS.

This commit will be followed by a commit to NixOS which enables the
use of the nslcd daemon.
 2012-09-14 00:06:25 +02:00
Peter Simons 40fe4cf682 pmtools: add version 20071116 2012-09-13 20:00:17 +02:00
Eelco Dolstra 696206c405 Rename spiceProtocol -> spice_protocol 2012-09-13 11:36:34 -04:00
Michael Raskin 8b7d12d0f5 Gajim: make OpenSSL code work 2012-09-13 18:03:50 +04:00
Michael Raskin b52919ac9e Buildable Salut-à-toi 2012-09-13 14:14:49 +04:00
Rob Vermaas ff68b3e130 Add apacheAntOracleJDK variant 2012-09-11 17:07:52 +02:00
Peter Simons 2a183e60bf all-packages.nix: recurse into haskellPackages_ghc761 package set to make it available to nix-env 2012-09-11 10:42:50 +02:00
aszlig 2c315dee85
Merge branch 'tcl-tkabber-fixup' 
This introduces the following changes:

 * Fixes libPrefix in Tcl libraries I fucked up a few months ago and adds
   missing meta attributes.
 * Correctly set TKABBER_SITE_PLUGINS so Tkabber is able to find plugins, if
   present.
 * Rely on OPENSSL_X509_CERT_FILE instead of depending on cacert directly.
 * Introduces a new license called "Tcl/Tk", which applies to some Tcl libraries
   and is a variation of the BSD license with restrictions regarding
   governmental use.
 * New package tclgpg for GPG support in Tkabber.
 2012-09-11 05:13:03 +02:00
Russell O'Connor 048ef1659f Merge branch 'master' of github.com:NixOS/nixpkgs 2012-09-10 23:50:17 +02:00
Russell O'Connor 46d9146d64 Update SSReflect to version 1.4 2012-09-10 23:15:54 +02:00
aszlig 3ed91754e2
lastwatch: New package, version 0.4.1. 
This is actually one of my own programs I've written some years ago, but as I'm
still using it on several systems, I'm adding it to nixpkgs. As it is an (at the
moment, fanotify looks like it's more suitable) inotify based scrobbler, it of
course requires the inotify feature to be enabled in the kernel.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-09-10 19:54:54 +02:00
aszlig de5c5467a6
mmv: New package, version 1.01b from Debian. 
This package as well as the patches are used from Debian, as the upstream
version is no longer maintained, plus other distributions seem to use the Debian
patched version aswell. And by looking at the patch from Debian, it seems
reasonable, because it contains a _lot_ of fixes that accrued over time.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-09-10 19:54:53 +02:00
aszlig 930d13e12c
picard: New package, version 1.1. 
Picard is the official MusicBrainz audio tagger which is able to use audio
fingerprinting to tag your files.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-09-10 19:54:53 +02:00
Peter Simons 1037089c55 Update default version of boost to 1.51.0. 
Version 1.50.0 should be dropped from Nixpkgs, if possible, once we're
reasonably sure that the update doesn't break any packages in ways that
cannot be trivially fixed.
 2012-09-10 11:31:36 +02:00
Mathijs Kwik da87b2c9bf emacs: add package "org2blog" 2012-09-09 19:32:27 +02:00
Mathijs Kwik 7bbda346ba emacs: add package "xml-rpc" 2012-09-09 19:32:14 +02:00
Mathijs Kwik 071d685dda mongodb: upgrade to 2.2.0 2012-09-09 13:04:14 +02:00
Mathijs Kwik d7f89b2075 libnl1, libnl2: remove now they are unused 2012-09-09 13:04:14 +02:00
aszlig 882289a583
tclgpg: New package, pre-1.0 release. 
The library has not been released so far, but it is used by Tkabber and some
other software in Tcl (none of them is in nixpkgs so far).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-09-09 06:59:58 +02:00
Peter Simons a9da133fda boost: add version 1.51.0 2012-09-08 14:35:05 +02:00
Dmitry Malikov 8ffc870e78 Tig: cosmetics 2012-09-05 18:38:32 +00:00
Russell O'Connor b881bee48b Merge branch 'master' of https://github.com/NixOS/nixpkgs 2012-09-04 12:39:56 -04:00
Russell O'Connor 314af2262c 2030 Images – for Intel Centrino Wireless-N 2230 2012-09-04 12:39:40 -04:00
Rob Vermaas c9f46b2d40 Merge pull request #105 from ierton/zathura 
Zathura
 2012-09-02 04:10:30 -07:00
Rob Vermaas 7ea0160fee Merge pull request #93 from oxij/master 
Support PCI passthrough in Xen. Add enca package.

Revert of Xen version from 4.1.2 to 4.0.3.
 2012-09-02 04:09:25 -07:00
Michael Raskin 4add07db0c Firefox: add 15.0 version 2012-09-01 09:55:59 +04:00
Alexander Foremny 27127238f5 Merge remote-tracking branch 'upstream/master' into plowshare 2012-08-31 16:03:10 +02:00
Ludovic Courtès 04f242e281 Set noSysDirs' to false' on non-GNU/Linux platforms. 2012-08-31 11:50:04 +02:00
Rickard Nilsson abf6366f87 Add surfraw 2.2.8 2012-08-31 10:55:23 +02:00
Yury G. Kudryashov c5f9ee3325 Add libexttextcat (part of LibreOffice) 2012-08-31 12:03:25 +04:00
Yury G. Kudryashov 38d07f5018 Add MyThes 2012-08-31 12:03:25 +04:00
Yury G. Kudryashov 28f0597bd6 Add clucene-core.2.x 2012-08-31 12:03:25 +04:00
Yury G. Kudryashov 34bafa4893 Add libcdr (libreoffice dependency) 2012-08-31 12:03:24 +04:00
Yury G. Kudryashov d41c08ee54 Add mdds (libreoffice dependency) 2012-08-31 12:03:24 +04:00
Yury G. Kudryashov 30ba367d5a Add libvisio (libreoffice dependency) 2012-08-31 12:03:24 +04:00
Mathijs Kwik cb4443ef26 add spice-0.10.1 
spice is a next-generation remote desktop protocol, aimed at virtual
machines.
focus is not just on display/input devices, but clipboard, audio,
video, opengl, smartcards, usb devices as well, no matter if the
virtual machine runs locally or on a remote host.

not everything is implemented yet, and I didn't enable all available
features yet.

Currently, spice is able to make qemu-kvm virtual machines very usable
for workstation guests, with good 2d video support, clipboard sharing,
full resolutions, auto-mouse-grab/ungrab, xinerama / multiple guest
monitors. Good drivers for windows 7 guests are available, as well as
linux Xorg drivers / agents.

Basically, kvm was already the best-performing VM solution (using
virtio drivers), but virtualbox, while slower, had better
desktop-integration support (still wins if you want opengl). Spice
fixes this, making the choice very easy.
 2012-08-29 22:27:39 +02:00
Mathijs Kwik 30514a5346 add spice-protocol-0.10.1 2012-08-29 22:27:39 +02:00
Mathijs Kwik af6265e66d add celt-0.5.1 2012-08-29 22:27:39 +02:00
Lluís Batlle i Rossell 0f1326cde9 Adding praat. 2012-08-27 20:26:32 +02:00
Lluís Batlle i Rossell 602fde4ad4 Adding espeakedit, phoneme editor for espeak. 
I've no idea how to use it still.
 2012-08-27 20:26:32 +02:00
Shea Levy 8c128db32e Add oraclejdk and oraclejre attributes for packages that want to use them 2012-08-27 14:15:57 -04:00
Shea Levy 488f46c19c Merge branch 'openjdk-default' of github.com:shlevy/nixpkgs 
With this change, java packages will build with openjdk by default. The
primary driver for this is legal: The build farm is not allowed to
distribute the proprietary Oracle jdk6, and so it is not allowed to
distribute any packages that depend on it. In my view, this is a purely
beneficial change: from the perspective of the build farm, packages will
go from undistributable due to licensing to either distributable or
undistributable due to failed build (if the package doesn't build
properly with openjdk), and from the perspective of the end user it is
very easy to override the jdk on a package-by-package basis or for all
of nixpkgs in the nixpkgs configuration.
 2012-08-27 11:26:46 -04:00
Michael Raskin 289d7a5cfa Fix typo 2012-08-27 15:49:33 +04:00
Shea Levy a94e8d2756 Add npm2nix as a nodePackage 2012-08-26 16:02:04 -04:00
Yury G. Kudryashov a4d13df801 Add qoauth 2012-08-26 22:21:14 +04:00
Shea Levy 016b665402 Default 'jdk' and 'jre' to openjdk and openjre, respectively, on supporting systems 2012-08-26 13:33:44 -04:00
Alexander Foremny 172e6f5e77 Merge remote-tracking branch 'upstream/master' into plowshare 2012-08-26 14:46:43 +02:00
Alexander Foremny c89a0d6c4f Add package: plowshare-git20120807 2012-08-26 14:43:25 +02:00
Rob Vermaas 77948b7204 Remove old maven versions, aliased maven to maven3. Updated maven 3 to 3.0.4 2012-08-25 19:43:54 +02:00
Michael Raskin 2ab1594512 Atop: add package (atop is one more load monitor) 2012-08-25 21:24:17 +04:00
Mathijs Kwik 528b508b87 add logcheck 1.3.15 
nixos-module follows soon
 2012-08-25 11:20:09 +02:00
Mathijs Kwik e5cc68e8d5 add lockfile-progs-0.1.16 2012-08-25 11:20:09 +02:00
Mathijs Kwik 8c96572638 add liblockfile-1.09 2012-08-25 11:20:09 +02:00
Shea Levy df2c5f3568 Merge branch 'openjdk-bootstrap' 
This allows building openjdk without requiring a proprietary jdk as a bootstrap.
 2012-08-24 23:19:11 -04:00
Shea Levy 228c35f0b2 openjdk: Build from bootstrap 2012-08-24 23:05:41 -04:00
Cillian de Róiste 32e339da54 Adding jack_capture: A program for recording soundfiles with jack 2012-08-25 01:58:56 +02:00
Lluís Batlle i Rossell 87a3bcd470 libreoffice: trying to make it build with openjdk 2012-08-24 09:20:53 +02:00
Rob Vermaas 06f1a0bec4 Forgot to commit all-packages.nix for pstack. 2012-08-23 14:15:56 +02:00
Sergey Mironov 222b6e21a5 gimp: revert broken gimp-2.6 dependencies 2012-08-23 03:09:19 +04:00
Eelco Dolstra ac73fc486c Removed unused jdkPlugin attribute 2012-08-22 15:43:19 -04:00
Eelco Dolstra 8020c37f55 Remove obsolete JDK versions 
These are the JDK 5 on powerpc-linux (no longer a maintained Nixpkgs
platform), JDK 1.4 (required a manual download) and JDK 5 on Linux
(idem).
 2012-08-22 15:43:19 -04:00
Mathijs Kwik af3a95d6f3 libiconvOrEmpty: always return a list 
- fixes nixpkgs-tarball
 2012-08-22 16:57:13 +02:00
Peter Simons 30a36ad6e5 hadoop: add version 2.0.1-alpha 2012-08-22 14:13:40 +02:00
aszlig ec6926bf7e ncdu: New package, starting at version 1.8. 
`ncdu` is a little ncurses tool to browse the filesystem tree sorted by disk
usage.
 2012-08-22 10:02:19 +02:00
Eelco Dolstra d7fc07705a Add latest patchelf prerelease 2012-08-21 15:57:41 -04:00
Ludovic Courtès 45ce8c915d libiconvOrNull: Fix libc check. 2012-08-21 16:58:55 +02:00
Ludovic Courtès d53cb937f5 libiconvOrNull: Do not use an external libiconv on glibc systems. 2012-08-21 15:29:37 +02:00
Mathijs Kwik a5663aee4d emacs: add "sunrise commander" 2012-08-21 10:33:20 +02:00
Mathijs Kwik 85c88d473b emacs: add "rect-mark" 2012-08-21 10:33:06 +02:00
Ludovic Courtès a5615adc97 gcc 4.7: Add `gcc47_debug'. 2012-08-20 10:15:42 +02:00
Eelco Dolstra bccab0ff91 slim: Build with ConsoleKit support 2012-08-19 16:00:24 -04:00
Russell O'Connor fdb659906a Merge branch 'master' of https://github.com/NixOS/nixpkgs 2012-08-19 01:05:17 -04:00
Russell O'Connor 706cbc9318 Update coq to 8.4 2012-08-19 01:01:30 -04:00
Eelco Dolstra 006e3fbf46 nix: Update to latest unstable version 2012-08-18 17:54:22 -04:00
Eelco Dolstra 1e4c4b70b1 slim: Really update to 1.3.4 2012-08-17 11:33:59 -04:00
Mathijs Kwik 5a146e9cff emacs: add "color-theme" 2012-08-17 08:55:47 +02:00
Michael Raskin ca84b7ff22 uclibcCross: convert to using callPackage 
It doesn't add any unwanted defaults, and it makes cross-building
experiments (and cross-building for a new device is always
experimental..) way easier.
 2012-08-16 19:39:57 +04:00
Sergey Mironov d339184bbf zathura: version 0.1.2 with plugins 
Expression handles new modular structure of zathura and adds support for djvu,
pdf and ps plugins.
 2012-08-16 18:25:52 +04:00
Peter Simons c0dafdf8d5 Merge pull request #94 from aszlig/boomerang 
boomerang: New package from the fork.
 2012-08-16 06:50:55 -07:00
Antono Vasiljev 61f7853e43 Merge pull request #92 from dmalikov/b125ef36b67f2a0aedabc34eb4dac12e61ae9828 
gitAndTools: bump tig from 0.16 to 1.0
 2012-08-16 06:03:54 -07:00
Lluís Batlle i Rossell 443d65df34 automake: disabling automake tests in mips (2nd attempt) 
As explained in my previous attempt:
  There is a test that fails on mips, and that breaks the nix build.
  The text does not exist anymore in automake upstream git, so the next
  version may not need this mips-specific disabling.
 2012-08-15 10:28:31 +02:00
Sergey Mironov b229c3e09f gxneur: add frontend for XNEUR keyboard layout switcher 2012-08-15 01:10:23 +04:00
Sergey Mironov 36f0a97fc6 atool: add archiver helper 2012-08-15 01:10:05 +04:00
Mathijs Kwik 50cc5629af emacs: add "jade-mode" 2012-08-13 17:50:19 +02:00
Andres Loeh e093d7ea38 ghc-7.6.1-rc1: Add release candidate. 2012-08-13 16:29:01 +02:00
Lluís Batlle i Rossell 88f3b097ee Adding linux iw. 2012-08-11 20:22:45 +02:00
Lluís Batlle i Rossell 2c0b930149 Removing rt73fw. The url was broken, and ralink_fw contains it. 
ralink_fw attribute contains the rt73 firmware, among others from ralink.
 2012-08-11 14:47:15 +02:00
Mathijs Kwik a6f17bd1a9 emacs: add "flymake-cursor" 2012-08-11 09:36:20 +02:00
Peter Simons f20913e51f ikiwiki: support OpenID via HTTPS 
Also enable Perl LWPxParanoidAgent for "additional security".
 2012-08-10 18:57:57 +02:00
Peter Simons 397f1d73ee ikiwiki: enable OpenID support 
* added perl-Crypt-DH-GMP-0.00010
 * added perl-Devel-CheckLib-0.98
 * added perl-HTTP-Message-6.03
 * added perl-IO-CaptureOutput-1.1102
 * added perl-Net-OpenID-Common-1.14
 * added perl-Net-OpenID-Consumer-1.13
 2012-08-10 18:44:01 +02:00
Lluís Batlle i Rossell 734bb84f09 linux-3.5: fix perf build with a patch from the perf mailing list 2012-08-10 09:41:43 +02:00
Lluís Batlle i Rossell 186601f461 opencascade: fixing build by downgrading the automake used 2012-08-10 09:26:47 +02:00
Mathijs Kwik c0a455b370 emacs: add "auto-complete" mode 2012-08-10 08:27:09 +02:00
Mathijs Kwik 260650e7e2 emacs: add "coffee-mode" 2012-08-10 08:27:09 +02:00
aszlig 77b1a7ff42 boomerang: New package from the fork. 
This adds the boomerang decompiler, which has been forked on github because of
some years of inactivity.
 2012-08-09 19:05:16 +02:00
Jan Malakhovski 179b1bd294 Add package enca 1.13 to tools/text 2012-08-08 03:58:17 +04:00
Dmitry Malikov b125ef36b6 Bump gitAndTools/tig from 0.16 to 1.0 2012-08-08 00:51:25 +02:00
Vladimír Čunát cf3ea80e1f Scribus minor update, modifying dependencies. 
- using the boostHeaders dep to build scribus with 2geom (internal)
- adding more xorg deps to build with XCB support
 2012-08-07 17:41:18 +02:00
Vladimír Čunát 740cd9b5f4 LyX: add support for spell checking via enchant. 
Also comment on testing of other config options.
 2012-08-07 16:06:13 +02:00
Rob Vermaas 374886444f xvfb-run: add some runtime dependencies to wrapper, set FONTCONFIG_FILE 2012-08-07 03:27:00 +02:00
Rob Vermaas f676f9e487 Add xvfb-run, a wrapper script for Xvfb. 2012-08-07 03:14:17 +02:00
Michael Raskin bdb1ccaf80 Lilypond: update to 2.14.2 2012-08-05 23:10:49 +04:00
Lluís Batlle 3d2e1508ee surf: updating to 0.5, and making it build. 
It needed webkit_gtk2.
 2012-08-05 16:16:55 +02:00
Mathijs Kwik e8afe3c1c8 add package dstat 2012-08-05 15:10:26 +02:00
Mathijs Kwik 107f5e3560 bup: include support for xattrs, acls and fuse on linux 
this enables the commands "bup meta" and "bup fuse".
 2012-08-05 14:03:34 +02:00
Lluís Batlle 7620bd06cf Adding 'st-0.2.1' 2012-08-05 12:44:01 +02:00
Mathijs Kwik a8be5de82e emacs: add lorem-ipsum package 2012-08-05 02:16:01 +02:00
Mathijs Kwik 56d30f72da emacs: add gist package 2012-08-05 02:15:48 +02:00
Mathijs Kwik ad5c002891 emacs: add gh (github) package 2012-08-05 02:15:34 +02:00
Mathijs Kwik 733b548cd0 emacs: add pcache package 2012-08-05 02:15:11 +02:00
Mathijs Kwik c700ec276d emacs: add logito package 2012-08-05 02:14:53 +02:00
Mathijs Kwik fb99c24d7c kernel-3.5: add aufs3 patch 2012-08-05 01:55:31 +02:00
Lluís Batlle i Rossell 592b980931 gccgo46: removing it. I set gccgo = gcc47 
gccgo46 did not build for me, and maybe never built at all.
The same recipe, though, worked fine for gcc47. So let's go with gcc47.
 2012-08-03 19:52:19 +02:00
Lluís Batlle i Rossell a375ffa53f Adding gccgo for gcc4.7. 
I tested hello world, and it works.
 2012-08-03 19:49:53 +02:00
Michael Raskin 901574fe8a Julia language: update to a fresh version 
Update julia and some of its dependencies

Split PCRE because a lot of packages depend on it and I am not sure we
want to test them in a hurry (and Julia specifies exact version).
 2012-08-02 17:48:36 +04:00
Lluís Batlle i Rossell 4f972b793f Adding the gcc47 attribute, pointing to gcc47_real, for 
the attributes to look like the gcc46 case.

I add a comment about a sheevaplug situation we have to test again.
 2012-08-02 12:54:51 +02:00
Lluís Batlle i Rossell 7954b01342 Adding gcc 4.7.1. 2012-08-02 12:53:30 +02:00
Shea Levy ec587dfc25 kernelPackages.splashUtils: Enable detecting if manually configured kernels have fbcondecor 2012-08-01 21:44:53 -04:00
Shea Levy 6c0b7103c9 Add sbc 2012-08-01 06:12:20 -04:00
Rob Vermaas eb29e0449b Add mod_evasive 2012-07-31 15:51:31 +02:00
Arie Middelkoop 5bc99bc883 Adds Ocaml 4.00.0 (first attempt) 
Bumps Findlib to 1.3.3 (required for ocaml 4.00)
 2012-07-31 14:09:27 +02:00
Arie Middelkoop 2df1d646c8 frama-c: add version 20111001 2012-07-31 14:08:52 +02:00
Eelco Dolstra 812c182be5 s3sync: Require Ruby 1.8 2012-07-30 11:18:18 -04:00
Shea Levy da4c64026a linux/kernel/manual-config: Greatly simplify config parser 2012-07-29 15:54:31 -04:00
Peter Simons 9e334221fc ikiwiki: enable pass phrase authentication support 2012-07-29 21:39:49 +02:00
Peter Simons f8ff9b74e9 all-packages.nix: strip trailing whitespace 2012-07-29 21:34:20 +02:00
Shea Levy f0694a3151 linux/kernel/manual-config: Do all of the config file parsing in the imported-from derivation 2012-07-29 13:24:05 -04:00
Shea Levy 98341e0bda linux/kernel/manual-config: Use the kernel's make install 2012-07-29 04:48:50 -04:00
Shea Levy 6e3b17feec linux/kernel/manual-config: Run depmod after build 2012-07-29 04:01:40 -04:00
Shea Levy ff728a6365 The kernel build needs hostname and perl 2012-07-29 01:29:56 -04:00
Shea Levy bf7467cbb1 Add first attempt at linux/kernel/manual-config. 
The goal of this function is to make it possible to build a kernel with a user provided .config.
As a secondary goal, it will extract NixOS-relevant features from the config automatically.
As a tertiary goal, the build will aim to be simpler than the current generic kernel builder.sh.

Unfortunately, that simplicity is offset by the complexity of the feature extraction, especially since nix segfaults when trying to split the file into lines (so an import from a derivation is used)
 2012-07-29 01:23:51 -04:00
Lluís Batlle i Rossell 32b48d64dc Adding 'ii', irc it. 2012-07-27 22:43:40 +02:00
Eelco Dolstra 1d44578b48 Add ciopfs 2012-07-25 23:18:40 -04:00
Eelco Dolstra 403e594207 ec2-ami-tools: Update to 1.6.0.0 2012-07-25 23:18:39 -04:00
Shea Levy b0552eb9ca Add npm2nix 2012-07-25 18:11:57 -04:00
Shea Levy 42da3759a2 Remove the 'with pkgs;' from node-packages.nix. 
Packages depending on non-node packages should refer to their deps with pkgs.name
 2012-07-25 17:53:02 -04:00
Shea Levy 6a4887475b Add nodePackages attr to all-packages 2012-07-25 17:51:33 -04:00
Shea Levy 3a37f47fd4 v8: build with gyp. 
The scons build has been deprecated
 2012-07-25 11:42:15 -04:00
Eelco Dolstra 6262db94a9 grub: Update to 2.00 2012-07-24 22:33:39 -04:00
Phreedom 0b112cb489 F-Prot: package 2012-07-24 10:48:22 +03:00
Peter Simons 519248fdbb Merge pull request #56 from aszlig/netrw 
Add package netrw
 2012-07-23 11:21:06 -07:00
Phreedom 113016af86 ClamAV: package. 2012-07-23 17:22:51 +03:00
Mathijs Kwik c750a66717 bup: update to latest git version. 
why the git version? 0.24b (in nixpkgs) was broken.
using 0.25rc1 gave the same error (gcc 4.6 related)
Both these versions are over a year old and lots of
commits were made after that, including something
that fixed building on nix.
 2012-07-22 19:53:35 +02:00
Peter Simons 201bdd1b6c all-packages.nix: strip trailing whitespace 2012-07-22 18:55:02 +02:00
Peter Simons 72e07c2940 bison: add version 2.6 2012-07-22 18:54:50 +02:00
Shea Levy 053f641d16 Add linux-3.5 2012-07-22 11:33:00 -04:00
Florian Friesdorf 7bf4ec13f9 RealPlayer needs callPackage_i686 2012-07-21 14:11:41 +02:00
Joachim Schiele 538b17a791 fixed most virt-manager issues! 2012-07-20 23:27:24 +00:00
aszlig 8ded076ac0 Add new package netrw, version 1.3.2. 
The upstream URL unfortunately wasn't available at this time, so I provided an
alternate mirror. I checksummed the file against the hashes from various
distributions in order to make sure it's the right one.
 2012-07-20 01:45:49 +02:00
Mathijs Kwik 62f698dfd3 give pkgs a reference to itself. 
As discussed on nix-dev, this allows me to create a separate package
repository which can be used like all-packages.nix (callPackage),
without the need to run from a forked tree.
 2012-07-19 14:15:18 +02:00
Michael Raskin 7bb60c640d LMMath: add Latin Modern Math font 2012-07-19 09:07:57 +04:00
Shea Levy 4497344e49 Merge branch 'master' into x-updates 2012-07-18 23:24:10 -04:00
Eelco Dolstra d077a98e77 nix: Update to 1.1 2012-07-18 21:50:41 -04:00
Cillian de Róiste 8ebb309320 Pin xf86-video-nested to a revision that works with Xorg 7.6 2012-07-18 22:52:43 +02:00
Cillian de Róiste 6efd9b24d3 Add xf86-video-nested 
This does not yet compile. I had a working version from an obsolete github repo, but then found the upstream repo. Perhaps it needs a newer Xorg.
 2012-07-18 22:52:16 +02:00
Eelco Dolstra 26fa2425c6 Fix dmraid build 
http://hydra.nixos.org/build/2842473
 2012-07-18 09:25:58 -04:00
Eelco Dolstra b9b5a8d7c1 Fix btrfs-progs build 
http://hydra.nixos.org/build/2842473
 2012-07-18 09:21:33 -04:00
Peter Simons b6325a7213 tbb: add version 4.0-u5 2012-07-18 12:44:37 +02:00
Rob Vermaas 597da08646 Pass docutils from pythonPackages to mercurial 2012-07-18 12:42:33 +02:00
Peter Simons 884e91e9a7 Merge pull request #45 from 7c6f434c/texlive-2012 
TeXLive: update to 2012 snapshot from Debian
 2012-07-18 02:39:42 -07:00
Rob Vermaas 09f6874aad Add trickle 1.07 2012-07-16 12:06:31 +02:00
Peter Simons 36265e9c66 Merge pull request #5 from aszlig/xpra 
New version of Xpra from the fork
 2012-07-16 02:32:02 -07:00
Peter Simons fd749dd9bf Merge pull request #32 from peti/xen-update 
Xen for Linux 3.2
 2012-07-16 02:27:23 -07:00
Shea Levy 0ef65a6bab webkit: Update to 1.8.1 in attempt to fix build with new glib 
Sorry if my 'fixConfigure' is not idiomatic builderDefs, I've not used it before
 2012-07-16 00:16:03 -04:00
Shea Levy 4f01e68ff8 xf86-input-synaptics: Needs mtdev and pixman 2012-07-15 22:53:43 -04:00
Shea Levy c514ee974a Merge remote-tracking branch 'upstream/master' into x-updates 
mountall conflict was trivial

Conflicts:
	pkgs/os-specific/linux/mountall/default.nix
 2012-07-14 14:24:27 -04:00
Peter Simons 3d416ed030 ikiwiki: update to version 3.20120629 2012-07-14 14:51:08 +02:00
Shea Levy 5330b4a343 Add b43-firmware-5.100.138 
Placed into a versioned nix file because kernels older than 3.2 need an older version.
 2012-07-13 18:31:09 -04:00
Shea Levy 9d387d616d Add b43-firmware-cutter 2012-07-13 18:00:00 -04:00
Michael Raskin f2a77f5d9d TeXLive: update to 2012 snapshot from Debian 2012-07-13 18:18:52 +04:00
Shea Levy 8253542544 Add logstash 
For now just download the pre-built jar. We may build our own later.
 2012-07-11 07:23:14 -04:00
Peter Simons d59146be3d all-packages.nix: strip trailing whitespace 2012-07-10 16:15:31 +02:00
Peter Simons 12c0998e03 libmng: build library with Automake 1.10.x; the build fails with later versions 2012-07-10 16:15:30 +02:00
Eelco Dolstra b00c839f4b Add ElasticMQ, a message queue service 2012-07-09 15:26:07 -04:00
Eelco Dolstra a0cb7e4a61 Add aws, a utility for working with various AWS services 2012-07-09 13:47:41 -04:00
Shea Levy 45bbcb9638 Add initial attempt at ossec 
Note: This will almost certainly not work as-is, but at least it compiles.
NixOS module to come.
 2012-07-09 11:44:44 -04:00
Shea Levy 158e74fd43 Merge branch 'lv2-support' of https://github.com/cillianderoiste/nixpkgs-goibhniu 
Add lv2 support

All builds, and the only change that's not a pure addition is to
ardour3, which Cillian maintains.

If there are future lv2 plugins coming, it may make sense to group them
somehow in all-packages.
 2012-07-07 20:53:14 -04:00
Peter Simons 9c5f897465 SpamAssassin: add version 3.3.2 2012-07-08 00:32:37 +02:00
Shea Levy 0841407843 ledger3: Build with boost 1.49 
The build failed with boost 1.50, and succeeds now.
 2012-07-07 18:00:58 -04:00
Antono Vasiljev 631a59e449 Added mr - Multiple Repository management tool 2012-07-07 17:12:18 +02:00
Ludovic Courtès 2424ac71e0 libmng: use Automake 1.11 
Reported by Peter Simons <simons@cryp.to>.
 2012-07-07 15:44:34 +02:00
Peter Simons 48b6730f3c ghost-one: the linking phase requires boost in tagged layout 2012-07-07 11:57:52 +02:00
Peter Simons 5b4d0bb383 boost: drop unused 'boostFull' variant 
The full boost build is huge, it's unused, and it crashes GCC 4.6 anyway.
 2012-07-07 11:51:22 +02:00
Peter Simons 0921d5ddda ghost-one: fix build by compiling with Boost 1.44 2012-07-07 11:50:03 +02:00
Peter Simons 5479b9f3b6 twinkle: link standard version of boost 2012-07-07 11:49:31 +02:00
Peter Simons 8347aefe69 cppnetlib: build with boostHeaders 2012-07-07 11:45:36 +02:00
Ludovic Courtès ef38f708d6 automake: switch the default to 1.12 2012-07-07 11:27:29 +02:00
Ludovic Courtès 25adbc91bb automake: add version 1.12.1 2012-07-07 11:27:29 +02:00
Ludovic Courtès 240d2e9cfa automake: remove versions 1.7 and 1.9 2012-07-07 11:27:29 +02:00
Peter Simons c870b80512 apache: add version 2.4 2012-07-07 08:47:19 +02:00
Lluís Batlle i Rossell 758209f075 Adding libdivsufsort. 
Required for zpaq; I want to package it.
 2012-07-06 12:01:49 +02:00
aszlig ceff799efc xpra: Add python notify module. 
This is not needed to run XPRA, but gets rid of a few nasty errors.

XPRA is using the notify library to display nice desktop notifications, so there
might be users who actually like to have those funny things.
 2012-07-06 03:41:32 +02:00
aszlig d802bacdd9 xpra: New version from the fork. 
This is because the original version is no longer in development, as stated on
the website at http://code.google.com/p/partiwm/wiki/xpra:

"This project is in deep hibernation; I haven't had time to devote for several
years now. If you are looking for xpra, you may prefer Antoine Martin's fork,
which receives more support. It is available at: http://xpra.org/"

So I guess its safe to switch over to that fork.
 2012-07-06 03:39:55 +02:00
aszlig af9924b929 Add Cython, because it's needed to build xpra. 2012-07-06 03:12:08 +02:00
Cillian de Róiste a2501c3561 Adding lv2 support 
LV2 is a portable plugin standard for audio systems, similar in scope to  LADSPA, VST, AU, and others. The Calf audio plugin pack uses LV2 and Ardour3 has also been updated to support LV2 Plugins
 2012-07-05 23:29:45 +02:00
Mathijs Kwik ffe4829bbb mongodb: switch to boost 1.49 now it's back 2012-07-05 12:01:24 +02:00
Lluís Batlle i Rossell aa75c065d4 libmikmod and mikmod: update the former to 3.2.0, and add mikmod. 2012-07-04 23:43:25 +02:00
Ludovic Courtès cb0d79e60f viking: Update to 1.3. 2012-07-02 22:52:37 +02:00
Lluís Batlle i Rossell dcdea9d2b8 cinepaint: updating, and making it build 
I wrote a little patch for the cmake files, or it
didn't install.

I also used the NIX_LDFLAGS trick; they are not doing proper linking somehow.
 2012-07-02 22:27:18 +02:00
Lluís Batlle i Rossell aab4bec314 ufoai: fixing the build. Building with libpng12. 2012-07-02 21:53:03 +02:00
Lluís Batlle i Rossell cfea75c381 speed dreams: fixing the build (libpng version) 2012-07-02 20:38:57 +02:00
Lluís Batlle i Rossell e81c31cd51 libreoffice: trying to make it build again, with boots 1.49 
The error shown in hydra looks like that appearing in other packages
fixed by downgrading their boost dependency from 1.50 to 1.49.

Not tested.
 2012-07-02 19:46:16 +02:00
Lluís Batlle i Rossell 77da6ba734 enblend/enfuse: making it build again, with boost 1.49. 
Boost 1.50 broke its build.
 2012-07-02 19:44:12 +02:00
Peter Simons 55876bd4e6 Add configuration to build a XEN-enabled variant of the Linux 3.2 kernel. 2012-07-02 17:45:41 +02:00
Peter Simons 8db6c55944 klavaro: add version 1.9.5 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 17:13:36 +02:00
Peter Simons 2e1e7fcc4c gtkdatabox: add version 0.9.1.3 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 17:13:36 +02:00
Peter Simons 0945c119a5 remmina: add version 1.0.0 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 17:13:35 +02:00
Peter Simons 7c76847d5b mirage: add version 0.9.5.2 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 17:13:35 +02:00
Peter Simons 36e345d052 mcomix: added version 0.98 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 17:13:35 +02:00
Peter Simons 3c28927a00 transmission-remote-gtk: add version 1.0.1 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 17:13:35 +02:00
Peter Simons a2f4366497 libvdpau: simplify arguments to this function 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 16:53:52 +02:00
Shea Levy 4f8d6d0ee2 Merge remote-tracking branch 'peti/boost-cleanup' 
Keep boost-1.49 for now.
 2012-07-02 01:05:52 -04:00
Cillian de Róiste f823b6230d Fix compilation error when using boost 1.5 by pinning the boost version to 1.49 2012-07-02 00:13:19 -04:00
Mathijs Kwik 81baf55892 mongodb: needs boost 1.4.* 
Downgraded to use boost 1.4.7 as 1.4.9 is scheduled to be removed.
 2012-06-30 10:34:08 +02:00
Mathijs Kwik b37521e297 grive: new package 2012-06-30 10:34:07 +02:00
Eelco Dolstra b5949d2509 busybox: Update to 1.20.1 2012-06-28 14:05:56 -04:00
Peter Simons aa5b45fc3e amd-ucode: add AMD processor microcode patch version 2012-01-17 
Enable by adding "hardware.firmware = [ pkgs.amdUcode ];" to configuration.nix.
 2012-06-28 19:54:24 +02:00
Peter Simons 42faecad0d boost: delete unused versions 1.42.0, 1.48.0, and 1.49.0 as well as 1.49.0-headers 2012-06-28 18:06:59 +02:00
Peter Simons 6e936640b0 bitcoin: update to version 0.6.3 (and build with boost 1.50.0) 2012-06-28 18:04:29 +02:00
Peter Simons 8498c9b86c boost: update to version 1.50.0 2012-06-28 16:42:41 +02:00
Mathijs Kwik 42ea23675e ogmtools: new package 2012-06-28 11:41:58 +02:00
Lluís Batlle i Rossell 002ffde4a4 trac: Removing the old misc/trac. 
There is a much newer trac at python-packages.nix, and it is used
by nixos' trac apache service.
 2012-06-27 22:34:27 +02:00
Lluís Batlle i Rossell db395d9eb3 cgdb: Packaging cgdb 0.6.6 2012-06-27 20:29:56 +02:00
Lluís Batlle 1f1a6c9773 Merge branch 'master' from viric's fork. 
It has a few updates to some packages: taskwarrior, dar.
Also made links2 cross-build.
 2012-06-27 19:33:34 +02:00
Shea Levy 3c7dba0dc6 Merge pull request #25 from antono/vala-generations 
Vala 15, 16, 17. Default is 17 now
 2012-06-26 20:23:57 -07:00
Antono Vasiljev 58738223ab Rm vala 14 add versions 2012-06-25 19:01:51 +03:00
Antono Vasiljev 182f0dfe5e Added bsod emulator for unix 2012-06-25 17:25:01 +03:00
Antono Vasiljev e6e6301c5f Vala 14, 15, 16, 17. Default is 17 now 2012-06-25 16:46:26 +03:00
Rob Vermaas 6dc45870af * Add MiniDLNA 1.0.24, media server 2012-06-24 20:24:58 +02:00
Lluís Batlle 7ab7120964 Merge remote-tracking branch 'central/master' 2012-06-24 19:03:50 +02:00
Antono Vasiljev bca195dcb8 Reordered alphabetically 2012-06-23 02:26:39 +03:00
Antono Vasiljev 1b2d1f8399 Added ubuntu-font-family 2012-06-23 01:55:47 +03:00
aszlig b1fdecc460 chromium: Rename "chrome" binary to "chromium". 
This is to make it more consistent with the naming of the package file and also
consistent with the build, as we're not using the Google branded version.

In addition the derivation attribute set now has a packageName value which can
be used to easily switch the binary names and paths, just in case we want to
switch to using "chrome" (or something entirely different) again.
 2012-06-22 15:53:29 -04:00
aszlig a31301dab4 chromium: Minimal build (no install) from source. 
This only gets chromium to build so far, installation is missing by upstream, so
we need to manually copy the corresponding files. And I guess with nix, we also
need to patch a few paths on installation.

Another issue is that at the moment, a lot of dependencies are used from the
source tree, rather than from the system.

Also, it would be nice to build using LLVM, as it really speeds up compilation a
*LOT* and also has the side effect of resulting in smaller binaries.

Working unit tests would be nice, too. Unfortunately they're quite heavyweight
and take hours to run, so I guess "someday" would be the most appropriate time
to integrate.

Further todo's:

- Allow to disable GConf, GIO and CUPS.
- Option to disable the sandbox (for whatever reason the user might have).
- Integrate gold binutils.
- Pulseaudio support.
- Clearly separate Linux specific stuff.
 2012-06-22 15:53:27 -04:00
aszlig b06fb762b4 Add tkabber plugins v0.11.1. 2012-06-22 14:47:34 -04:00
aszlig 74b408e151 Add tkabber v0.11.1. 2012-06-22 14:47:34 -04:00
aszlig 572cc12321 Add tkabber dependency tcltls v1.6. 2012-06-22 14:47:34 -04:00
aszlig 3c7da30e12 Add tkabber dependency tcllib v1.14. 2012-06-22 14:47:34 -04:00
aszlig 6c8509b98d Add tkabber dependency bwidget v1.9.5. 2012-06-22 14:47:34 -04:00
Eelco Dolstra d5bb10417e nixUnstable: Updated to 1.1pre2714_2f3f413 
This version brings systemd support and automatic log compression.
 2012-06-22 10:34:08 -04:00
Lluís Batlle 743cf1ec50 Removing the old unstable taskwarrior; the stable version is on 2.x already. 2012-06-22 15:53:42 +02:00
Eelco Dolstra 7925441bab net-snmp: Moved to pkgs/servers/monitoring 2012-06-21 15:22:17 -04:00
aszlig c1c74e45c5 Add fonts from the DOSEmu project. 
These are mainly fonts like the DOS standard VGA fonts.
 2012-06-20 23:25:16 -04:00
Eelco Dolstra 1582276602 * Drop some old obsolete kernels and unused patches. 
svn path=/nixpkgs/trunk/; revision=34558
 2012-06-19 15:56:17 +00:00
Peter Simons 1e196a120f all-packages.nix: stripped trailing whitespace 
svn path=/nixpkgs/trunk/; revision=34541
 2012-06-18 09:52:37 +00:00
Peter Simons 5f81184129 all-packages.nix: fixed path to stardict expression 
svn path=/nixpkgs/trunk/; revision=34540
 2012-06-18 09:52:30 +00:00
Joachim Schiele 0de49e8c04 StarDict is a Cross-Platform and international dictionary Software. Now it is available on NixOS. See https://nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications if you want to get it running. 
svn path=/nixpkgs/trunk/; revision=34531
 2012-06-17 18:41:00 +00:00
Eelco Dolstra 5808b3804c * Add bchunk. 
svn path=/nixpkgs/trunk/; revision=34529
 2012-06-17 03:36:22 +00:00
Lluís Batlle i Rossell 3874e5812d Adding two kernel patches for mips, that make the life easier on loongson2f 
(less sigill, less sigbus). Related to bad handling of FPU instructions.

I apply them only to linux 3.4, although I think they can apply to many older kernels too.


svn path=/nixpkgs/trunk/; revision=34522
 2012-06-16 10:49:03 +00:00
Ludovic Courtès 6ccf519fc6 GCC 4.7.1. 
svn path=/nixpkgs/trunk/; revision=34512
 2012-06-14 20:40:22 +00:00
Peter Simons e71f2ed1f7 all-packages.nix: disable dependencies in Emacs 24 that we didn't have in Emacs 23 either 
It's unclear what adding these dependencies accomplishes. If you find that a
feature you need doesn't work anymore, please feel free to re-enable the
appropriate dependencies.

svn path=/nixpkgs/trunk/; revision=34510
 2012-06-14 19:44:34 +00:00
Eelco Dolstra 4f19239875 * Clean up the Ant name, e.g. "ant-openjdk-1.8.0RC1" instead of 
"ant-<JDK name>".
* Remove openjdkDarwin/ecjDarwin/antDarwin attributes.  Instead
  the openjdk attribute refers to the Darwin package on Darwin.

svn path=/nixpkgs/trunk/; revision=34505
 2012-06-13 14:11:52 +00:00
Yury G. Kudryashov 316222e2e1 Mass telepathy update, add telepathy-haze 
svn path=/nixpkgs/trunk/; revision=34494
 2012-06-13 07:09:19 +00:00
Yury G. Kudryashov c6d9ead047 Add vanilla pkg-config 
Some packages (e.g., telepathy) rely on the upstream way to handle
Requires.private in pkg-config.

svn path=/nixpkgs/trunk/; revision=34492
 2012-06-13 07:09:10 +00:00
Yury G. Kudryashov 4638c52fb6 dovecot-2.1.7 
svn path=/nixpkgs/trunk/; revision=34490
 2012-06-13 07:09:03 +00:00
Mathijs Kwik 46beccef20 linux kernel aufs (needed for livecd): added to 3.4 
upgraded 3.3 version to stable

svn path=/nixpkgs/trunk/; revision=34468
 2012-06-11 17:41:05 +00:00
Mathijs Kwik e19cc94e1a added vobcopy: nice CLI dvd ripper 
svn path=/nixpkgs/trunk/; revision=34466
 2012-06-11 17:40:58 +00:00
Eelco Dolstra d63bcce038 * Added pam_ssh_agent_auth, a PAM module for authentication through 
the SSH agent.

svn path=/nixpkgs/trunk/; revision=34462
 2012-06-11 16:45:54 +00:00
Peter Simons e0f5d8870e Updated Emacs default version from 23.3 to 24.1. 
Yay!

svn path=/nixpkgs/trunk/; revision=34461
 2012-06-11 16:41:31 +00:00
Peter Simons cc54e3e695 all-packages.nix: removed recurseIntoAttrs from emacs24Packages 
Offering the names of those packages in "nix-env -qa *" is pointless
because it's impossible to install any of those packages by name. Only
packages from emacs23Packages can be installed by name.

svn path=/nixpkgs/trunk/; revision=34449
 2012-06-11 08:21:32 +00:00
Peter Simons 73ede3160b all-packages.nix: strip trailing whitespace 
svn path=/nixpkgs/trunk/; revision=34448
 2012-06-11 07:44:16 +00:00
Peter Simons a7949741f6 gimp 2.8 
- rename package from gimp_2_8_0 to gimp_2_8 as discussed on mailing list[1]
- remove babl_0_1_10 and gegl_0_2_0 and use them as default versions

[1] http://article.gmane.org/gmane.linux.distributions.nixos/8708

svn path=/nixpkgs/trunk/; revision=34444
 2012-06-11 07:17:39 +00:00
Peter Simons 7b14de6733 Add package for vlock from Debian mirror. 
This is mainly because the original upstream URL is not available anymore.

svn path=/nixpkgs/trunk/; revision=34442
 2012-06-11 07:16:11 +00:00
Eelco Dolstra 192291eb01 * Added net-snmp. 
svn path=/nixpkgs/trunk/; revision=34413
 2012-06-09 23:28:07 +00:00
Yury G. Kudryashov f6e6e4287d Add kbibtex 
svn path=/nixpkgs/trunk/; revision=34404
 2012-06-09 13:09:45 +00:00
Yury G. Kudryashov 3640b0c1e9 Add GiNaC 
svn path=/nixpkgs/trunk/; revision=34403
 2012-06-09 13:09:41 +00:00
Peter Simons 572b182042 all-packages.nix: removed broken 'dzen2' attribute, it refers to a non-existent file 
svn path=/nixpkgs/trunk/; revision=34383
 2012-06-08 13:34:43 +00:00
Arie Middelkoop 3c74283d03 Committing some outstanding modifications that I cannot make into smaller chunks anymore. 
* added briss: a pdf cropper
* added compton, an improved fork of xcompmgr
* added myself to the maintainers list
* minor version bumps: xcompmgr, upower


svn path=/nixpkgs/trunk/; revision=34380
 2012-06-08 10:16:46 +00:00
Eelco Dolstra f677edf57f * Firefox 13.0. It's not stable yet though - it seems to hang the 
first time a Flash control is loaded, with the following message on
  stderr:

    /nix/store/c5ma4l7nlzcwdkjzrflni58aacqrfs1y-xulrunner-13.0/lib/xulrunner-13.0/plugin-container: symbol lookup error: /nix/store/c5ma4l7nlzcwdkjzrflni58aacqrfs1y-xulrunner-13.0/lib/xulrunner-13.0/plugin-container: undefined symbol: malloc_message

  Need to investigate where malloc_message is defined.

svn path=/nixpkgs/trunk/; revision=34368
 2012-06-06 14:35:56 +00:00
Lluís Batlle i Rossell 0332f87a0b Adding windows jom; it does not build for me still, but it's close to it. 
I think it's better to share it though. I wrote a comment about the expression
not building.


svn path=/nixpkgs/trunk/; revision=34365
 2012-06-05 21:24:27 +00:00
Andres Löh cfdf9cafaa Setting GHC default version to 7.4.1, default platform to 2012.2.0.0. 
svn path=/nixpkgs/trunk/; revision=34355
 2012-06-05 08:09:10 +00:00
Cillian de Roiste 27bef25b17 Applying the patch from Rok Garbas to add GIMP 2.8.0 
svn path=/nixpkgs/trunk/; revision=34352
 2012-06-04 17:38:47 +00:00
Rickard Nilsson 0d719146a2 Moved obnam from pythonPackages to pkgs. 
svn path=/nixpkgs/trunk/; revision=34336
 2012-06-04 05:02:31 +00:00
Andres Löh 23f81c74c9 Provide a shortcut for the current Haskell Platform version. 
svn path=/nixpkgs/trunk/; revision=34314
 2012-06-01 12:27:20 +00:00
Michael Raskin 2de23edd59 Adding LLVM 3.1. (as a separate attribute, because it seems to be API-incompatible) 
svn path=/nixpkgs/trunk/; revision=34300
 2012-05-31 11:04:28 +00:00
Eelco Dolstra c57a50290a * Mark jdkPlugin/jrePlugin as low priority. 
svn path=/nixpkgs/trunk/; revision=34294
 2012-05-31 02:28:14 +00:00
Peter Simons 6050e8749c haskell-defaults.nix: dropped 'packages_ghc741_pedantic' variant, it's identical to 'packages_ghc741' now 
svn path=/nixpkgs/trunk/; revision=34284
 2012-05-29 20:16:16 +00:00
Lluís Batlle i Rossell ac1857cef1 Adding fio, the flexible IO tester. 
svn path=/nixpkgs/trunk/; revision=34275
 2012-05-29 14:21:55 +00:00
Andres Löh 9f47f715c1 Revert bogus change. 
svn path=/nixpkgs/trunk/; revision=34273
 2012-05-29 14:02:26 +00:00
Andres Löh 4e10015cab Added gnumeric. 
svn path=/nixpkgs/trunk/; revision=34272
 2012-05-29 12:21:33 +00:00
Russell O'Connor 417a07a0e9 Updatings ssreflect to depend on camlp5 version 6. 
svn path=/nixpkgs/trunk/; revision=34263
 2012-05-28 20:53:17 +00:00
Russell O'Connor 390907e0a2 Update coq to use camlp5 version 6. 
svn path=/nixpkgs/trunk/; revision=34261
 2012-05-28 19:41:26 +00:00
Lluís Batlle i Rossell 383b76df79 Fixing mingw-w64 builds. I can build simple C++ programs with gccCrossStageFinal. 
I also add tests for hydra; let's see if it builds far.


svn path=/nixpkgs/trunk/; revision=34232
 2012-05-24 22:07:23 +00:00
Lluís Batlle i Rossell 3729f9ce5e Trying to add a few bits of mingw-w64. To be tested. 
svn path=/nixpkgs/trunk/; revision=34228
 2012-05-24 21:23:23 +00:00
Ludovic Courtès b4cecdea10 Ploticus 2.41. 
svn path=/nixpkgs/trunk/; revision=34216
 2012-05-22 21:18:25 +00:00
Lluís Batlle i Rossell 5c393a469b Adding linux 3.4. 
svn path=/nixpkgs/trunk/; revision=34209
 2012-05-22 15:29:51 +00:00
Lluís Batlle i Rossell 7962af0fe5 Updating libv4l (part of v4l-utils). I moved v4l-utils to stdenv.mkDerivation style, 
and it's used to build either libv4l or the utils (with qt4).


svn path=/nixpkgs/trunk/; revision=34208
 2012-05-22 14:30:12 +00:00
Eelco Dolstra 4ac1552b15 * Added systemd. 
svn path=/nixpkgs/trunk/; revision=34200
 2012-05-21 20:48:19 +00:00
Eelco Dolstra 1a22e9761d * By default, build a dynamically linked Busybox. In the initrd we 
need Glibc anyway, so there is no point in static linking.  This
  saves about a megabyte from the initrd.

svn path=/nixpkgs/trunk/; revision=34197
 2012-05-21 17:51:40 +00:00
Rickard Nilsson 61ef2ff439 gnome-terminator 0.96. 
svn path=/nixpkgs/trunk/; revision=34195
 2012-05-21 15:08:16 +00:00
Andres Löh 7aa85ac536 Adding NVIDIA CUDA toolkit and haskell-accelerate-cuda plus deps. 
svn path=/nixpkgs/trunk/; revision=34186
 2012-05-20 17:38:03 +00:00
Eelco Dolstra 41840af689 * Add a setup hook ‘autoreconfHook’ to simplify packages that need to 
run autoreconf:

    buildInputs = [ autoreconfHook ];

  is essentially equivalent to

    buildInputs = [ autoconf automake libtool ];
    preConfigure = "autoreconf -i";

svn path=/nixpkgs/branches/x-updates/; revision=34181
 2012-05-19 02:52:36 +00:00
Michael Raskin f5211427b4 Adding zgrviewer 
svn path=/nixpkgs/trunk/; revision=34166
 2012-05-18 09:32:02 +00:00
Rob Vermaas 1e7dc29a98 add haproxy 
svn path=/nixpkgs/trunk/; revision=34165
 2012-05-18 07:50:10 +00:00
Eelco Dolstra 1d4df9f299 * Added fail2ban, a program that scans log files for repeated failing 
login attempts and bans IP addresses.

svn path=/nixpkgs/trunk/; revision=34148
 2012-05-16 22:58:49 +00:00
Eelco Dolstra 277bd69fa9 * Glib/ATK/Pango/GTK+ updates. 
svn path=/nixpkgs/branches/x-updates/; revision=34145
 2012-05-16 21:58:57 +00:00
Cillian de Roiste e9548cc845 Upgrading default erlang to R15 and keeping R14 as an older option, removing extra random older versions. I assume they are not of interest. 
svn path=/nixpkgs/trunk/; revision=34117
 2012-05-15 17:57:50 +00:00
Eelco Dolstra fb23d3a515 * Mark sqlite and sqliteFull as low priority (as opposed to 
sqliteInteractive).

svn path=/nixpkgs/trunk/; revision=34112
 2012-05-15 16:08:10 +00:00
Marco Maggesi 003d844aaf Removed dead code 
svn path=/nixpkgs/trunk/; revision=34099
 2012-05-15 06:30:58 +00:00
Andres Löh c601a302c7 Restructured Haskell packages a bit. 
* There's a new file called haskell-defaults.nix.
   * The new file contains:

         - Default package version settings for each compiler version.
         - All the stuff that previously still was in all-packages.nix.

   * A relatively small part is left in all-packages.nix.

svn path=/nixpkgs/trunk/; revision=34088
 2012-05-14 13:09:05 +00:00
Eelco Dolstra 8a5d68220a * Nix 1.0. 
svn path=/nixpkgs/trunk/; revision=34068
 2012-05-12 04:20:26 +00:00
Eelco Dolstra bcefaeea13 * Don't use the prerelease of GnuPG by default. 
svn path=/nixpkgs/trunk/; revision=34054
 2012-05-10 23:51:40 +00:00
Joachim Schiele 2a6579bdb6 virtinst installs now. still most tools don't work and virt-manager still has problems with finding libvirt. 
svn path=/nixpkgs/trunk/; revision=34052
 2012-05-10 19:29:54 +00:00
Eelco Dolstra 3bb2f92106 * Final sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=34045
 2012-05-10 14:41:16 +00:00
Andres Löh 262c2a45b0 Changing the way haskellPackagesFun is invoked. 
This is supposed to make it easier to create locally modified
version preferences in Haskell package sets, by using override
on the extraPrefs attribute.

svn path=/nixpkgs/trunk/; revision=34031
 2012-05-09 16:20:01 +00:00
Eelco Dolstra 24594b0fb3 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=34028
 2012-05-09 11:49:52 +00:00
Lluís Batlle i Rossell b713e291a4 The jujuutils are meant for a recent kernel, more recent than our linuxHeaders. 
Therefore I add recent linuxHeaders for it.

It's quite a hack to build it mixed with 2.6.35 headers and 3.3.5, but it builds at least.


svn path=/nixpkgs/trunk/; revision=34021
 2012-05-08 16:38:21 +00:00
Lluís Batlle i Rossell 671857995d Adding jujuutils. 
svn path=/nixpkgs/trunk/; revision=34020
 2012-05-08 15:31:21 +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
Eelco Dolstra ab55de20c1 * GMP 5.0.5. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=34007
 2012-05-07 20:03:12 +00:00
Eelco Dolstra 08b6b9fa3a * Cygwin: provide a Perl setup hook so that Perl dependencies work 
properly.

svn path=/nixpkgs/trunk/; revision=34002
 2012-05-07 02:06:29 +00:00
Joachim Schiele 0d95f69b2d virtinst 
svn path=/nixpkgs/trunk/; revision=34000
 2012-05-07 00:17:43 +00:00
Joachim Schiele f6c6bdda81 virt-manager is not working yet, but as we are not using git yet, i use this to cooperate with viric ;-) 
svn path=/nixpkgs/trunk/; revision=33997
 2012-05-06 19:25:01 +00:00
Shea Levy 497a4afe72 We no longer need the bootstub config patch 
svn path=/nixpkgs/trunk/; revision=33987
 2012-05-05 14:26:20 +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
Lluís Batlle i Rossell b30b5a192e Adding libdc1394 
svn path=/nixpkgs/trunk/; revision=33975
 2012-05-03 07:38:58 +00:00
Eelco Dolstra 4520bb84f7 * Make mercurialFull available in the channel. 
svn path=/nixpkgs/trunk/; revision=33972
 2012-05-02 14:34:09 +00:00
Eelco Dolstra 5bdea119d4 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=33971
 2012-05-02 13:19:07 +00:00
Michael Raskin 304facbf3b Adding LCI lambda calculus interpreter 
svn path=/nixpkgs/trunk/; revision=33962
 2012-05-01 05:07:39 +00:00
Eelco Dolstra 930185a408 * Make Firefox 12 the default. 
svn path=/nixpkgs/trunk/; revision=33955
 2012-04-30 15:34:55 +00:00
Rob Vermaas 97cac0a58c Added i3wm. Added newer version of file. (this time tested, I screwed up a patch by garbas) 
svn path=/nixpkgs/trunk/; revision=33952
 2012-04-30 14:34:57 +00:00
Rob Vermaas 0823167b43 Revert my previous 2 commits. 
svn path=/nixpkgs/trunk/; revision=33951
 2012-04-30 14:28:08 +00:00
Rob Vermaas 191d2e4be6 Adding i3wm, file 5.11, python packages. Patch by garbas. 
svn path=/nixpkgs/trunk/; revision=33949
 2012-04-30 13:30:47 +00:00
Shea Levy 23506543a4 Add minecraft 
Patch by Carles Pagès, minor modification (adding in version number, updating
sha256) by me

svn path=/nixpkgs/trunk/; revision=33944
 2012-04-29 14:09:58 +00:00
Peter Simons 27de563164 Updated Python 3.x. 
- updated to version 3.2.3
 - fixed version numbers in setup-hook.sh
 - sort input variable list alphabetically
 - tk support needs x11 support as well
 - deleted obsolete version 3.1

Furthermore, all CPPFLAGS and LDFLAGS required to find the build inputs are now
explicitly passed to ./configure. The python 3.x build systems tries to ignore
the environment as much as possible to provide deterministic builds. This means
that our magic environment variable stuff won't work, and previously built
python3 binaries lacked all kinds of extensions, such as zlib, etc.

svn path=/nixpkgs/trunk/; revision=33937
 2012-04-27 08:20:46 +00:00
Eelco Dolstra 48b2a26898 * Firefox 12.0. 
svn path=/nixpkgs/trunk/; revision=33931
 2012-04-26 13:25:20 +00:00
Ludovic Courtès 95d60d6938 nixUnstable: Use Apple-GCC on Darwin. 
svn path=/nixpkgs/trunk/; revision=33920
 2012-04-25 14:25:34 +00:00
Ludovic Courtès 75f636067e GNU Emacs 23: Use Apple-GCC on Darwin. 
svn path=/nixpkgs/trunk/; revision=33919
 2012-04-25 14:21:41 +00:00
Ludovic Courtès 7e70f890c4 Darwin: Change noSysDirs' to false' by default. 
svn path=/nixpkgs/trunk/; revision=33911
 2012-04-24 16:14:44 +00:00
Ludovic Courtès daaa950c31 GNU Emacs 22: Use Apple-GCC. 
svn path=/nixpkgs/trunk/; revision=33901
 2012-04-24 08:49:35 +00:00
Ludovic Courtès d4f26f65d9 GNU Readline 6.x: Build with Apple-GCC on Darwin. 
svn path=/nixpkgs/trunk/; revision=33899
 2012-04-23 23:04:05 +00:00
Ludovic Courtès daf8c7fced allStdenvs: Propagate `system'. 
svn path=/nixpkgs/trunk/; revision=33898
 2012-04-23 22:31:39 +00:00
Ludovic Courtès 6a85ec6abe GFortran: Use GFortran 4.6 on Darwin. 
svn path=/nixpkgs/trunk/; revision=33895
 2012-04-23 15:47:41 +00:00
Ludovic Courtès 29bc53265d Darwin: Use GCC 4.6 in `stdenvNix'. 
svn path=/nixpkgs/trunk/; revision=33894
 2012-04-23 15:47:37 +00:00
Ludovic Courtès 04600bbec1 Darwin: Add mig', lipo', etc. to `stdenvNative'. 
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
 2012-04-23 15:47:31 +00:00
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
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 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
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