Commit Graph

4084 Commits

Author SHA1 Message Date
aszlig
830e9db5dd virtualbox: Use Linux's kbuild to build modules.
Don't rely on VirtualBox's in-tree build scripts to set include paths correctly
and use the official way of the Linux kernel to build the modules. That way we
don't need to make ugly symlinks in the kernel tree or heavily patch VirtualBox.
2012-08-19 09:02:14 +02:00
Russell O'Connor
525b8015e7 Fixing configure patch for coq 8.3. 2012-08-19 01:11:11 -04:00
Russell O'Connor
eafd2008f1 Correcting filename. 2012-08-19 01:06:15 -04:00
Russell O'Connor
706cbc9318 Update coq to 8.4 2012-08-19 01:01:30 -04:00
Eelco Dolstra
1e4c4b70b1 slim: Really update to 1.3.4 2012-08-17 11:33:59 -04:00
Eelco Dolstra
bc3865e414 slim: Update to 1.3.4 2012-08-17 10:51:44 -04:00
aszlig
4393fffcce chromium: Update channels to latest versions.
This removes the now obsolete VHASH line in sources.nix aswell.
2012-08-17 12:57:35 +02:00
aszlig
6968400a34 chromium: Check sha256 per channel in update.sh.
Until this commit we had a single hash of the whole version response from
omahaproxy. This worked well for not updating unnecessarily but only until one
single channel has a new version available.

Unfortunately the dev version is released quite frequently, so the hash is of no
use at all (we could rather directly fetch everything everytime we execute the
script).

This led to this commit, which adds two methods of caching:

First of all, if a perticular version/channel is already in the previous version
of the sources.nix file, don't download it again.

And the second method is to check if the current sha256 is already downloaded
and reads the corresponding sha256 from the lookup table.

