Commit graph

4238 commits

Author SHA1 Message Date
Rob Vermaas
277bfc232b Sublime: add license attribute, and add assertion for i686-linux/x86_64-linux 2012-11-11 13:15:22 +01:00
Mathijs Kwik
278f711e36 oops, one more... 2012-11-11 09:10:36 +01:00
Mathijs Kwik
b2e671da76 typo/style fixes, should fix hydra's channel output 2012-11-11 09:06:26 +01:00
Rob Vermaas
ee142ea983 Add Sublime Text editor 2012-11-10 20:37:42 +01:00
Shea Levy
9e5ee2b51e Resurrect firefox 13 from rev ea2fbd7864 (needed for selenium testing) 2012-11-09 10:25:03 -05:00
Michael Raskin
48ad0f7443 Update Fossil to a still present version 2012-11-08 23:15:33 +04:00
Lluís Batlle i Rossell
da5aecb73b Making taskwarrior and podofo have cmake as buildNativeInput.
Otherwise they can't be crossbuilt.
2012-11-08 19:38:25 +01:00
Peter Simons
86fa903f6c tkgate: add versions 1.8.7 and 2.0-b10 2012-11-08 17:30:50 +01:00
Eelco Dolstra
5d6860ec5b skype: Update to 4.0.0.8
Also, use $out/libexec/skype rather than $out/opt/skype.
2012-11-08 16:31:08 +01:00
Eelco Dolstra
704f7d6a2c adobe-reader: Unpack to $out/libexec/adobe-reader
This prevents polluting Nix profiles.
2012-11-08 16:31:08 +01:00
Eelco Dolstra
892180306d adobe-reader: Update to 9.5.1 2012-11-08 16:31:08 +01:00
Mathijs Kwik
320e0a46dc eclipse-sdk-4.2: upgrade to 4.2.1 2012-11-08 10:41:23 +01:00
Mathijs Kwik
977337716a dvdauthor: upgrade to 0.7.1 2012-11-08 10:41:22 +01:00
Michael Raskin
c7d2e34758 Add nspluginwrapper, a tool to execute browser plugins out-of-process 2012-11-08 11:38:34 +04:00
Michael Raskin
c2bc48aef3 Update Uzbl 2012-11-08 10:34:06 +04:00
Rickard Nilsson
7afafe0b6d dmenu: Add option config.dmenu.enableXft for enabling xft font support (turned off by default). 2012-11-07 16:03:37 +01:00
Peter Simons
4ab06e5c24 Fix git-annex build.
git-annex depends on 'testpack', which doesn't compile with Haskell
Platform 2012.4.0.0. The testpack library appears to be unmaintained, so
there is probably no quick solution for this issue. For the time being,
we compile git-annex with GHC 7.4.1.
2012-11-06 18:34:54 +01:00
Peter Simons
321ee97b4c haskell-darcs: update to version 2.8.3 2012-11-05 16:25:26 +01:00
Paolo Capriotti
6ac427d391 Update git-annex to 3.20121017 2012-11-05 13:59:08 +00:00
Michael Raskin
6c48c3c230 Add libpng dependency to MPlayer - screenshots now work 2012-11-04 21:58:13 +04:00
Eduard Carreras
d23c7564c7 Update google talk plugin to 3.10.2.0 2012-11-03 21:52:08 +01:00
aszlig
a28fe19203
chromium: Update dev and beta channels.
beta: 23.0.1271.60 (build successful)
dev: 24.0.1312.2 (build successful after patching)

The development version needs a patch in order to build properly against
PulseAudio. Issue and origin of the patch can be found here:

http://crbug.com/157876

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-11-03 12:44:47 +01:00
Eelco Dolstra
59a1d74ffb firefox: Fix hash 2012-11-01 14:56:43 +01:00
Eelco Dolstra
5896f13961 thunderbird: Update to 16.0.2 2012-10-31 17:16:01 +01:00
Eelco Dolstra
7a4e0c6b96 firefox: Update to 16.0.2 2012-10-31 13:46:51 +01:00
Michael Raskin
8775cb95ba Update/fix PuTTY 2012-10-30 12:49:43 +04:00
Michael Ashton
78db9a8cb1 Updated version of abcde to 2.5.4
- Added support for MusicBrainz queries to abcde package
- Added new dependencies to abcde: mkcue, eject, perl, MusicBrainz, MusicBrainzDiscID
- libdiscid version in pkg-config was incorrect; patched libdiscid to fix
- Added WebServices::MusicBrainz Perl module
- Added MusicBrainz::DiscID Perl module
- Commented out XSLoader Perl module since it was broken, no packages depend on it,
  and it has been incorporated into the Perl core
