JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
258,623 Commits 2 Branches 0 Tags 13 GiB
75b1ba928a
Commit Graph

228 Commits

Author SHA1 Message Date
Tuomas Tynkkynen
d6d980c5df treewide: Make explicit that 'dev' output of poppler_utils is used 2016-05-19 10:02:30 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Pascal Wittmann
da061d06f9 calibre: 2.55.0 -> 2.56.0 2016-05-14 11:56:23 +02:00
Wei Tang
14c22adbc3 calibre: Fix file already exist building problem 2016-05-08 05:56:17 +02:00
Vladimír Čunát
ede605e4f1 calibre: fix #14938 build 
Thanks to a hack and qmake help from @ttuegel.
 2016-04-25 20:38:57 +02:00
Pascal Wittmann
1f1d8993c9 calibre: 2.54.0 -> 2.55.0 2016-04-22 21:05:38 +02:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size 
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
 2016-04-10 11:17:52 +02:00
Pascal Wittmann
977529f35a calibre: 2.53.0 -> 2.54.0 2016-04-03 11:29:17 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
Pascal Wittmann
ba3153ee08 calibre: 2.52.0 -> 2.53.0 2016-03-15 18:56:41 +01:00
Vladimír Čunát
09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Pascal Wittmann
afd2d0588b calibre: 2.51.0 -> 2.52.0 2016-02-29 23:35:32 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Pascal Wittmann
7f1b6d8a31 calibre: 2.50.1 -> 2.51.0 2016-02-12 21:47:12 +01:00
Tuomas Tynkkynen
7b0c4d452a treewide: Mass replace 'poppler_utils}/bin' to refer the 'out' output 2016-02-01 20:46:18 +02:00
Pascal Wittmann
268d4699ec calibre: 2.49.0 -> 2.50.1 2016-01-31 18:06:51 +01:00
Tuomas Tynkkynen
0f4244f51f treewide: Mass replace 'poppler_utils}/lib' to refer the 'out' output 2016-01-24 10:03:39 +02:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Pascal Wittmann
5cee8ff809 calibre: 2.48.0 -> 2.49.0 2016-01-15 21:36:23 +01:00
Robert Helgesson
108cd9aa7f calibre: disable version check 
Applies patch from Debian to disable version checking by default.
 2016-01-05 21:44:54 +01:00
Gabriel Ebner
6a911bf36a calibre: 2.46.0 -> 2.48.0 2016-01-02 18:59:10 +01:00
Gabriel Ebner
bddcf7dfed calibre: make unrar support optional 2016-01-02 18:59:01 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Thomas Tuegel
36dea909b7 calibre: Qt 5 infrastructure update 2015-12-20 07:56:47 -06:00
Pascal Wittmann
a6519d50c0 calibre: 2.45.0 -> 2.46.0 2015-12-11 19:52:20 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Frederik Rietdijk
d9758cf3b4 calibre: use pillow instead of pil 2015-12-08 15:12:53 +01:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Pascal Wittmann
1fcea37c24 calibre: 2.44.1 -> 2.45.0 2015-11-27 10:10:39 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
Pascal Wittmann
f9670479e8 calibre: 2.44.0 -> 2.44.1 2015-11-18 16:13:33 +01:00
Pascal Wittmann
3a4a0f7d03 calibre: 2.43.0 -> 2.44.0 2015-11-13 12:04:26 +01:00
AndersonTorres
c38e130062 Calibre: 2.42.0 -> 2.43.0 2015-11-06 07:48:21 -02:00
Pascal Wittmann
b2d724ed29 calibre: 2.41.0 -> 2.42.0 2015-11-02 19:59:06 +01:00
Pascal Wittmann
fccef131cd calibre: 2.40.0 -> 2.41.0 2015-10-16 10:34:35 +02:00
Pascal Wittmann
35bd395606 calibre: 2.38 -> 2.40 2015-10-05 23:01:40 +02:00
Vladimír Čunát
f8c211fd2b fontconfig: split into multiple outputs 
Fixed all 'fontconfig}' references as well, hopefully, ugh!
 2015-10-05 12:23:56 +02:00
Pascal Wittmann
9681e04d58 calibre: 2.37.1 -> 2.38.0 2015-09-11 11:57:17 +02:00
Pascal Wittmann
f912c211fe calibre: update from 2.36.0 to 2.37.1 2015-09-05 11:20:29 +02:00
Bjørn Forsman
f6135c9fba calibre: 2.35.0 -> 2.36.0 
Unbreaks build, as the 2.35.0 source URL returns HTTP error 404.
 2015-08-29 15:58:42 +02:00
Pascal Wittmann
b61b704a52 calibre: update 2.34.0 to 2.35.0 2015-08-14 22:38:38 +02:00
Pascal Wittmann
2c9c135ee2 calibre: update from 2.33.0 to 2.34.0 2015-08-09 16:15:23 +02:00
Pascal Wittmann
6469382809 calibre: update from 2.31.0 to 2.33.0 
moved from sourceforge to github as sourceforge is outdated
 2015-08-04 13:55:08 +02:00