So, this should really help to avoid flooding the download servers and to not
stress impatient users too much.
2012-08-17 12:57:34 +02:00
Mathijs Kwik
5a146e9cff emacs: add "color-theme" 2012-08-17 08:55:47 +02:00
Eelco Dolstra
f27f8a1177 xpdf: Don't use t1lib
t1lib has multiple unpatched vulnerabilities (see
e.g. http://rhn.redhat.com/errata/RHSA-2012-0062.html).
2012-08-16 16:31:44 -04:00
Sergey Mironov
51ccf1f213 zathura: fix broken links in meta information 2012-08-16 18:33:25 +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
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
Sergey Mironov
b229c3e09f gxneur: add frontend for XNEUR keyboard layout switcher 2012-08-15 01:10:23 +04:00
Eelco Dolstra
c67c397c11 VirtualBox-GuestAdditions: Add to the channel 2012-08-14 13:43:37 -04:00
Mathijs Kwik
50cc5629af emacs: add "jade-mode" 2012-08-13 17:50:19 +02:00
Rok Garbas
d91b51c140 Update: notmuch to 0.13.2 2012-08-13 00:24:14 +02:00
Lluís Batlle i Rossell
2ecb9fdb58 aircrackng, kismet: update them to latest trunk and release respectively 2012-08-11 14:42:35 +02:00
Mathijs Kwik
58ccf70f47 it seems fetchgit does not like version tags
I think they built ok on my system before, because I nix-prefetch-git'd them.
2012-08-11 11:45:31 +02:00
Mathijs Kwik
b62acd8855 oops typo 2012-08-11 11:34:59 +02:00
Mathijs Kwik
a6f17bd1a9 emacs: add "flymake-cursor" 2012-08-11 09:36:20 +02:00
Mathijs Kwik
eaeb0a41b6 Merge pull request #96 from aszlig/google-talkplugin
google-talk-plugin: Prefer Debian package.
2012-08-10 22:58:04 -07: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
c88f2ecbcd gtkwave: updating to 3.3.39 2012-08-10 16:54:00 +02:00
Peter Simons
f77a3a15ee netperf: update to version 2.6.0 2012-08-10 11:56:22 +02:00
Mathijs Kwik
7fd5e6d668 emacs: upgrade "haskell-mode" to more recent git version 2012-08-10 08:27:09 +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
Mathijs Kwik
d6befca296 emacs/js2-mode: upgrade 2012-08-10 08:27:09 +02:00
Michael Raskin
938d86b16b Veracity: update to version 2.0
Still no permission support or commit signing, though.
2012-08-09 11:05:43 +04:00
Michael Raskin
6be27d8c4e Vacuum-IM: update to 1.2.0 2012-08-09 08:59:38 +04:00
aszlig
cb9b55a197 google-talk-plugin: Prefer Debian package.
The reason is because unpacking debian packages requires fewer dependencies (ar,
gzip and tar, nothing more), and in addition we can explicitly reference a
version number from the apt repository.
2012-08-08 19:06:46 +02:00
Jan Malakhovski
da7408e105 xen: Support PCI passthrough.
Previous commit reverted Xen back to 4.0.3 because xend from 4.1.* and newer
hangs for unknown reasons.
The new "xl" toolstack from 4.1.* and unstable works, yet PCI passthrough is not
supported by xl in 4.1.* and is broken in the unstable.

With this patch I was able to passthrough ATI Radeon HD 6950 without 3D
acceleration, though, to both Linux and Windows guests. Which is the best
archived result with Xen PCI passthrough on NixOS after trying out all possible
Xen versions.
Same VGA card works fine if passed through into a guest with KVM (acceleration,
GPGPU, everything works). I should have tried KVM from the start.
2012-08-08 03:16:57 +04:00
Dmitry Malikov
b125ef36b6 Bump gitAndTools/tig from 0.16 to 1.0 2012-08-08 00:51:25 +02:00
Jan Malakhovski
bff9f2720f Revert "xen: update to version 4.1.2"
This reverts commit af32fd6ce3.
2012-08-08 02:30:25 +04:00
Mathijs Kwik
a8ef82d372 Merge pull request #91 from aszlig/chromium-ffmpeg-fix
chromium: Install libffmpegsumo.so.
2012-08-07 11:57:04 -07:00
aszlig
fbfd84f816 chromium: Install libffmpegsumo.so.
This caused HTML5 video to not work because this shared library is loaded at
runtime.

Unfortunately we can't use system ffmpeg yet, because upgrading would break
builds of other packages, and it would result in a copy of ffmpeg laying around
aswell, so we can defer this until we have fixed ffmpeg.

Thanks to @bluescreen303 for the bug report.
2012-08-07 19:11:58 +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
Eelco Dolstra
f901b6d38d git: Update to 1.7.11.4 2012-08-06 15:27:28 -04:00
Shea Levy
988ef8acea Merge pull request #85 from coreyoconnor/master
Adds Eclipse 4.2 to editors/eclipse
2012-08-06 13:27:06 -04:00
Carles Pagès
dabc583abb awesome: update to 3.4.13
I removed some patches that were no longer needed. Russian manpages still fail.
2012-08-06 17:43:30 +02: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
Vladimír Čunát
98614c72c1 LyX: a minor update. 2012-08-05 14:30:45 +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
Corey O'Connor
a79dd881c7 add eclipse 4.2 2012-08-04 11:14:02 -07:00
Peter Simons
b8d0aebe51 stellarium: update to version 0.11.3 2012-08-04 13:00:29 +02:00
Rob Vermaas
19ce2dd9de Merge pull request #82 from aszlig/chromium-update
chromium: Update channels for stable version 21.
2012-08-04 03:17:42 -07:00
Mathijs Kwik
c736b59d2a google-talkplugin: upgrade to 3.2.4.0 2012-08-04 12:12:38 +02:00
aszlig
a898f9ce8f chromium: Update channels for stable version 21.
Version 20 doesn't seem to build with a newer version of pulse audio and as 21
is stable now anyway, let's update the channels.
2012-08-04 09:53:53 +02:00
Peter Simons
1480737d0f Merge pull request #77 from rizsotto/master
w3m package fix
2012-08-01 03:46:26 -07:00
Eelco Dolstra
bd8d7a8d15 Add some packages to the channel 2012-07-31 19:26:35 -04:00
Laszlo Nagy
ed8c4b0585 Fix w3m configure problem on non-chroot build env.
The configure script picks up libbsd.so from the host machine.
It uses simple find command to locate the file, but the linker
can not use it.

The fix replace the search path to /no-such-path
2012-07-31 23:34:52 +02:00
Shea Levy
5300731177 Joe: Bump to 3.7 2012-07-31 16:30:50 -04:00
Peter Simons
9e334221fc ikiwiki: enable pass phrase authentication support 2012-07-29 21:39:49 +02:00
Shea Levy
c3c68b6510 Mercurial: Install hgweb.wsgi as well 2012-07-28 20:25:41 -04:00
Lluís Batlle i Rossell
184ea61eb6 vlc: updating to 2.0.3
I hadd problems with how 2.0.1 disabled and reenabled DPMS on xorg. Let's see
if anything improves with 2.0.3.
2012-07-28 22:47:15 +02:00
Shea Levy
deb09fd9de Mercurial: Bump 2012-07-27 19:44:01 -04:00
Cillian de Róiste
2a1215115f Updating Ardour3 to beta 5 2012-07-28 00:35:39 +02:00
Lluís Batlle i Rossell
c0832627c4 ocaml, unison: make them build on mips (native compilers)
I switch off the build of ocaml compilers to native code, and add
a 'passthru' that unison can use to see if it needs to call the native
or the bytecode compiler.
2012-07-27 22:43:40 +02:00
Lluís Batlle i Rossell
32b48d64dc Adding 'ii', irc it. 2012-07-27 22:43:40 +02:00
Peter Simons
1dacb511e2 esniper: add support for CURL_CA_BUNDLE variable to fix SSL authentication errors 2012-07-27 11:21:32 +02:00
Peter Simons
5c924ed7c5 ikiwiki: fix test suite in the presence of enabled Git support 2012-07-27 10:25:06 +02:00
Peter Simons
af6c1c5ef3 esniper: the 'which' alias won't work when run in a subshell; we need the real thing 2012-07-27 01:50:50 +02:00
Peter Simons
48bce09773 esniper: man, this is more difficult than I would have thought 2012-07-27 01:34:54 +02:00
Peter Simons
54cf26ad8d esniper: fix more impurities 2012-07-27 01:30:48 +02:00
Peter Simons
3acaeefabd esniper: remedy some impurities 2012-07-27 01:23:17 +02:00
Rickard Nilsson
1786bef686 trayer: Update to 1.1.5 2012-07-26 17:02:36 +02:00
Florian Friesdorf
471a9615a2 fix mpich2 and mplayer 2012-07-24 14:17:45 +02:00
Lluís Batlle i Rossell
305eb0a30f yafc: making the derivation name include the version 2012-07-22 10:24:15 +02:00
Joachim Schiele
538b17a791 fixed most virt-manager issues! 2012-07-20 23:27:24 +00:00
Shea Levy
4497344e49 Merge branch 'master' into x-updates 2012-07-18 23:24:10 -04:00
Carles Pagès
03179bd37e yafc: update expression to refer to maintainers list. 2012-07-17 23:31:39 +02:00
Carles Pagès
bae6ad5914 yafc: update to 1.2.0
The project has been retaken and this is the latest tarball available.
2012-07-17 22:17:01 +02:00
Peter Simons
7e2979b56f i3: fix build some more
The build process depends on a script that relies on /usr/bin/env to find Perl.
Running 'patchShebangs' early fixes that script.
2012-07-17 14:44:23 +02:00
Rob Vermaas
35be2b54d1 Merge pull request #52 from aszlig/master
Chromium updates
2012-07-17 04:33:33 -07:00
Rickard Nilsson
83d63ea910 opera: Update to 12.0 2012-07-17 12:46:39 +02:00
aszlig
96b5e9795a chromium: Update to the latest release channels. 2012-07-17 12:03:13 +02: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
f85fc1eafb xchat: Fix build with glib-2.32.4 2012-07-15 23:15:21 -04:00
Shea Levy
7d64f1a93e epdfview: Fix build with glib-2.32.4 2012-07-15 11:06:04 -04:00
Shea Levy
3c6a778b02 dia: Fix build with glib-2.32.4 2012-07-15 11:01:27 -04:00
Shea Levy
15f765cc6a awesome: update to 3.4.13 2012-07-15 09:55:41 -04:00
Shea Levy
1a0baad6b2 Update some (seemingly very old) packages that hard-coded the path to make-wrapper.sh 2012-07-15 03:32:50 -04:00
Cillian de Róiste
8ff20e5b77 Build the LinuxSampler LV2 plugin 2012-07-14 18:50:32 +02:00
Peter Simons
40ef76f4a4 ikiwiki: make docutils support optional 2012-07-14 15:47:05 +02:00
Peter Simons
3d416ed030 ikiwiki: update to version 3.20120629 2012-07-14 14:51:08 +02:00
Peter Simons
293027453f i3: fixed build
- The make variable PREFIX must be at build time because common.mk uses it to
   decide where to expect $SYSCONFDIR.

 - The make target "all" is run by default and needn't be set explicitly.

 - Shebang paths in scripts are patched automatically be the default builder,
   we don't have to do that manually.
2012-07-12 11:28:15 +02:00
Eelco Dolstra
2dd9874d8d pan: Updated to 0.139 2012-07-11 17:05:13 -04:00
Lluís Batlle i Rossell
715737b3ac gnunet: removing gtk dependencies
gnunet does not depend anymore on gtk. There is a separate package,
gnunet-gtk, still not in nixpkgs.
2012-07-11 20:07:00 +02:00
Rok Garbas
f3052e14e5 weechat: update to 0.3.8 2012-07-10 15:56:23 +02:00
Shea Levy
a6c8986ee0 dwm: Bump to 4.5 2012-07-10 06:38:41 -04:00
Shea Levy
57e1ad943e hello: Update to 2.8 2012-07-09 04:06:36 -04:00
Peter Simons
172f03517e ratpoison: install ratpoison.el into $out/share/emacs/site-lisp directory where Emacs can find it
Also, copy the glibc patch into Nixpkgs to avoid errors with changing hashes
from cgit.
2012-07-09 07:16:07 +02: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
Shea Levy
c5c41832f0 Merge branch 'tptp-5.4.0' of https://github.com/7c6f434c/nixpkgs
Update tptp to 5.4

It builds, and the change is a simple version+hash update.
2012-07-07 20:36:15 -04:00
Peter Simons
55ea7dc453 wxmaxima: update to version 12.04.0 2012-07-07 22:20:18 +02:00
Peter Simons
0c107996d3 maxima: update to version 5.27.0 2012-07-07 22:20:18 +02:00
Michael Raskin
2331ea4ec2 TPTP: update to 5.4.0 2012-07-07 20:32:48 +04:00
Antono Vasiljev
631a59e449 Added mr - Multiple Repository management tool 2012-07-07 17:12:18 +02:00
Peter Simons
08b29c6f96 blender: update to version 2.63a 2012-07-07 11:31:32 +02:00
Lluís Batlle i Rossell
f3b78a6b6f gnunet: update to 0.9.3 2012-07-06 17:38:30 +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
b659b026c5 google-talk-plugin: updated upstream, changing hashes 2012-07-05 12:01:23 +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
Shea Levy
6ba310e908 Merge pull request #36 from aszlig/chromium-channels
Use chromium release channels
2012-07-04 07:25:45 -07:00
aszlig
950c73271a chromium: Remove obsolete source.nix.
As already promised, the old single-channel source.nix is now obsolete as we're
using Omahaproxy now and the build of the stable version finishes successful and
the browser runs fine.
2012-07-04 14:47:02 +02:00
aszlig
834d8be46e chromium: Fix build for versions older than 21.x.
The current stable version won't build if gyp can't use svnversion from the
subversion package, so let's provide it for versions below 21.x.
2012-07-04 14:47:02 +02:00
aszlig
f6e063e7fc chromium: Use new channel based sources.
Switch to channel based sources and default to the "stable" channel.
2012-07-04 14:47:02 +02:00
aszlig
a65ba9e083 chromium: Generate new sources.nix.
This means that we now have hashes and URLs for the latest versions of chromium
and can now work on integrating the changes into default.nix.
2012-07-04 14:47:02 +02:00
aszlig
ec395a78ee chromium: Extend update script to use channels.
The previos update script just used the last version of chromium that showed up
at the bucket list at:

http://commondatastorage.googleapis.com/chromium-browser-official/

I'm not sure which channel this list actually holds, so I'm going to switch now
using the official release channels grabbed by omahaproxy. This also has the
advantage that we can provide different versions/flavors of chromium.

We now also write our data to sources.nix instead of source.nix, as we have more
than one source.
2012-07-04 14:47:02 +02:00
aszlig
8a5d9bad94 Update VirtualBox to version 4.1.18.
This should make #15 obsolete, as those patches were cherry-picked from
upstream.
2012-07-03 08:44:35 -04:00
Lluís Batlle i Rossell
5592b1f9b1 eaglemode: update to 0.84.0
It failds to build with xine-lib, but it goes on as it's
not a strong requirement. Then, the final path is not dependant
on xine anymore. I hope next releases fix this.
2012-07-02 23:04:12 +02:00
Lluís Batlle i Rossell
8a764b7891 xine-ui: update to 0.99.7 2012-07-02 23:04:12 +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
6389fcdbde rawtherapee: updating it. It fixes its build. 2012-07-02 20:10:10 +02:00
Peter Simons
af32fd6ce3 xen: update to version 4.1.2
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
2012-07-02 17:45:47 +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
d05ae2d875 freerdp: update hash for release archive
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
2012-07-02 16:53:54 +02:00
Peter Simons
fb4df48329 firefox-12.0: update download URL
releases.mozilla.org doesn't seem to carry old release archive anymore.

Patch submitted by Jan Malakhovski <oxij@oxij.org>.
2012-07-02 16:53:51 +02:00
David Guibert
3b0d9374a4 git-annex: update to 3.20120629 2012-06-29 21:09:52 +02:00
David Guibert
a97e27fc82 git-annex: update to 3.20120624 2012-06-29 21:09:52 +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
c5c98b7617 Updated Haskell packages.
- derive: updated to version 2.5.9
 - ghc-mod: updated to version 1.11.0
 - hamlet: updated to version 1.0.1.4
 - http-conduit: updated to version 1.4.1.10
 - leksah: updated to version 0.12.1.3
 - mmap: updated to version 0.5.8
 - mtl: added version 2.1.2
 - prolog-graph-lib: updated to version 0.2.0.1
 - prolog: updated to version 0.2.0.1
 - reactive-banana-wx: updated to version 0.6.0.1
 - resourcet: updated to version 0.3.3
 - shelly: updated to version 0.12.0.2
 - simple-sendfile: updated to version 0.2.4
 - syb: added version 0.3.6.2
 - wai-app-static: updated to version 1.2.0.4
 - wai: updated to version 1.2.0.3
 - warp: updated to version 1.2.2
 - xml-types: updated to version 0.3.2
 - zlib-conduit: updated to version 0.4.0.2
2012-06-28 14:50:44 +02:00
Lluís Batlle i Rossell
c05fcf6a2b chromium: Making hydra build chromium for linux.
I think it will save quite a lot of users build time.
2012-06-28 12:56:51 +02:00
Mathijs Kwik
42ea23675e ogmtools: new package 2012-06-28 11:41:58 +02:00
Lluís Batlle i Rossell
894fad326a offrss: update to 1.3
I also enabled the iconv linking on non-linux.
2012-06-27 23:19:30 +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
aecc8b64ed Merge pull request #23 from cillianderoiste/sonic-visualiser-fix
Sonic visualiser fix

SL: Didn't build before, builds now.
2012-06-26 20:40:01 -07:00
Eelco Dolstra
2ead90a36b pan: Updated to 0.138 2012-06-25 15:41:19 -04:00
Lluís Batlle
fc8fb52341 Merge branch 'master' of https://github.com/viric/nixpkgs 2012-06-24 19:12:50 +02:00
Lluís Batlle
7ab7120964 Merge remote-tracking branch 'central/master' 2012-06-24 19:03:50 +02:00
Cillian de Róiste
1afe86a7b7 Tidy up 2012-06-24 16:54:51 +02:00
Cillian de Róiste
c6457c322b Upgrading sonic-visualiser to 1.9 and adding pkgconfig so that it finds rasqal.h successfully 2012-06-24 16:51:42 +02:00
aszlig
d23dcbb9a5 chromium: Enable parallel building.
Always did this manually by putting -j8 into make flags, which i didn't commit,
as it obviously doesn't make sense to hardcode. However, this flag makes more
sense and obviously we need to avoid overriding buildPhase.
2012-06-22 15:53:30 -04:00
aszlig
59f8de864f chromium: Add support for pulseaudio.
Which is enabled by default if neither pulseaudio or chromium.pulseaudio is
explicitly set. The reason is that chromium falls back to ALSA in case no
pulseaudio is available.

In addition it was necessary to patch media.gyp to ignore the array-out-of-
bounds warning.
2012-06-22 15:53:30 -04:00
aszlig
a2984e3d82 chromium: Simplify names of getConfig options.
This makes it easier to remember, as so far the naming wasn't quite consistent,
sometimes "use*", sometimes "enable*". So in using just use the feature name
itself, it should be pretty clear.
2012-06-22 15:53:30 -04:00
aszlig
fc24f460f1 chromium: Use bundled versions of some libraries.
These libraries are heavily patched by the chromium project itself, so let's use
the bundled versions as those won't build anyway and also don't break functional
purity.
2012-06-22 15:53:30 -04:00
aszlig
d8e9536498 chromium: Cleanup dependencies.
This mostly is a code structure change, but also involves deleting some unused
dependencies and adding a few constraints on existing ones.
2012-06-22 15:53:30 -04:00
aszlig
c7db5ff34d chromium: Add dependency for libselinux.
This doesn't really work at the current state of NixOS and SELinux support, but
will make it easier in case we someday support SELinux altogether.
2012-06-22 15:53:30 -04:00
aszlig
a88eb35ff1 chromium: Enable proprietary codecs by default.
We now switch to using bundled ffmpeg, as this adds stuff such as support for
the H.264 codec.
2012-06-22 15:53:30 -04:00
aszlig
04ae9f288d chromium: Implement handling of enableCUPS.
We also need to patch the compilation process, so it allows deprecated
declarations when building support for the cups backend. In addition, we also
need to add libgcrypt to dependencies as it's needed by the cups implementation.
2012-06-22 15:53:29 -04:00
aszlig
8371d50836 chromium: Update source to version 21.0.1179.1. 2012-06-22 15:53:29 -04:00
aszlig
70c0af9a37 chromium: Add mesa to build dependencies.
This finally enables support for WebGL and accelerated rendering.
2012-06-22 15:53:29 -04:00
aszlig
57e127099b chromium: Add flag to disable Gnome support.
This also separates gcrypt and gconf from the basic dependencies.
Unfortunately we cannot get rid of dbus_glib altogether, but maybe we want to
work on a patch to get rid of it? On the other hand it seems to be a TODO of the
chromium project itself, so let's wait and see.
2012-06-22 15:53:29 -04:00
aszlig
c2b145c32f chromium: Allow to switch off openssl support.
Currently building fails with NSS, so we're using OpenSSL by default. And that's
why we want to make this configurable so if we manage to fix that build failure,
we could switch to using NSS by default.
2012-06-22 15:53:29 -04:00
aszlig
f0cdea2e99 chromium: Use patches from system OpenSSL.
This is mainly because of the patch to use OPENSSL_X509_CERT_FILE as a way to
specify the CA bundle. A browser which isn't able to verify SSL certificates
might be somewhat useless.
2012-06-22 15:53:29 -04: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
22f5045bde chromium: Use system libraries whenever possible.
There are still some libraries left, which we either need to patch or provide
more recent versions. Plus we're going to use openssl, as libnss doesn't want to
do proper SSL (let's debug this later).
2012-06-22 15:53:28 -04:00
aszlig
6350706c0d chromium: Add "which" to build dependencies.
This is needed by a lot of scripts within chromium, so we're not going to patch
them using type, which is shell-specific anyway.
2012-06-22 15:53:28 -04:00
aszlig
ef45195126 chromium: Enable seccomp by default.
If useSELinux is not set, enable seccomp mode by default and avoid building the
SUID helper sandbox at all. This involves a small patch which causes the
commandline arguments to be swapped: --disable-seccomp-sandbox to disable it,
while the option is active by default.
2012-06-22 15:53:28 -04:00
aszlig
2571488e6a chromium: Clean up build flags.
This also includes setting compiler architectures and paths.
2012-06-22 15:53:28 -04:00
aszlig
dc32b4caef chromium: Generate the latest source.nix. 2012-06-22 15:53:28 -04:00
aszlig
d342672f5a chromium: Add an update script.
It fetches the latest version based on the bucketlist XML from
commondatastorage and generates a "source.nix" which contains an attribute set
about where to fetch the latest version.

The XML is parsed in a somewhat hackish way using sed, but as this is just an
updater, its okay and we don't want to break a fly on the wheel by employing a
full XML parser.
2012-06-22 15:53:28 -04:00
aszlig
b5956ec179 chromium: Add an install phase.
This tries to put pathes unte the same directory as the previous prebuilt
version of Chromium.
2012-06-22 15:53:28 -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
Lluís Batlle i Rossell
18ac2b9ebc Making links2 cross-build again
The bzip2 target binary was breaking the unpackPhase.
2012-06-22 16:04:02 +02: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
Lluís Batlle
9f1c069d3f Merge commit 'd13e6824910584201ccfd4c701894a9caf201782' 2012-06-22 15:53:05 +02:00
Lluís Batlle
d13e682491 Updating taskwarrior. 2012-06-22 14:51:41 +02:00
Eelco Dolstra
94812c9dd3 git: Fix the "notSupported" scripts for "git send-email" and "git gui" 2012-06-21 15:25:02 -04:00
Eelco Dolstra
9365981409 git: Updated to 1.7.11 2012-06-21 15:23:29 -04:00
Peter Simons
4490fe934e Updated Haskell packages.
- base64-bytestring: updated to version 0.1.2.0
 - binary-shared: updated to version 0.8.2
 - bson: updated to version 0.2.1
 - leksah-server: updated to version 0.12.1.2
 - leksah: updated to version 0.12.1.2
 - MonadRandom: updated to version 0.1.7
 - random-shuffle: updated to version 0.0.4

svn path=/nixpkgs/trunk/; revision=34569
2012-06-20 10:56:24 +00:00
Vladimír Čunát
cf2a383bc7 Hot-fixing kile's nl handbook compilation problem on KDE-4.7 by removing it.
svn path=/nixpkgs/trunk/; revision=34568
2012-06-20 09:11:58 +00:00
Lluís Batlle i Rossell
7de1a6a074 Updating digikam to 2.6.0. It builds.
svn path=/nixpkgs/trunk/; revision=34564
2012-06-19 17:42:08 +00:00
Vladimír Čunát
fc6ce9f799 Minor kile update.
svn path=/nixpkgs/trunk/; revision=34554
2012-06-18 20:18:09 +00:00
Peter Simons
a3224ededc git-and-tools: fixed build in the presence of QuickCheck 2.5
svn path=/nixpkgs/trunk/; revision=34553
2012-06-18 18:16:23 +00:00
Vladimír Čunát
ef188787a0 A minor LyX update.
svn path=/nixpkgs/trunk/; revision=34550
2012-06-18 15:41:18 +00:00
Vladimír Čunát
1a33b4b654 Fixing stardict broken by my mistake.
svn path=/nixpkgs/trunk/; revision=34549
2012-06-18 15:37:35 +00:00
Vladimír Čunát
1a856c200d Updated transmission to 2.52.
svn path=/nixpkgs/trunk/; revision=34545
2012-06-18 15:18:45 +00:00
Lluís Batlle i Rossell
19be0c1f27 Updating skype from 2.2 to 4.0
svn path=/nixpkgs/trunk/; revision=34544
2012-06-18 12:39:44 +00:00
Lluís Batlle i Rossell
8a79b20781 Fixing the firefox 13 crash of plugin-container, using wrapProgram instead of patchelf.
svn path=/nixpkgs/trunk/; revision=34543
2012-06-18 11:10:43 +00:00
Lluís Batlle i Rossell
71882eb193 Fixing bad version in xulrunner for firefox 13.
svn path=/nixpkgs/trunk/; revision=34532
2012-06-17 20:44:49 +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
Lluís Batlle i Rossell
d3ffbea9d6 Updating firefox 13.0 to 13.0.1. Maybe this improves the flash issue.
svn path=/nixpkgs/trunk/; revision=34530
2012-06-17 17:12:31 +00:00
Peter Simons
2a60c221d1 git-annex: updated to version 3.20120614
svn path=/nixpkgs/trunk/; revision=34518
2012-06-15 15:33:47 +00:00
Yury G. Kudryashov
5487fbe94a telepathy-glib-0.18.1 (0.19.x requires glib-2.32.x)
Drop pkg-config patch, pass pkgconfigUpstream to rakia and salut.

svn path=/nixpkgs/trunk/; revision=34495
2012-06-13 07:09:23 +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
28aabd6311 kde-telepathy-0.4.0, tweak update script etc.
svn path=/nixpkgs/trunk/; revision=34493
2012-06-13 07:09:15 +00:00
Yury G. Kudryashov
7ad2658f83 zanshin-0.2.1, fix advertised version
svn path=/nixpkgs/trunk/; revision=34491
2012-06-13 07:09:07 +00:00
Karn Kallio
c89f37078d Make ProofGeneral build with Emacs 24.
svn path=/nixpkgs/trunk/; revision=34485
2012-06-12 21:51:53 +00:00
Florian Friesdorf
20db3374cf js2-mode-0-20120601
svn path=/nixpkgs/trunk/; revision=34484
2012-06-12 21:18:22 +00:00
Peter Simons
6ace4728f5 emacs-24: improved meta.description
svn path=/nixpkgs/trunk/; revision=34477
2012-06-12 12:18:12 +00:00
Peter Simons
7a626565df Updated Haskell packages.
- parsec: added version 3.1.3
 - xmonad-extras: updated to version 0.10.1.1

svn path=/nixpkgs/trunk/; revision=34475
2012-06-12 08:39:32 +00:00
Lluís Batlle i Rossell
fece483f5e Updating vimprobable2.
svn path=/nixpkgs/trunk/; revision=34472
2012-06-11 20:24:55 +00:00
Mathijs Kwik
25b199771d google-talk-plugin: upgraded to 2.9.10.0
svn path=/nixpkgs/trunk/; revision=34467
2012-06-11 17:41:03 +00:00
Mathijs Kwik
b40092010c mkvtoolnix: upgraded to 5.6.0
svn path=/nixpkgs/trunk/; revision=34465
2012-06-11 17:40:55 +00:00
Peter Simons
edb10988b3 xmonad: fixed build with GHC 7.4.1
svn path=/nixpkgs/trunk/; revision=34457
2012-06-11 14:55:56 +00:00
Florian Friesdorf
892947cd93 tesseract-3.0.1
svn path=/nixpkgs/trunk/; revision=34453
2012-06-11 10:28:28 +00:00
Peter Simons
b4ebc3bb42 emacs: version emacs-24.1 is out
The 24.x version is still low-prio in nixpkgs until we've figured out how to
support multiple 'emacsPackages' sets properly.

svn path=/nixpkgs/trunk/; revision=34447
2012-06-11 07:44:12 +00:00
Peter Simons
6db9c6f241 update i3status and i3lock
svn path=/nixpkgs/trunk/; revision=34446
2012-06-11 07:18:52 +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
84547c5307 Fix xfontsel to find the app defaults file.
svn path=/nixpkgs/trunk/; revision=34443
2012-06-11 07:16:51 +00:00
Peter Simons
3ecf94ae27 Update VirtualBox and guest additions to v4.1.16.
This includes fixes for kernels up to v3.4, so we shouldn't get build failures
with kernel 3.4 anymore.

svn path=/nixpkgs/trunk/; revision=34438
2012-06-11 07:15:03 +00:00
Yury G. Kudryashov
63deb1d30a skrooge-1.3.0
svn path=/nixpkgs/trunk/; revision=34406
2012-06-09 13:09:53 +00:00
Yury G. Kudryashov
baff5fc9f3 calligra-2.4.2
svn path=/nixpkgs/trunk/; revision=34405
2012-06-09 13:09:50 +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
Yury G. Kudryashov
6b6dba1bce kde-telepathy-0.3.1
Drop upstream patches already included in this version

svn path=/nixpkgs/trunk/; revision=34402
2012-06-09 13:09:37 +00:00
Peter Simons
330ea0887f git-annex: added openssh to build inputs so that the configure phase enables support for SSH connection caching
svn path=/nixpkgs/trunk/; revision=34386
2012-06-08 14:02:28 +00:00
Peter Simons
87d25896c1 git-annex: updated to version 3.20120605
svn path=/nixpkgs/trunk/; revision=34385
2012-06-08 14:02:21 +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
Cillian de Roiste
da4c1e38fd Removed patch, no longer necessary
svn path=/nixpkgs/trunk/; revision=34363
2012-06-05 17:50:22 +00:00
Cillian de Roiste
1067f51f92 Updating Kdenlive to 0.9.2, and also updating mlt to 0.8.0 since it's a dependency
svn path=/nixpkgs/trunk/; revision=34362
2012-06-05 16:52:11 +00:00
Peter Simons
7d15ad90b9 Updated Haskell packages.
- http-conduit: updated to version 1.4.1.8
 - leksah-server: updated to version 0.12.1.0
 - leksah: updated to version 0.12.1.0
 - ltk: updated to version 0.12.1.0
 - yaml: updated to version 0.7.0.3

svn path=/nixpkgs/trunk/; revision=34356
2012-06-05 08:31:42 +00:00
Andres Löh
8cf7f46ea0 Patching xmobar-0.15 to accept mtl-2.1.
svn path=/nixpkgs/trunk/; revision=34354
2012-06-05 08:09:06 +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
Eelco Dolstra
104bd01e1d * Git 1.7.10.4.
svn path=/nixpkgs/trunk/; revision=34349
2012-06-04 15:54:57 +00:00
Eelco Dolstra
ce10ebebac * Subversion 1.7.5.
svn path=/nixpkgs/trunk/; revision=34348
2012-06-04 15:40:25 +00:00
Peter Simons
4fdbd75e4f Updated Haskell packages.
- ghc-mod: updated to version 1.10.16
 - network: added version 2.3.0.14
 - pandoc: updated to version 1.9.4
 - xmobar: updated to version 0.15

svn path=/nixpkgs/trunk/; revision=34337
2012-06-04 09:24:14 +00:00
Peter Simons
678c30c050 xmobar: re-generated expression with the latest version of Cabal2Nix
This change enables wireless support unconditionally.

svn path=/nixpkgs/trunk/; revision=34327
2012-06-03 18:52:38 +00:00
Cillian de Roiste
b5d937ce33 Updating the bitcoin client to 0.6.2
svn path=/nixpkgs/trunk/; revision=34323
2012-06-02 18:00:39 +00:00
Cillian de Roiste
2d85463e7d Applying patch from Rok Garbas to update weechat to 0.3.7, also taking the opportunity to tidy up the style a bit.
svn path=/nixpkgs/trunk/; revision=34318
2012-06-01 22:04:08 +00:00
Marco Maggesi
5ca0b381e0 Update HOL Light to rev 141
svn path=/nixpkgs/trunk/; revision=34290
2012-05-30 20:53:13 +00:00
Peter Simons
272753809c haskell-hledger-interest: updated to version 1.4.1
svn path=/nixpkgs/trunk/; revision=34285
2012-05-29 20:47:29 +00:00
Andres Löh
854ebba387 Whitespace.
svn path=/nixpkgs/trunk/; revision=34274
2012-05-29 14:02:31 +00:00
Andres Löh
4e10015cab Added gnumeric.
svn path=/nixpkgs/trunk/; revision=34272
2012-05-29 12:21:33 +00:00
Mathijs Kwik
b82a8f6319 xmobar: enable optional wireless support
svn path=/nixpkgs/trunk/; revision=34268
2012-05-29 07:44:01 +00:00
Russell O'Connor
dace27b4c4 Revert accidentaly patch of ssreflect.
svn path=/nixpkgs/trunk/; revision=34264
2012-05-28 20:57:54 +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
f02a71103a add support to make building coqide optional.
svn path=/nixpkgs/trunk/; revision=34262
2012-05-28 19:45:14 +00:00
Cillian de Roiste
9b0cf4ca5d Updating Ardour 3 to beta 4a
svn path=/nixpkgs/trunk/; revision=34250
2012-05-26 17:29:31 +00:00
Peter Simons
ac64ba04bd git-annex: updated to version 3.20120522
svn path=/nixpkgs/trunk/; revision=34213
2012-05-22 19:46:37 +00:00
Peter Simons
d628fd3d34 ikiwiki: updated to version 3.20120516
svn path=/nixpkgs/trunk/; revision=34212
2012-05-22 19:46:33 +00:00
Rickard Nilsson
3724758a96 Fixed stupid syntax error in gnome-terminator's default.nix.
svn path=/nixpkgs/trunk/; revision=34196
2012-05-21 15:45:03 +00:00
Rickard Nilsson
61ef2ff439 gnome-terminator 0.96.
svn path=/nixpkgs/trunk/; revision=34195
2012-05-21 15:08:16 +00:00
Cillian de Roiste
4550700ec9 Updating Yoshimi, no need for the fluid patch any more.
svn path=/nixpkgs/trunk/; revision=34187
2012-05-20 18:15:23 +00:00
Eelco Dolstra
920eedb75f * Audacious updated to 3.2.2.
svn path=/nixpkgs/trunk/; revision=34185
2012-05-20 03:23:31 +00:00
Eelco Dolstra
5e7f049fc9 * svn2git-kde 1.0.5.
svn path=/nixpkgs/trunk/; revision=34169
2012-05-18 15:01:54 +00:00
Michael Raskin
f5211427b4 Adding zgrviewer
svn path=/nixpkgs/trunk/; revision=34166
2012-05-18 09:32:02 +00:00
Russell O'Connor
cfc8538326 Updating coq and ssreflect to patch level 4.
svn path=/nixpkgs/trunk/; revision=34146
2012-05-16 22:04:02 +00:00
Eelco Dolstra
503576d277 * Pan 0.137.
svn path=/nixpkgs/trunk/; revision=34139
2012-05-16 20:04:56 +00:00
Rickard Nilsson
840b2b013c opera 11.64.
svn path=/nixpkgs/trunk/; revision=34129
2012-05-15 21:46:56 +00:00
Rickard Nilsson
c12005ef56 spotify 0.8.3.278.
svn path=/nixpkgs/trunk/; revision=34109
2012-05-15 14:31:43 +00:00
Peter Simons
201bdca962 Updated Haskell packages.
- cryptocipher: updated to version 0.3.2
 - Crypto: updated to version 4.2.5
 - darcs: updated to version 2.8.1
 - hamlet: updated to version 1.0.1.3
 - monad-par-extras: updated to version 0.3.2
 - persistent-template: updated to version 0.9.0.2
 - pool-conduit: updated to version 0.1.0.2
 - shakespeare-css: updated to version 1.0.1.2
 - shakespeare-i18n: updated to version 1.0.0.2
 - shakespeare-js: updated to version 1.0.0.2
 - shakespeare-text: updated to version 1.0.0.2
 - shakespeare: updated to version 1.0.0.2
 - warp: updated to version 1.2.1
 - wxcore: updated to version 0.90.0.1
 - wxc: updated to version 0.90.0.3
 - wx: updated to version 0.90.0.1
 - xml-conduit: updated to version 0.7.0.3
 - xss-sanitize: updated to version 0.3.2
 - yesod-auth: updated to version 1.0.2.1
 - yesod-core: updated to version 1.0.1.2
 - yesod-default: updated to version 1.0.1.1
 - yesod-form: updated to version 1.0.0.4
 - yesod-json: updated to version 1.0.0.1
 - yesod-persistent: updated to version 1.0.0.1
 - yesod-routes: updated to version 1.0.1.2
 - yesod-static: updated to version 1.0.0.2
 - yesod: updated to version 1.0.1.6

svn path=/nixpkgs/trunk/; revision=34102
2012-05-15 11:50:48 +00:00
Russell O'Connor
bc43657f1e Updating calibre to 0.8.51
svn path=/nixpkgs/trunk/; revision=34075
2012-05-12 20:56:47 +00:00
Russell O'Connor
ff1fa88e3d Adding pdftohtml to the PATH for calibre.
svn path=/nixpkgs/trunk/; revision=34074
2012-05-12 20:34:01 +00:00