1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Commit graph

51 commits

Author SHA1 Message Date
Pascal Wittmann b90dd7089f calibre: update from 2.0.0 to 2.1.0 2014-08-29 10:36:04 +02:00
Pascal Wittmann 116930f5ba calibre: update from 1.48.0 to 2.0.0 2014-08-23 12:03:23 +02:00
Pascal Wittmann 4ec55e64e0 calibre: update from 1.47.0 to 1.48.0 2014-08-08 09:31:51 +02:00
Pascal Wittmann bb153cfe72 calibre: update from 1.46.0 to 1.47.0 2014-08-01 11:17:00 +02:00
Pascal Wittmann 50510d1985 calibre: update from 1.45.0 to 1.46.0 2014-07-25 11:16:24 +02:00
Pascal Wittmann a49e2f866d calibre: update from 1.44.0 to 1.45.0 2014-07-18 16:20:00 +02:00
Pascal Wittmann e8ef98cea2 calibre: update from 1.35.0 to 1.44.0 2014-07-11 22:57:59 +02:00
Arvin Moezzi 0dfd7efd36 calibre: upgrade from 1.31.0 to 1.35.0 2014-06-12 09:30:39 +02:00
Arvin Moezzi f82b678508 calibre: upgrade from 1.25.0 to 1.31.0 2014-04-04 09:25:32 +02:00
Pascal Wittmann 78e7d5db00 calibre: upgrade from 1.23.0 to 1.25.0 2014-02-26 09:36:14 +01:00
Arvin Moezzi f99f60af32 calibre: upgrade from 1.21.0 to 1.23.0 2014-02-10 20:10:05 +01:00
Arvin Moezzi 03857fe2ec calibre: upgrade from 1.20.0 to 1.21.0 2014-01-29 02:26:11 +01:00
Arvin Moezzi da4dbbfd11 calibre: upgrade from 1.17.0 to 1.20.0 2014-01-19 22:04:41 +01:00
Arvin Moezzi 8fc2319320 calibre: upgrade from 1.15.0 to 1.17.0 2013-12-25 14:51:08 +01:00
Nixpkgs Monitor c7a7cfc9d2 calibre: update from 1.14.0 to 1.15.0 2013-12-18 18:18:20 +02:00
Arvin Moezzi 36cb2af057 calibre: upgrade 1.13.0 -> 1.14.0
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-10 16:45:49 +00:00
Arvin Moezzi 95f43b9e8e calibre: upgrade 1.11.0 -> 1.13.0 2013-11-30 03:04:44 +01:00
Arvin Moezzi bb8406b3c0 calibre: upgrade 1.8.0 -> 1.11.0 2013-11-17 19:49:29 +01:00
Mathijs Kwik 588db4727c calibre: fix hash 2013-11-01 07:59:11 +01:00
Arvin Moezzi 162b874469 calibre: upgrade 1.5.0 -> 1.8.0
from #1144
2013-10-30 15:44:03 +02:00
Mathijs Kwik 0dfab04ef1 calibre: upgrade to 1.5.0 2013-10-04 09:07:45 +02:00
Mathijs Kwik edf4f3a7f5 calibre: upgrade to 1.4.0 2013-09-22 20:03:26 +02:00
Mathijs Kwik 0021d4495e calibre: upgrade to 1.2.0 2013-09-08 13:36:34 +02:00
Mathijs Kwik 97ac37f8fd calibre: upgrade to 1.1 2013-09-04 09:28:59 +02:00
Mathijs Kwik 946f219a32 calibre: really fix building on master
It turns out I hardcoded the output path that qt's tarball extracts.
But that path is versioned (4.8.5 for example).
As I've already merged x-updates on my own system, my qt version was
different (4.8.4 vs 4.8.5). Made the path-guessing more flexible, so
now it should work with any 4.8.*
2013-08-25 23:42:44 +02:00
Mathijs Kwik 4326c06319 calibre: fix for chroot builds (probably) 2013-08-25 18:16:02 +02:00
Mathijs Kwik c9318f4d2d calibre: upgrade to 1.0
Upstream insists on using private qt headers.
We do not want nixpkgs' qt to export those.
So I provided a small hack to take them directly from qt's source tarball.
I made sure everything uses the normal system qt and headers, except for the
1 .so file (qt_hack) that needs these private headers.