2012-10-29 17:14:39 -07:00
Michael Raskin
52d68190db Update Pidgin 2012-10-29 14:27:31 +04:00
Peter Simons
85145941fa kicad: update homepage URL 2012-10-28 17:27:30 +01:00
Peter Simons
29035e15a4 ng-spice-rework: update to version 24 2012-10-28 17:27:13 +01:00
Rob Vermaas
b0cafe41ce Merge pull request #156 from ecarreras/eclipse_icon
Put eclipse icon into share/pixmaps
2012-10-28 07:06:18 -07:00
Peter Simons
27cdf7af77 hadoop: update to version 2.0.2-alpha 2012-10-26 11:10:13 +02:00
Peter Simons
263ca3e886 jbidwatcher: update to version 2.5.2 2012-10-26 10:35:07 +02:00
Peter Simons
df29700178 esniper: update to version 2.28.0 2012-10-26 10:32:23 +02:00
David Guibert
b963624867 update git to 1.8.0 2012-10-24 16:33:42 +02:00
Peter Simons
e5a68f8a67 Merge pull request #157 from ecarreras/virtualbox-icons
Make virtualbox icons available
2012-10-23 10:42:28 -07:00
Peter Simons
0bd2f95a31 haskell-xmonad-extras: update to version 0.10.1.2 2012-10-23 18:29:58 +02:00
Eelco Dolstra
56cee6fe5c Make Firefox 16 the default 2012-10-23 15:35:48 +02:00
aszlig
737eff7166
chromium: Update beta and dev releases.
beta: 23.0.1271.26 -> 23.0.1271.40
dev: 24.0.1284.2 -> 24.0.1297.0

Both are building successful and the BPF seccomp sandbox fix has been dropped as
it has finally been applied upstream.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-23 06:08:01 +02:00
aszlig
78342bde93
virtualbox-guest: Update to version 4.2.2.
This should fix a few issues with charon and VMs crashing starting at an amount
of at least 4 running VMs in parallel.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-22 19:57:36 +02:00
aszlig
19bffad329
virtualbox: Update to version 4.2.2.
This time, we need to patch, because the upstream tarball got messed up
somehow[TM]. You can find some details about the issue here:

https://www.virtualbox.org/pipermail/vbox-dev/2012-October/005408.html

Our patch is removing the language file, as it seems that even in SVN trunk it
isn't available anymore. So, let's hope we can remove this patch in the next
upstream release.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-22 19:57:35 +02:00
aszlig
5e2e5411c9
google-talk-plugin: Update to version 3.9.1.0.
Version 3.6.1.0 is no longer available at the upstream site, so we won't break
anything with this update.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-22 06:47:22 +02:00
aszlig
6dd94d680a
Merge minor updates from jcumming.
This merges branches 'libarchive.121020', 'gphoto2.121020' and 'ncmpcpp.121020'
of git://github.com/jcumming/nixpkgs.

Octopus merge of @jcumming's minor updates, apart flrom updating the version, a
few other changes were made to these packages as well:

 * libarchive: Now depends on xz.
 * libgphoto: License changed to LGPL 2.1 plus.

And he did an overhaul of some of the meta blocks as well.

Changes during this merge:

 * Inline and reword stray comment into meta tag in
   1db34880d7 (libgphoto).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-21 12:26:29 +02:00
