1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 01:51:24 +00:00
Commit graph

132 commits

Author SHA1 Message Date
Pascal Wittmann 6d2f00b209 calibre: 2.57.1 -> 2.58.0 2016-06-03 18:25:22 +02:00
Pascal Wittmann 5f599361fc calibre: 2.56.0 -> 2.57.1 2016-05-29 12:25:17 +02:00
Vladimír Čunát 73f1f5eb39 imagemagick: split dev output to fix #9604
Also fixup references to imagemagick.
2016-05-22 13:41:15 +02:00
Vladimír Čunát c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
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