Pascal Wittmann
710c4b2cb5 calibre: fix build by using qt54 2015-07-09 22:23:39 +02:00
Pascal Wittmann
08bdb6fe6d calibre: update from 2.30.0 to 2.31.0 2015-06-21 10:38:32 +02:00
Pascal Wittmann
eac4f2aa31 calibre: update from 2.29.0 to 2.30.0 2015-06-08 12:17:32 +02:00
Pascal Wittmann
e999716d1e calibre: update from 2.28.0 to 2.29.0 2015-05-29 12:57:07 +02:00
Pascal Wittmann
3ac31fe041 calibre: fix build by using qt53 2015-05-18 22:41:48 +02:00
Pascal Wittmann
72c7c683d1 calibre: update from 2.27.0 to 2.28.0 2015-05-15 10:10:25 +02:00
Domen Kožar
b7f15c43da fix evals /cc @ttuegel 2015-05-10 13:46:32 +02:00
Michael Alan Dorman
235cf187cc Fix calibre PDF handling 
In c0d5cd0ff9, the binaries for poppler
were carved off into a separate package, and calibre has had broken pdf
support since.  This changes all dependencies on poppler to
poppler_utils, which fixes this support, much as was done for
cups_filter in 394562655f.
 2015-05-10 13:45:26 +02:00
Pascal Wittmann
4c01e6d919 calibre: update from 2.26.0 to 2.27.0 2015-05-01 09:15:00 +02:00
Pascal Wittmann
6dfbe62c7d calibre: update from 2.25.0 to 2.26.0 2015-04-24 11:58:10 +02:00
Pascal Wittmann
eaecd7ffd4 calibre: update from 2.24.0 to 2.25.0 2015-04-17 08:21:36 +02:00
Pascal Wittmann
c4b685aa81 calibre: update from 2.23.0 to 2.24.0 2015-04-12 18:14:20 +02:00
Pascal Wittmann
9c425ca3fa calibre: update from 2.22.0 to 2.23.0 2015-04-08 16:01:45 +02:00
Pascal Wittmann
afcb9be79e calibre: update from 2.21.0 to 2.22.0 2015-03-23 15:29:36 +01:00
Pascal Wittmann
8eb7034766 calibre: update from 2.20.0 to 2.21.0 2015-03-13 16:12:51 +01:00
Pascal Wittmann
c1f50b6222 calibre: update from 2.19.0 to 2.20.0 2015-02-20 13:08:47 +01:00
Pascal Wittmann
ad6421fb03 calibre: update from 2.18.0 to 2.19.0 2015-02-06 12:09:03 +01:00
Pascal Wittmann
98a69c0dcb calibre: update from 2.17.0 to 2.18.0 2015-01-30 09:04:45 +01:00
Pascal Wittmann
531578c188 calibre: update from 2.16.0 to 2.17.0 2015-01-24 12:59:26 +01:00
Pascal Wittmann
398d1277c6 calibre: update from 2.15.0 to 2.16.0 2015-01-14 14:23:47 +01:00
Ryan Mulligan
b59ac4601c update Calibre to latest version 2.15.0 2015-01-04 08:31:21 -08:00
Pascal Wittmann
e6d0bd0d5c calibre: update from 2.12.0 to 2.13.0 2014-12-19 14:42:31 +01:00
Pascal Wittmann
457d56fcec calibre: update from 2.11.0 to 2.12.0 2014-11-28 11:08:12 +01:00
Pascal Wittmann
77fffad1ab calibre: update from 2.10.0 to 2.11.0 2014-11-21 15:40:23 +01:00
Pascal Wittmann
ea05587309 calibre: update from 2.9.0 to 2.10.0 2014-11-14 14:05:39 +01:00
Pascal Wittmann
647f58bfaf calibre: update from 2.8.0 to 2.9.0 2014-11-07 09:55:21 +01:00
Pascal Wittmann
aa28a2ded2 calibre: update from 2.7.0 to 2.8.0 2014-11-01 13:38:28 +01:00
Pascal Wittmann
4ecacf55b9 calibre: update from 2.6.0 to 2.7.0 2014-10-24 16:39:54 +02:00
Pascal Wittmann
cd223ad0ac calibre: update from 2.5.0 to 2.6.0 2014-10-17 18:22:52 +02:00
Pascal Wittmann
1a8ca0b8bf calibre: update from 2.4.0 to 2.5.0 2014-10-03 16:21:50 +02:00
Pascal Wittmann
e28f8e5cca calibre: update from 2.3.0 to 2.4.0 2014-09-26 20:08:15 +02:00
Pascal Wittmann
245f34fef7 calibre: update from 2.2.0 to 2.3.0 2014-09-12 21:37:39 +02:00
Pascal Wittmann
1d263f3776 calibre: update from 2.1.0 to 2.2.0 2014-09-05 23:53:50 +02:00
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
Lluís Batlle i Rossell
a4473b8205 Adding calibre. This involved also: 
- Adding podofo
- Adding some new python packages
- Making new pkgs attributes for python packages to build with python 2.6
- Updating some python packages expressions to allow python 2.6, and not only 2.5.


svn path=/nixpkgs/trunk/; revision=19303
 2010-01-07 22:47:30 +00:00