Jack Cummings
1db34880d7 - gphoto2-2.4.14, libgphoto2-2.4.14 2012-10-20 21:59:25 -07:00
Jack Cummings
fe6d7bc907 - ncmpcpp 0.5.10 2012-10-20 21:32:25 -07:00
Peter Simons
094cbf9b4d Move lxc from "applications/virtualization" to "os-specific/linux". 2012-10-20 12:36:44 +02:00
Peter Simons
04d13e193e lxc: fix documentation build and make version 0.8.0-rc2 the default 2012-10-20 12:11:09 +02:00
Eduard Carreras
76d8f6b7be VLC: update to v2.0.4 2012-10-19 18:57:19 +02:00
Peter Simons
a29717f41f stellarium: update to version 0.11.4 2012-10-19 10:19:41 +02:00
Peter Simons
24ec840736 wxmaxima: update to version 12.09.0 2012-10-19 10:12:31 +02:00
Peter Simons
5c59edb8f4 maxima: update to version 5.28.0 2012-10-19 10:12:31 +02:00
Peter Simons
58f3e47166 git: update to version 1.7.12.4 2012-10-19 10:08:07 +02:00
Rickard Nilsson
ae573d8501 skype: Fix syntax error in .desktop-file 2012-10-19 09:53:06 +02:00
Peter Simons
278601befb Merge pull request #154 from ecarreras/synergy-foss
Synergy foss
2012-10-18 03:18:40 -07:00
Marc Weber
b18be4e5e5 adding csound 2012-10-18 06:24:32 +02:00
Michael Raskin
070f38d48d Update pqiv 2012-10-18 00:34:09 +04:00
Michael Raskin
2867563496 Adding a RC version of LinuX Containers 2012-10-17 23:16:42 +04:00
Michael Raskin
640a13c04c Update Psi 2012-10-17 22:59:41 +04:00
Michael Raskin
3b01ff4591 Update Wireshark 2012-10-17 22:45:54 +04:00
Eduard Carreras
9acffb949d Change copy file to symbolic link 2012-10-17 14:16:23 +02:00
Eduard Carreras
febe086bba Changing copy files to symbolic links to them 2012-10-17 14:11:08 +02:00
Eduard Carreras
28181c15e8 Make virtualbox icons available 2012-10-16 19:35:59 +02:00
Eduard Carreras
d22e3a02fd Put eclipse icon into share/pixmaps 2012-10-16 18:38:53 +02:00
Peter Simons
82e94ccbeb Merge branch 'master' into x-updates 2012-10-16 18:27:27 +02:00
Baptist BENOIST
ca264f8da0 Add gmrun-0.9.2
Signed-off-by: Baptist BENOIST <return_0@live.com>
2012-10-16 18:03:13 +02:00
Baptist BENOIST
829ad425d3 Add xfe-1.33 and fox-1.6.9
This specific version of fox is required by xfe

Signed-off-by: Baptist BENOIST <return_0@live.com>
2012-10-16 18:03:12 +02:00
Baptist BENOIST
51fe788417 Add geany-1.22
Geany is a small and lightweight Integrated Development Environment.
It was developed to provide a small and fast IDE, which has only a few dependencies from other packages.
Another goal was to be as independent as possible from a special Desktop Environment like KDE or GNOME.
Geany only requires the GTK2 runtime libraries.

Some basic features of Geany:
 - Syntax highlighting
 - Code folding
 - Symbol name auto-completion
 - Construct completion/snippets
 - Auto-closing of XML and HTML tags
 - Call tips
 - Many supported filetypes including C, Java, PHP, HTML, Python, Perl, Pascal (full list)
 - Symbol lists
 - Code navigation
 - Build system to compile and execute your code
 - Simple project management
 - Plugin interface