Because of this, there is barely any increate in size or buildtime.
2013-08-25 14:31:05 +02:00
Domen Kozar f6a60d6640 calibre: upgrade to 0.9.11 (fixes #777) 2013-07-26 13:18:08 +02:00
Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Vladimír Čunát ee9a5d864c calibre: make build by minor upgrade + new dependencies
0.9.* won't build: https://bugs.launchpad.net/calibre/+bug/1094719
2013-02-13 09:18:27 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra d9c0fc6a51 Fix Nixpkgs evaluation
http://hydra.nixos.org/build/3020333
2012-09-13 09:56:19 -04: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
Lluís Batlle i Rossell 7a4c5e084c Updating calibre, and adding sourceforge as a backup url, suggested by roconnor.
svn path=/nixpkgs/trunk/; revision=33983
2012-05-04 19:01:51 +00:00
Lluís Batlle i Rossell f5da2fe902 Updating calibre
svn path=/nixpkgs/trunk/; revision=33922
2012-04-25 21:31:09 +00:00
Eelco Dolstra d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Yury G. Kudryashov 097b7635af Explicitly add sqlite to calibre.buildInputs
The better way would be adding sqlite to
pythonPackages.sqlite3.propagatedBuildInputs but I don't want to touch this
code.

svn path=/nixpkgs/trunk/; revision=31197
2012-01-02 10:42:36 +00:00
Eelco Dolstra bf55fb9192 * Fixed Calibre (it was referring to "python2", which doesn't exist)
and updated it to 0.8.32.

svn path=/nixpkgs/trunk/; revision=31140
2011-12-29 16:22:46 +00:00
Yury G. Kudryashov 471ebaf6f8 calibre-0.8.30
svn path=/nixpkgs/trunk/; revision=30900
2011-12-15 06:58:27 +00:00
Yury G. Kudryashov 1b87ef25db calibre-0.8.21
The old version failed to build on hydra, so I've upgraded

svn path=/nixpkgs/trunk/; revision=29637
2011-10-04 15:20:17 +00:00
Eelco Dolstra d449c4db98 * Remove Python 2.6, since the only remaining package that used it
(Calibre) also works with 2.7.

svn path=/nixpkgs/branches/modular-python/; revision=26561
2011-03-28 11:50:47 +00:00
Rob Vermaas 544cb2a0c9 updated calibre to 0.7.14
svn path=/nixpkgs/trunk/; revision=23268
2010-08-20 09:07:35 +00:00
Lluís Batlle i Rossell d55ef92843 Updating calibre
svn path=/nixpkgs/trunk/; revision=22155
2010-06-05 09:33:51 +00:00
Yury G. Kudryashov afe0368b9a Bump to calibre-0.6.47
svn path=/nixpkgs/trunk/; revision=21013
2010-04-11 18:58:35 +00:00
Lluís Batlle i Rossell 54ccfcff2d Updating calibre (now, with chm support)
svn path=/nixpkgs/trunk/; revision=20797
2010-03-23 21:48:38 +00:00
Eelco Dolstra 9dd466d123 * Updated pyqt and sip because the old versions have disappeared.
* Removed some unused versions of those packages.
* Don't pass `lib' to packages (because we already have `stdenv.lib').
* Removed some `*_python26' variants because Python 2.6 is the default
  now.

svn path=/nixpkgs/trunk/; revision=20782
2010-03-23 14:04:47 +00:00
Lluís Batlle i Rossell b7abafeedc Adding a new python package to allow calibre preview the books
svn path=/nixpkgs/trunk/; revision=20292
2010-02-28 22:55:08 +00:00
Lluís Batlle i Rossell 30a9cbf018 Updating calibre (I had to add a new python package for it: cssutils)
svn path=/nixpkgs/trunk/; revision=20291
2010-02-28 22:42:39 +00:00
Lluís Batlle i Rossell 2cbbaa62ae Updating calibre.
I still have not been able to convert any single book to lrf with this calibre.
There may be some tool missing, but I don't guess what.


svn path=/nixpkgs/trunk/; revision=19310
2010-01-08 20:30:24 +00:00