Commit Graph

21339 Commits

Author SHA1 Message Date
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
aszlig
03a8eea607
pyinotify: New package, version 0.9.3.
Provides Python bindings for the inotify syscalls. For more information on
inotify, see: http://en.wikipedia.org/wiki/Inotify

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 19:54:53 +02:00
aszlig
e94d50f359
pep8: New package, version 1.3.3.
This is a style checker/linter to check whether a source files is correctly
formatted according to PEP8: http://www.python.org/dev/peps/pep-0008/

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 19:54:52 +02:00
aszlig
96ab1aa9df
pylast: New package, version 0.5.11.
pylast is an interface for the last.fm API version 2.0.
It also supports services such as Libre.fm, which has a similar API.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 19:54:52 +02:00
aszlig
5320792ed7
haskell-diagrams: Move main libs into single dir.
That way we have all diagrams specific stuff in one directory, which coulde make
it easier for code-reuse in the future.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Peter Simons <simons@cryp.to>
2012-09-10 19:19:17 +02:00
aszlig
3e1c9217c4
haskell-diagrams: Don't invoke haddock.
This package is only a metapackage and doesn't contain any source files, so we
don't need to generate source code documentation at all.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Peter Simons <simons@cryp.to>
2012-09-10 19:19:16 +02:00
aszlig
4c418cd3aa
haskell-diagrams: New package, v0.5.
This is just a metapackage, so the build is going to fail and we need to fix
things up next.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Peter Simons <simons@cryp.to>
2012-09-10 19:19:16 +02:00
aszlig
1763eb518b
haskell-diagrams-cairo: New package, v0.5.0.2.
We use the jailbreak attribute here to avoid splitting off cmdargs and split
into directly versioned packages.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-10 19:19:16 +02:00
aszlig
e3826e5e9c
haskell-diagrams-core: New package, v0.5.0.1.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Peter Simons <simons@cryp.to>
2012-09-10 19:19:16 +02:00
aszlig
a7ca544945
haskell-diagrams-lib: New package, v0.5.0.1.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Peter Simons <simons@cryp.to>
2012-09-10 19:19:15 +02:00
aszlig
cad8a942e1
haskel-vector-space-points: New package.
Starting with version 0.1.1.1, required by diagrams-core.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Peter Simons <simons@cryp.to>
2012-09-10 19:19:15 +02:00
aszlig
d12f707f6c
haskell-newtype: New package in version 0.2.
This package is required by diagrams-lib.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Peter Simons <simons@cryp.to>
2012-09-10 19:19:15 +02:00
aszlig
6e0924ca84
haskell-active: New package in version 0.1.0.2.
This package is required by diagrams-lib.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Peter Simons <simons@cryp.to>
2012-09-10 19:19:15 +02:00
Peter Simons
bb7daf767b cosmetic 2012-09-10 18:28:17 +02:00
Peter Simons
7b587a5ad8 haskell-funcmp: update to version 1.7 2012-09-10 18:27:35 +02:00
Peter Simons
9f7f71aeaa Add myself as maintainer to those packages Haskell packages I, well, maintain. 2012-09-10 16:31:41 +02:00
Peter Simons
741a7ef530 haskell-packages.nix: update 'haskellPlatformArgs_future' for GHC 7.6.1 2012-09-10 16:30:58 +02:00
Peter Simons
bbf098baa8 haskell-defaults.nix: extensible-exceptions is not a part of GHC 7.6.1 2012-09-10 15:59:20 +02:00
Peter Simons
249ff424a9 haskell-zlib: jailbreak version 0.5.3.3 to fix build with GHC 7.6.1 2012-09-10 15:56:51 +02:00
Peter Simons
5bde8b0985 Override 'Cabal' attribute in 'jailbreakCabal' only when building with a GHC
version older than 7.2.x. Newer compilers can use their native version of Cabal
to build this tool.
2012-09-10 15:39:44 +02:00
Peter Simons
010c282cb2 haskell-lhs2tex: update to version 1.18.1 2012-09-10 15:08:24 +02:00
Peter Simons
4fc17179f9 haskell-zlib-conduit: update to version 0.5.0.1 2012-09-10 15:08:24 +02:00
Peter Simons
09f1fbfa1c haskell-zlib-bindings: update to version 0.1.1.1 2012-09-10 15:08:24 +02:00
Peter Simons
07a2ac1634 haskell-zipper: update to version 0.4.2 2012-09-10 15:08:24 +02:00
Peter Simons
2c4011974d haskell-warp: update to version 1.3.1 2012-09-10 15:08:24 +02:00
Peter Simons
69074bf98b haskell-unordered-containers: update to version 0.2.2.1 2012-09-10 15:08:24 +02:00
Peter Simons
d1990fed5d haskell-texmath: update to version 0.6.1.1 2012-09-10 15:08:24 +02:00
Peter Simons
0dd2732946 haskell-system-filepath: update to version 0.4.7 2012-09-10 15:08:24 +02:00
Peter Simons
0acfb5994f haskell-syb-with-class: update to version 0.6.1.4 2012-09-10 15:08:23 +02:00
Peter Simons
6ab66d48fe haskell-simple-sendfile: update to version 0.2.7 2012-09-10 15:08:23 +02:00