Signed-off-by: Baptist BENOIST <return_0@live.com>
2012-10-16 18:03:12 +02:00
Peter Simons
c90a15a604 git-annex: update to version 3.20121010 2012-10-15 20:17:33 +02:00
Eelco Dolstra
87399d57d6 Doh! Forgot to add file 2012-10-15 14:02:15 -04:00
Eduard Carreras
9962055627 Remove pwd to know where I am 2012-10-15 20:01:45 +02:00
Eduard Carreras
1bf9b9bc7b fix align 2012-10-15 20:00:20 +02:00
Eelco Dolstra
5af277bbd1 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-15 12:16:58 -04:00
Eelco Dolstra
3c2f28c67e firefox: Disable profiling since it adds 12 MB to the build 2012-10-15 12:16:01 -04:00
Eelco Dolstra
55aa7f0d6f sylpheed: Update to 3.2
http://hydra.nixos.org/build/3156892
2012-10-15 11:27:37 -04:00
Eelco Dolstra
b377586b7a Fix psi build
hydra.nixos.org/build/3154247
2012-10-15 10:52:53 -04:00
Eduard Carreras
94471a459f Updated synergy to 1.4.10-foss 2012-10-15 14:26:44 +02:00
viric
4e2da16eee Merge pull request #149 from falsifian/upgrade_firefox
Update Firefox 16.0 to 16.0.1, and switch to the high-bandwidth releases.mozilla.org for the source.
2012-10-12 12:22:01 -07:00
Rok Garbas
06eff3c860 weechat: update to 0.3.9 2012-10-12 20:07:20 +02:00
James Cook
cfebdffd58 firefox 16: Use the published sha1, and pass the ftp url to fetchurl as a fallback. 2012-10-12 10:59:33 -07:00
Peter Simons
f77a2f460a Merge branch 'master' into x-updates. 2012-10-12 15:24:24 +02:00
James Cook
9e6e5391ad Update Firefox 16.0 to 16.0.1, and switch to the high-bandwidth releases.mozilla.org for the source. 2012-10-11 21:49:25 -07:00
aszlig
50faa2cbef
chromium: Update stable and beta channels.
stable: 22.0.1229.79 (build tested)
beta: 22.0.1229.94 (build and usage tested)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-11 12:44:33 +02:00
aszlig
702aec1881
chromium: Use final implementation of BPF patch.
The new version is the one already committed in trunk as revision 160697.
In order to get into beta and stable this could take some while so we're going
need to carry around that patch for some time.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-11 12:44:13 +02:00
Sander van der Burg
b8e30a8af6 Changed the netbeans expression to use openjdk, which should work now 2012-10-11 10:31:42 +02:00
Michael Raskin
0bf1789b6a Use newly-added taskwarrior as an update to existing taskwarrior attribute 2012-10-11 10:50:53 +04:00
Cillian de Róiste
bc4d201478 distrho: fix HybridReverb2 2012-10-11 01:23:10 +02:00
Peter Simons
0bb86f86b1 Merge branch 'master' into x-updates. 2012-10-10 19:26:31 +02:00
Peter Simons
64556b022b gravit: update to version 0.5.0 2012-10-10 19:25:42 +02:00
Peter Simons
6ff829f19d Merge branch 'master' into x-updates 2012-10-10 18:46:48 +02:00
Lluís Batlle i Rossell
b8471def24 firefox: adding 16.0. Enabling profiling, to see the new profiling features. 2012-10-10 16:37:20 +02:00
Rickard Nilsson
5dbe17f315 darktable: Update to version 1.0.5 2012-10-09 22:53:38 +02:00
Eelco Dolstra
0b056a06a0 VirtualBox-GuestAdditions: Install drivers for X.org server 1.12 2012-10-09 12:42:10 -04:00
Eelco Dolstra
54aea93a84 inkscape: Update to 0.48.3.1
http://hydra.nixos.org/build/3151653
2012-10-09 12:10:45 -04:00
Eelco Dolstra
b713d13bb4 gnucash: Update to 2.4.11 2012-10-09 11:24:38 -04:00
Sander van der Burg
27cadaa404 Added package for netbeans IDE 2012-10-09 11:40:06 +02:00
Eelco Dolstra
41e9f7cfed Merge remote-tracking branch 'origin/master' into x-updates 2012-10-08 13:48:30 -04:00
aszlig
1983d4fdfc
chromium: Build using libusb (1.0) from nixpkgs.
This dependency has recently been added to chromium while we didn't notice it,
so let's avoid to use the bundled version.

