Commit graph

21185 commits

Author SHA1 Message Date
Peter Simons d5677fe6c7 stdenv-updates: merge updates from 'master' branch 2012-09-11 16:48:41 +02:00
Arie Middelkoop 504e2ad128 updates coccinelle to 1.0-rc15 2012-09-11 15:02:37 +02:00
Peter Simons d6f289f10c haskell-yesod: update to version 1.1.0.3 2012-09-11 12:15:36 +02:00
Peter Simons cc22e43f5a haskell-yesod-static: update to version 1.1.0.1 2012-09-11 12:15:36 +02:00
Peter Simons bac22b8743 haskell-yesod-form: update to version 1.1.1.1 2012-09-11 12:15:36 +02:00
Peter Simons 6d21a18369 haskell-yesod-core: update to version 1.1.1.2 2012-09-11 12:15:36 +02:00
Peter Simons 44fe21f093 haskell-yesod-auth: update to version 1.1.1.1 2012-09-11 12:15:36 +02:00
Peter Simons 4d329a6ee5 haskell-xml-conduit: update to version 1.0.3.1 2012-09-11 12:15:36 +02:00
Peter Simons b24351998b haskell-wai-logger: update to version 0.3.0 2012-09-11 12:15:35 +02:00
Peter Simons 1622070cef haskell-skein: update to version 0.1.0.9 2012-09-11 12:15:35 +02:00
Peter Simons 7b27f68e42 haskell-shakespeare: update to version 1.0.1.3 2012-09-11 12:15:35 +02:00
Peter Simons 053d65377b haskell-resourcet: update to version 0.4.0.1 2012-09-11 12:15:35 +02:00
Peter Simons 1464dd7183 haskell-pool-conduit: update to version 0.1.0.3 2012-09-11 12:15:35 +02:00
Peter Simons 0af0365640 haskell-persistent: update to version 1.0.1.1 2012-09-11 12:15:35 +02:00
Peter Simons b32dc0cad7 haskell-persistent-template: update to version 1.0.0.1 2012-09-11 12:15:35 +02:00
Peter Simons bee2f63817 haskell-http-conduit: update to version 1.6.0.3 2012-09-11 12:15:35 +02:00
Peter Simons 5c75c45f26 haskell-fast-logger: update to version 0.3.1 2012-09-11 12:15:34 +02:00
Peter Simons 98865175ac haskell-async: update to version 2.0.1.3 2012-09-11 12:15:34 +02:00
Peter Simons d23a9edde1 haskell-diagrams: cosmetic 2012-09-11 12:13:55 +02:00
Peter Simons 20518a9556 haskell-yaml: update to version 0.8.0.2 2012-09-11 12:07:40 +02:00
Peter Simons 277527fef7 haskell-wai-extra: update to version 1.3.0.1 2012-09-11 12:07:40 +02:00
Peter Simons 027faa3045 haskell-wai-app-static: update to version 1.3.0.1 2012-09-11 12:07:39 +02:00
Peter Simons 80505bb416 haskell-monad-logger: update to version 0.2.0.1 2012-09-11 12:07:39 +02:00
Peter Simons 7ef7641d1e haskell-http-conduit: update to version 1.6.0.2 2012-09-11 12:07:39 +02:00
Peter Simons 6cff725ee9 haskell-file-embed: update to version 0.0.4.5 2012-09-11 12:07:39 +02:00
Peter Simons 74eaab50ce haskell-conduit: update to version 0.5.2.4 2012-09-11 12:07:39 +02:00
Peter Simons e81449b41e haskell-clientsession: update to version 0.8.0.1 2012-09-11 12:07:38 +02:00
Peter Simons b4102299e5 haskell-authenticate: update to version 1.3.1.1 2012-09-11 12:07:38 +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
aszlig 9ebc8cbc33
Merge branch 'chromium-update'
This updates the versions for the following channels:

stable: 21.0.1180.81 -> 21.0.1180.89
beta: 22.0.1229.14 -> 22.0.1229.39
dev: 23.0.1243.2 -> 23.0.1255.0

And also fixes build failures for the beta and dev channels.
2012-09-11 04:55:15 +02:00
aszlig 2347cfa4f9
chromium: Revert zlib changes for v22 and higher.
SVN revision 151720 breaks the build with system zlib, see:

http://src.chromium.org/viewvc/chrome?view=rev&revision=151720

The issue here is, that r151720 introduces changes directly in zlib, which
aren't upstream and unfortunately there is no more information stating the exact
reasons for this change, as all references to it are not publicly available:

http://crbug.com/139744
https://chromiumcodereview.appspot.com/10837057

So for the moment, we're going to add a patch, which applies to v22 and higher,
which essentially reverts r151720, until either more information on the issue is
available or it is resolved upstream.

As someone has already reported the issue, we just need to track the following
issue:

http://crbug.com/143623

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-11 04:54:26 +02:00
aszlig 20f883179e
chromium: Update channels to latest versions.
stable: 21.0.1180.89
beta: 22.0.1229.39
dev: 23.0.1255.0

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-11 04:54:25 +02:00
aszlig e99788541e
Merge branch 'conky-update'
This updates conky to version 1.9.0 and adds the weather plugins.

In addition, the patch removing curl/types.h from source files is removed as
well and instead replaced by a patch including stdbool.h, as some source files
don't compile well with C99 (instead, they should be compiled with a C++
compiler, as done in upstream's master).

We also now re-enable building with ncurses, which has been fixed in 1.9.0 as
well.
2012-09-11 00:00:13 +02:00
aszlig 109fdfe34f
conky: Enable weather plugins.
Those plugins do not require additional dependencis or at least no dependencies
we don't actually use, so let's build them aswell. And after all, If you work in
your hermetically sealed environment, you surely want to know what's going on
outside.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 23:54:00 +02:00
aszlig 2b7e88e9f5
conky: Re-enable support for ncurses.
Build breakage with enabled ncurses is fixed in 1.9.0 now, so we can safely
re-enable it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 23:54:00 +02:00
aszlig b0ace9fa11
conky: Add license attribute to meta.
As the GPL license is more restrictive than the BSD license of the original
(torsmo) of the fork, I'm adding GPL as the license here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 23:54:00 +02:00
aszlig 3b7dd3c930
conky: Patch to #include <stdbool.h> in conky.c.
In current upstream master, they converted conky.c to C++ already, so it's not
an issue there anymore. But until then we need to patch it on our own to fix the
build.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 23:53:59 +02:00
aszlig b2b67c055b
conky: Remove curl/types.h patch.
This patch is no longer needed, as it is fixed upstream now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 23:53:59 +02:00
aszlig 3692a2e83d
conky: Update to version 1.9.0.
Version 1.8.1 seems to be quite dated, in addition I'd like to use the weather
plugin, which isn't available in 1.8.1 as well. If you work in your hermetically
sealed environment, you surely want to know what's going on outside.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 23:53:59 +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 fc87209691
virtualbox/guest-additions: Update to 4.1.22.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 21:37:37 +02:00
aszlig d891fc6f3b
virtualbox: Update to version 4.1.22.
Upstream changes are:

 * VMM: fixed a potential host crash triggered by shutting down a VM when
        another VM was running (only affected 32-bit hosts and 64-bit OS X
        hosts, 4.1 regression)
 * VMM: fixed a potential host crash under a high guest memory pressure (seen
        with Windows 8 guests)
 * VMM: respect RAM preallocation while restoring saved state.
 * VMM: fixed handling of task gates if VT-x/AMD-V is disabled
 * Storage: fixed audio CD passthrough for certain media players
 * USB: don't crash if a USB device is plugged or unplugged when saving or
        loading the VM state (SMP guests only)
 * RTC: fixed a potential corruption of CMOS bank 1
 * Mac OS X hosts: installer fixes for Leopard (4.1.20 regression)
 * Windows Additions: fixed memory leak in VBoxTray

Full changelogs with bug ids and links to it can be found at:

https://www.virtualbox.org/wiki/Changelog

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 21:37:36 +02:00
aszlig 61e7956b3e
Merge branch 'haskell-diagrams'.
Reviewed by @peti, this adds the diagrams library/DSL and dependencies to
haskellPackages.

The missing Haskell library dependencies are:
 - vector-space-points
 - newtype
 - active
2012-09-10 19:57:52 +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 9d71bb96c0
w3m: Add mouse support for completeness.
I'm personally not using mouse/gpm support for w3m, because I find it somewhat
too awkward when copy/pasting text. But maybe there are users out there who want
to have it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 19:54:54 +02:00
aszlig 194e9d929c
w3m: Add support for fbcon image display.
This builds the w3m image helper with fbcon support if the derivation is called
with graphicsSupport set to true. This change shouldn't break anything as
graphicsSupport is disabled by default, so in any case it could only break
things for users explicitly passing the attribute.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 19:54:53 +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