It might make sense to remove the unneeded files in third_party/ based on a
whitelist, so that we notice future changes like this earlier.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-08 15:06:15 +02:00
aszlig
692ad8059a
chromium: Build using libexif from nixpkgs.
While libexif has been bundled with chromium for some months already, they only
recently added the GYP option to switch to using the system library. So, let's
enable it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-08 15:05:00 +02:00
aszlig
58a4edd294
chromium: Drop seccomp patch for version 21.
Version 22 is the current version of the stable channel, so we don't need to
carry around a patch for earlier versions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-08 07:35:57 +02:00
aszlig
17fe198695
chromium: Disable legacy seccomp sandbox in v23.
This removes the patch introduced in 949afcc0f2.
The reason behind this is because even though we patch in the legacy seccomp
sandbox by default, it won't be used anyway as both cannot coexist anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-08 07:35:57 +02:00
aszlig
10679a7ba6
chromium: Fix chromium bug 149834 for version 23.
This is just a temporary fix and will only thrown away as soon as a proper fix
is included upstream, see http://crbug.com/149834 for more details about this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-08 07:33:52 +02:00
aszlig
df64adc2df
chromium: Update dev and beta channels.
dev: 23.0.1271.10 -> 24.0.1284.2 (not tested, probably won't build?)
beta: 22.0.1229.91 -> 23.0.1271.17 (issues, see below)

While testing the beta release, I've been bitten by http://crbug.com/149834, so
as this is a beta release, I'm not sure if we should patch again to disable the
BPF seccomp sandbox.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-08 07:33:51 +02:00
aszlig
949afcc0f2
chromium: New seccomp patch for versions >= 23.
The BPF renderer sandbox is now the default in 23. But still, it is not regarded
as "adequately sandboxed" from Google so we still need the legacy seccomp
sandbox.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-08 07:33:51 +02:00
aszlig
77d424875c
chromium: Temporarily use bundled zlib.
Well, after looking a bit more thoroughly through the zlib patch from the
Chromium team, it seams, that this really fix an issue that hasn't yet been
applied upstream. Unfortunately neither Chromium nor Zlib give more information
about that issue. Maybe they're waiting until its resolved upstream and thus the
temporary patch?

The bad news is, that the fix for the vulnerability is incomplete in Chromium
and covers only the use cases of Chromium itself, so we can't include that
patched version in nixpkgs zlib derivation.

Until the issue is fixed upstream we're hereby safer off turning it off in
Chromium and thus use the bundled and patched version.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-08 07:33:51 +02:00
Cillian de Róiste
fc817640e5 Tidy up the expression for the Calf audio plugin pack 2012-10-07 22:33:50 +02:00
Cillian de Róiste
df5abaf8b4 Update the calf plugin pack to 0.0.19-rc7
This is a significant update with loads of new features, plugins and GUIs
2012-10-07 22:33:50 +02:00
Rickard Nilsson
a570a4c9ed opera: Update to version 12.02 2012-10-07 19:21:56 +02:00
Cillian de Róiste
25b4957e4a Add the Distrho collection of audio plugins 2012-10-07 14:06:36 +02:00
Eelco Dolstra
c1719a5835 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-05 17:57:45 -04:00
Eelco Dolstra
29aa7abe87 thunderbird: Update to 15.0.1 2012-10-05 16:24:04 -04:00
Eelco Dolstra
05d240ceda thunderbird: Update to 15.0.1 2012-10-05 16:15:56 -04:00
Eelco Dolstra
bc9bff1da4 Remove obsolete versions of Flash 2012-10-04 21:18:44 -04:00
Eelco Dolstra
99f38ee7a5 Flashplayer: add libXcursor to the RPATH
This prevented Flash from working after the last update.
2012-10-04 21:15:26 -04:00
Michael Raskin
3ab23d9542 LibreOffice 3.6.2.2 bugfix update. 2012-10-05 00:50:02 +04:00
Mathijs Kwik
73f79401b1 eaglemode: remove unused xineLib dependency
It seems the resulting output path has no reference to libxine, so it
does not get used. Probably it needs some hard-coded link-paths as
eaglemode wants to use dlopen for some things.

If anyone wants to use eaglemode's xine support and fix this issue,
please make it optional.
2012-10-04 13:53:08 +02:00
Mathijs Kwik
e3ae9289e0 MPlayer: upgrade to 1.1
- big cleanup of optional dependency handling
I hope I didn't miss any cases.

- XVID
xvid support seams broken, both built-in as external.
I didn't notice any issues playing xvid video's though, as ffmpeg's
default mpeg4 decoder handles xvid-encoded files just fine.
It seems the only users affected by this are users who still encode
xvid with mencoder (instead of plain ffmpeg). If this really is an
issue to anyone, please let me know, so I can look into it some more,
or retain an older mplayer version next to this one.
2012-10-04 10:40:52 +02:00
Michael Raskin
8e38efac32 Update/fix MuPDF 2012-10-04 10:37:54 +04:00
Eelco Dolstra
31f89ba349 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-03 14:43:10 -04:00
Petr Rockai
63a72d4625 Update flashplayer to 11.2.202.238 since 11.1.102.55 is no longer available. 2012-10-03 11:55:02 +02:00
Eelco Dolstra
7dd3236c81 git: Update to 1.7.12.2 2012-10-02 12:34:38 -04:00
aszlig
d2df1ada27
chromium: Update channels to stable v22.0.1229.79.
dev: 23.0.1271.10
beta: 22.0.1229.91
stable: 22.0.1229.79

The revert for SVN revision 151720 is now obsolete in the current beta release
and is only needed for the stable version. So let's hope that >= 22.0.1229.91
will get stable soon.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-02 03:46:42 +02:00
aszlig
7e439ea13c
i3: Update to version 4.3.
Though upstream clearly recommends to not deactivate Pango, we currently can't
use Pango right now, as we are stuck at cairo-1.10.2. This version only has
experimental support for XCB which became stable in 1.12.x.

So we need to wait for 21bf5ef509 to be merged
into master before we can enable Pango.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-02 03:46:41 +02:00
aszlig
240cd87eda
virtualbox-guest-additions: Update to 4.2.0.
Tested with a bunch of charon VirtualBox machines.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-02 03:46:41 +02:00
aszlig
91b26c0e42
virtualbox: Update to 4.2.0.
New major upstream version, changes can be found here:

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

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-02 03:46:40 +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
Eelco Dolstra
7d9593db6d xterm: Update to 281 and fix the fontconfig dependency 2012-09-28 16:23:56 -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
775d62748f Make Firefox 15 the default 2012-09-26 17:28:53 -04:00
Eelco Dolstra
0446a79473 Fix icewm build on libX11-1.5.0 2012-09-26 17:00:55 -04:00
Cillian de Róiste
cc02b6cc19 Updating the google talk plugin to 3.6.1 since 3.5.1 is no longer available for download. Although, it does not work correctly on my system. 2012-09-26 20:56:56 +02: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
Lluis Batlle
be20063772 mldonkey: update to 3.1.3
Claimed suport for ocaml 4.00.0 and finally, BT magnets.
2012-09-25 19:37:54 +02:00
Lluís Batlle i Rossell
1bd6ee6556 Adding umurmur and protobuf-c. 2012-09-25 19:35:03 +02:00
Peter Simons
b5416d6ed6 darcs: install bash completion instructions 2012-09-25 15:15:38 +02:00
Michael Raskin
4517d03af1 Opportunistic measures to prevent the need to convert null to string; they may work or may not work for actually building 2012-09-24 23:49:11 +04:00
Michael Raskin
732811700a Added BareSIP 2012-09-24 21:03:02 +04:00
Peter Simons
625e2e45f7 git: update to version 1.7.12.1 2012-09-24 13:28:31 +02:00
Peter Simons
964efb4adc magit: update to version 1.2.0 2012-09-24 13:25:19 +02:00
Michael Raskin
37418b3f70 Add farstream support to gajim 2012-09-23 21:39:26 +04:00
Lluís Batlle i Rossell
cd1a5cd784 gimp: updating from 2.8.0 to 2.8.2 2012-09-21 18:02:45 +02:00
viric
383336a563 Merge pull request #128 from MarcWeber/fixes/blender
fix blender build and enable parallel building
2012-09-21 06:06:43 -07:00
Marc Weber
8cb034fd30 fix blender build and enable parallel building 2012-09-19 22:41:15 +02: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
Peter Simons
9a6c3c8f60 xmonad-extras: patch to allow building with split 0.2.x 2012-09-17 15:50:11 +02:00
aszlig
9ff9d85ef6
darcs-to-git: Remove propagatedBuildInputs.
I missed this while checking the commit diffs before my last push. And it really
doesn't make sense to propagate ruby all the way up to whatever in the universe
may depend on this package.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-17 06:35:49 +02:00
aszlig
98b7228c06
darcs-to-git: New package from upstream Git.
This consists of just one single ruby script, which runs shell commands assuming
that the current PATH has all dependencies set up correctly. Unfortunately, this
somewhat breaks functional purity as the command won't work correctly in
environments that do not contain git, darcs or diffutils.

During the patchPhase we replace all those dependencies directly in the ruby
source code, rather than creating a wrapper. Afterwards we run a checkPhase
which not only checks whether we caught all the dependencies (PATH=) but also
checks if the conversion has been done correctly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-17 06:08:04 +02:00
aszlig
6667ee858b
chromium: Update dev/beta channels.
beta: 22.0.1229.56
dev: 23.0.1262.0

Patch for http://crbug.com/143623 still applies and is still not fixed upstream.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-15 07:44:21 +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