Commit graph

6266 commits

Author SHA1 Message Date
Shea Levy
1d0eb1ae47 Merge branch 'pitivi' of git://github.com/iyzsong/nixpkgs
add pitivi, gstreamer powered non-linear video editor
2014-03-29 00:43:36 -04:00
Shea Levy
1aa5589eef Merge branch 'virtualbox' of git://github.com/Calrama/nixpkgs
Update VirtualBox (and implicitly VirtualBox Guest Additions) to 4.3.6
and Oracle VM VirtualBox Extension Pack to 91406

Conflicts due to minor upgrade in the mean time

Conflicts:
	nixos/modules/virtualisation/virtualbox-guest.nix
	pkgs/applications/virtualization/virtualbox/default.nix
	pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
2014-03-29 00:23:54 -04:00
Shea Levy
63f97fe9db Merge branch 'slim_fix' of git://github.com/jagajaga/nixpkgs
add normal theme support for slim and slimlock
2014-03-29 00:17:52 -04:00
Shea Levy
a0a135d5ef Merge branch 'z3' of git://github.com/thoughtpolice/nixpkgs
z3: version 4.3.1
2014-03-28 23:54:43 -04:00
Shea Levy
8a15cfdaec Merge branch 'mps' of git://github.com/thoughtpolice/nixpkgs
Add mps 1.113.0, fix usage of Sleepycat license
2014-03-28 23:03:20 -04:00
Shea Levy
b574394d70 Merge branch 'dwb-update' of git://github.com/pSub/nixpkgs
Updated dwb to latest revision
2014-03-28 21:42:51 -04:00
Pascal Wittmann
df2e5fc47a Updated dwb to latest revision 2014-03-28 10:30:36 +01:00
Thomas Tuegel
5554d9c688 Add zotero 4.0.19 (close #2043)
@vcunat simplied the expression a little.
2014-03-27 22:42:47 +01:00
Vladimír Čunát
9bde84a75d fix evaluation since 34301c8 2014-03-27 21:33:25 +01:00
Vladimír Čunát
abda7ec36f liferea: maintenance update 2014-03-27 21:33:25 +01:00
宋文武
96d78a2804 pitivi: fix icons 2014-03-27 11:01:24 +08:00
Cillian de Róiste
de3b5b4500 Add simplescreenrecorder: an excellent screen recorder for linux 2014-03-26 23:02:33 +01:00
Cillian de Róiste
b60f8810b2 yoshimi: update from 1.1.0 to 1.2.0 2014-03-26 22:27:02 +01:00
Cillian de Róiste
fc4542c99d qtractor: update from 0.5.12 to 0.6.0 2014-03-26 22:26:43 +01:00
Cillian de Róiste
7381035bc2 blender: update from 2.69 to 2.70 2014-03-26 22:25:40 +01:00
Edward Tjörnhammar
8af6b20856 idea: update 13.0.2 -> 13.1.1
And use buildnumbers only in the buildscript and use more familiar
version numbers in the package name.

[bjorn.forsman@gmail.com: modify commit message]
2014-03-26 21:21:12 +01:00
Evgeny Egorochkin
8cd858b100 ocamlPackages.mldonkey: update from 3.1.3 to 3.1.5 2014-03-26 19:20:11 +02:00
Evgeny Egorochkin
37f8bcc028 kde4_prev.quasselDaemon: update from 0.9.2 to 0.10.0 2014-03-26 19:18:15 +02:00
_1126
34301c89e1 ncmcp: New expression 2014-03-26 12:15:01 +01:00
Peter Simons
0cbf18a1c2 Merge pull request #2037 from ambrop72/cura
Add Cura.
2014-03-26 11:11:56 +01:00
Shea Levy
97a733ae57 Merge branch 'submit/sloane' of git://github.com/akc/nixpkgs
Add sloane -- a command line interface to OEIS
2014-03-26 02:42:22 -04:00
aszlig
a5a5abd2fe
chromium: Fix startup of beta and dev channels.
Since version 34, ICU data files are now created separately and thus
need to be installed as well.

Closes #2016

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit f117341ff2de4b95d223b41b36942e2f60ada2a3)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-26 01:33:07 +01:00
Thomas Tuegel
3d08732d12 Wrap k3b with PATH to required tools 2014-03-25 17:25:37 -05:00
ambrop7@gmail.com
5f2167627e Add Cura. 2014-03-25 23:17:17 +01:00
Austin Seipp
289a1c5f06 ike: use stdenv.lib.licenses.sleepycat
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-24 19:58:36 -05:00
Shea Levy
ff6febb75d sox: Update, get rid of composableDerivation 2014-03-24 12:01:20 -04:00
Mathijs Kwik
d8d8606da4 unison: upgrade to 2.40.102 2014-03-24 10:35:51 +01:00
Mathijs Kwik
149dcb2113 conkeror: upgrade to more recent snapshot
needed for scripting Downloads.jsm with Gecko >= 26
2014-03-24 10:35:51 +01:00
Shea Levy
a2b6ec902c Merge branch 'master' of git://github.com/AndersonTorres/nixpkgs
Updating Portuguese and Brazilian language dictionaries for Aspell
2014-03-23 20:52:21 -04:00
Shea Levy
57bbdffe39 Merge branch 'electrum' of git://github.com/ehmry/nixpkgs
electrum: initial expression
2014-03-23 20:47:28 -04:00
Shea Levy
3d8154359a Merge branch 'fix-openbox' of git://github.com/Shados/nixpkgs
Openbox: Added wrapping for XDG_DATA_DIRS
2014-03-23 20:45:26 -04:00
Peter Simons
4c5d093ae0 esniper: add patch to fix unrecognized e-bay log-in page 2014-03-23 22:30:54 +01:00
Matej Cotman
13bc37ed3e vlc: ncurses support (close #2012) 2014-03-23 20:21:16 +01:00
Domen Kožar
eb2992a4c7 Merge pull request #2014 from offlinehacker/pkgs/transmission-remote-gtk/fix_filechooser_schema
transmission-remote-gtk: fix missing schema for gtk3 FileChooser
2014-03-23 18:06:52 +01:00
Jaka Hudoklin
6f44ffc61c transmission-remote-gtk: fix missing schema for gtk3 FileChooser 2014-03-23 18:04:03 +01:00
Emery Hemingway
e91daf327d electrum: initial expression
Electrum is a Bitcoin thin-wallet.
https://electrum.org
2014-03-23 11:22:57 -04:00
AndersonTorres
d8648c47cf Merge remote-tracking branch 'upstream/master' 2014-03-23 11:52:03 -03:00
Alexei Robyn
a7070743a3 Openbox: Added wrapping for XDG_DATA_DIRS
Fixes issue with Openbox failing to start due to not finding its default
theme
2014-03-23 21:48:36 +11:00
Shea Levy
5fca5a4435 Merge branch 'ncdc' of git://github.com/ehmry/nixpkgs
ncdc: initial expression
2014-03-22 21:36:24 -04:00
Emery Hemingway
ed7f95be88 ncdc: initial expression
http://dev.yorhel.nl/ncdc
2014-03-22 21:21:24 -04:00
Shea Levy
5c7e77d1a9 Merge branch 'master' of git://github.com/zopa/nixpkgs
newsbeuter: Update to 2.8
2014-03-22 20:40:59 -04:00
AndersonTorres
e48ae6a079 A minor fix to maintainers field for some packages (aegisub,mpv,8086tiny and bochs) 2014-03-22 14:30:45 -03:00
宋文武
6a981b5141 add pitivi 0.93 2014-03-22 23:09:39 +08:00
Peter Simons
d294dd7774 Merge pull request #1996 from jacobhinkle/slrn
Add slrn: command-line newsreader
2014-03-22 14:34:24 +01:00
Jacob Hinkle
941682efba Remove pkgs from slrn. Use stdenv.lib instead 2014-03-22 06:58:31 -06:00
Peter Simons
ceb7673bf0 Fix broken references to 'maintainers' attribute set. 2014-03-22 10:01:42 +01:00
Peter Simons
cc8c69890b haskell-yi: update to version 0.7.2 2014-03-22 09:04:46 +01:00
Peter Simons
441dca211e haskell-yi-contrib: update to version 0.7.2 2014-03-22 09:04:46 +01:00
Peter Simons
fa62ab13de haskell-git-annex: update to version 5.20140320 2014-03-22 09:04:46 +01:00
Peter Simons
57db4ba855 Merge pull request #1998 from AndersonTorres/master
Maintainer and license modifications for some packages
2014-03-22 09:01:07 +01:00
AndersonTorres
f7498e5a7e Adding info about maintainer (myself - AndersonTorres) and modifying the meta.license field for some packages I have made. 2014-03-22 01:12:48 -03:00
Jacob Hinkle
715b90f784 Update default.nix to use ncurses and patch hardcoded paths 2014-03-21 14:32:21 -06:00
Jacob Hinkle
774d179790 Started default.nix for slrn. Not finding slang 2014-03-21 12:07:56 -06:00
Domen Kožar
584d696943 ike: also specify lib64 libs 2014-03-21 18:08:07 +01:00
Domen Kožar
d7bd83d0ae shotwell: 0.15.1 -> 0.18 2014-03-21 18:02:15 +01:00
Moritz Ulrich
8edc5f9999 weechat: Backport fix for freeze with gnutls 3.2.
Fixes /exit when using gnutls 3.2. This is a temporary solution as 3.1
isn't building right now. The next release of weechat will include this
fix.
2014-03-21 13:26:23 +01:00
Austin Seipp
2646eac8b2 z3: version 4.3.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-21 02:50:54 -05:00
Linquize
4e385c272c git: Update to 1.9.1 2014-03-20 15:44:25 +01:00
Evgeny Egorochkin
76f7ea6e39 add repositories.git to several packages 2014-03-20 13:32:29 +02:00
Shea Levy
789cbfdced Merge branch 'ekho' of git://github.com/iyzsong/nixpkgs
add ekho 5.8.2, a Chinese TTS software
2014-03-19 18:26:18 -04:00
Shea Levy
506924c6c2 Merge branch 'kdevelop46' of git://github.com/ambrop72/nixpkgs
kdevelop: Update to 4.6.
2014-03-19 18:11:35 -04:00
Shea Levy
a1fff61e4d Merge branch 'u/vimrc' of git://github.com/wizeman/nixpkgs
vimHugeX: also add wrapper for system-wide vimrc
2014-03-19 18:07:04 -04:00
Vladimír Čunát
5bb0803254 fix evaluation (shotwell license) 2014-03-19 21:10:43 +01:00
Domen Kožar
d4b1250b6c remove prefix for kazam 2014-03-18 18:23:13 +01:00
Domen Kozar
902b059967 Add shotwell 1.15.1 2014-03-18 18:23:13 +01:00
Anders Claesson
ac3de98f07 Add sloane -- a command line interface to OEIS. 2014-03-18 14:37:56 +00:00
William A. Kennington III
b6d3526c53 qemu: Update 1.5.2 -> 1.7.0 2014-03-18 14:24:46 +01:00
Peter Simons
5e7608e226 Merge pull request #1932 from wkennington/master.sup
sup: Push sup to the latest git commit
2014-03-18 12:09:20 +01:00
Vladimír Čunát
cca592b455 liferea: minor update 2014-03-18 10:24:00 +01:00
Peter Simons
bfa2466d71 haskell-xmobar: update to version 0.20.1 2014-03-17 18:33:54 +01:00
William A. Kennington III
4a112f46b1 sup: Push sup to the latest git commit
ncursesw was also pushed forward from 1.3.1.2 -> 1.4.6 as the packaging
was changed for the latest version of sup
2014-03-17 12:04:31 -05:00
Ricardo M. Correia
a16e1e2133 chromium: Update stable and beta channels
stable: 33.0.1750.149 -> 33.0.1750.152
beta:   34.0.1847.45  -> 34.0.1847.60
2014-03-16 13:26:01 +01:00
Cillian de Róiste
b57ee8c331 nixpkgs-lint: add the platforms meta attr for most of my packages 2014-03-16 12:08:26 +01:00
Cillian de Róiste
1661501465 ardour: make ardour3 the default and remove ardour 2, it doesn't build 2014-03-16 11:32:56 +01:00
Vladimír Čunát
7ca8bd6d4f Merge pull request #1965 from ambrop72/ktorrent-4.3.1
KTorrent: update to 4.3.1.
2014-03-15 23:13:50 +01:00
ambrop7@gmail.com
24f4957d50 KTorrent: Fix URLs. 2014-03-15 21:31:58 +01:00
ambrop7@gmail.com
732760bb50 Update KTorrent to 4.3.1. 2014-03-15 20:22:03 +01:00
Shea Levy
389c3951a8 Merge branch 'coq' of git://github.com/thoughtpolice/nixpkgs
coq: 8.4pl2 -> 8.4pl3
2014-03-15 13:03:10 -04:00
Shea Levy
da184a455f Merge branch 'vmpk' of git://github.com/iyzsong/nixpkgs
add vmpk 0.5.1, a virtual midi piano keyboard
2014-03-15 12:22:18 -04:00
Vladimír Čunát
6246fad9c7 liferea: fix crash when opening file dialogs
The same schema issue as always in gtk3 dialogs.
2014-03-15 15:09:03 +01:00
Peter Simons
f1a30454f6 Merge pull request #1942 from thoughtpolice/fixups
Trivial fixes for my packages
2014-03-15 09:35:35 +01:00
宋文武
9ce62a1ae6 add vmpk 0.5.1, a virtual midi piano keyboard 2014-03-15 13:13:25 +08:00
Shea Levy
5a38bfdb9c Merge branch 'darcsum' of git://github.com/falsifian/nixpkgs
Added darcsum, "a pcl-cvs like interface for managing darcs patches".
2014-03-14 19:42:27 -04:00
Bjørn Forsman
562f937d21 openscad: bump 2013.06 -> 2014.03
openscad now depends on glib, and it needs pkgconfig to find glib.
2014-03-14 22:21:15 +01:00
Ricardo M. Correia
17b473449b Add myself as maintainer of pkgs I wish to keep up-to-date 2014-03-14 21:22:09 +01:00
Eelco Dolstra
5a807eaedb flashplayer: Add license field 2014-03-14 13:24:23 +01:00
Nixpkgs Monitor
b86692e00d mpg123: update from 1.18.1 to 1.19.0 2014-03-14 11:16:56 +01:00
宋文武
aa42830538 add ekho 5.8.2, a Chinese TTS software 2014-03-14 13:18:19 +08:00
Vladimír Čunát
db9599c4a0 gnumeric: minor update 1.12.9 -> .12 2014-03-13 22:55:52 +01:00
Ben Doyle
3cbd1cd795 newsbeuter: bump development version to latest master 2014-03-13 17:01:58 -04:00
Ben Doyle
8fb68289c6 newsbeuter: Update from 2.7 to 2.8 2014-03-13 17:01:57 -04:00
Vladimír Čunát
d6349df0dd put systemd unit dirs on the right place
Also see #1936.
2014-03-13 21:44:51 +01:00
Ricardo M. Correia
d83e7fbb8d chromium: Update all channels
stable: 33.0.1750.146 -> 33.0.1750.149
beta:   34.0.1847.14  -> 34.0.1847.45
dev:    35.0.1862.2   -> 35.0.1883.0
2014-03-13 02:27:14 +01:00
Cillian de Róiste
fcfbe753e7 Add synfig: A 2D animation program 2014-03-13 01:14:05 +01:00
Domen Kožar
5b733c9e24 Merge pull request #1919 from wkennington/master.st
st: Add builtInput for pkgconfig
2014-03-12 23:34:56 +01:00
Peter Simons
23807bbe97 Merge pull request #1925 from wkennington/master.notbit
notbit: Add Package
2014-03-12 19:00:31 +01:00
William A. Kennington III
635cb24bb1 notbit: Add Package 2014-03-12 11:28:16 -05:00
Ricardo M. Correia
4640a6b9db flashplayer: Update from 11.2.202.341 -> 11.2.202.346 2014-03-12 14:42:52 +01:00
Vladimír Čunát
4c9bac5004 liferea: fix https URIs by adding glib_networking 2014-03-11 22:01:12 +01:00
ambrop7@gmail.com
927971d8e3 kdevelop: Update to 4.6. 2014-03-11 18:36:16 +01:00
William A. Kennington III
635599c611 st: Add builtInput for pkgconfig
During the build process st fails to find pkg-config. This does not throw a fatal error but it should be included during build time.
2014-03-11 12:11:19 -05:00
Eelco Dolstra
36ee5c61c3 Rename git -> git-minimal, git-full -> git
Since most people probably want the full Git.
2014-03-11 17:00:17 +01:00
Peter Simons
423b2e2cd4 haskell-xmobar: update to version 0.20 2014-03-11 13:50:47 +01:00
Arseniy Seroka
f7d5e83abb slim: remove duplicate code 2014-03-11 16:27:27 +04:00
José Romildo Malaquias
0704190b33 liferea: fixed some dependencies 2014-03-10 23:37:42 -03:00
Ricardo M. Correia
05a2b88df7 vimHugeX: also add wrapper for system-wide vimrc 2014-03-10 23:40:59 +01:00
Eelco Dolstra
203f4d6ec8 firefoxWrapper: Fix the name 2014-03-10 15:25:47 +01:00
Eelco Dolstra
1fe2a68224 quodlibet: Fix evaluation
http://hydra.nixos.org/build/9400950
2014-03-10 14:51:05 +01:00
Bjørn Forsman
d23ea79667 gnuradio: also use PYTHONPATH from runtime environment
So that extra modules can be used without rebuilding (e.g. in
gnuradio-companion). PYTHONPATH from the environment is added *after*
the default deps.
2014-03-09 22:35:36 +01:00
Cillian de Róiste
12b50bb9f6 add ams-lv2: An LV2 port of the internal modules found in Alsa Modular Synth 2014-03-09 22:14:56 +01:00
Cillian de Róiste
7aa008d1b8 Merge branch 'ingen' 2014-03-09 20:35:20 +01:00
Cillian de Róiste
d21323cbf8 add ingen: A modular audio processing system using JACK and LV2 or LADSPA 2014-03-09 20:32:06 +01:00
José Romildo Malaquias
542226ffe1 Updated liferea version from 1.8.15 to 1.10.6 2014-03-09 19:28:47 +01:00
Vladimír Čunát
5729457d50 Merge: remove poppler_0_18 from libreoffice 2014-03-09 11:43:11 +01:00
Bjørn Forsman
28e28acc36 gqrx: new package
Gqrx is a software defined radio receiver powered by GNU Radio and the Qt
GUI toolkit. It can process I/Q data from many types of input devices,
including Funcube Dongle Pro/Pro+, rtl-sdr, HackRF, and Universal
Software Radio Peripheral (USRP) devices.

http://gqrx.dk/
2014-03-08 21:46:13 +01:00
Bjørn Forsman
24d9bc576a gnuradio-osmosdr: new package
This is a Gnuradio block for OsmoSDR and rtl-sdr.

http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
2014-03-08 21:46:13 +01:00
Bjørn Forsman
f0af1e7512 rtl-sdr: new package
rtl-sdr turns your Realtek RTL2832 based DVB dongle into a SDR receiver.

http://sdr.osmocom.org/trac/wiki/rtl-sdr
2014-03-08 21:46:12 +01:00
Vladimír Čunát
73eead9f13 libreoffice: add deps needed now (libXdmcp, libpthreadstubs)
Configure phase passes now.
2014-03-08 21:25:30 +01:00
Michael Raskin
8dc61a6519 Update EKRHyper 2014-03-08 21:12:59 +04:00
Evgeny Egorochkin
5a92a3a296 cgit: update from 0.10 to 0.10.1 2014-03-08 18:24:16 +02:00
Evgeny Egorochkin
568f9e953f xterm: update from 301 to 303 2014-03-08 17:53:12 +02:00
Cillian de Róiste
dc80186449 synthv1: update from 0.3.6 to 0.4.0 2014-03-08 14:52:19 +01:00
Cillian de Róiste
c4651ec5df samplv1: update from 0.3.6 to 0.4.0 2014-03-08 14:52:19 +01:00
Cillian de Róiste
3093656cfb drumkv1: update from 0.3.6 to 0.4.0 2014-03-08 14:52:19 +01:00
Peter Simons
39175f5117 haskell-git-annex: update to version 5.20140306 2014-03-08 11:27:29 +01:00
James Cook
5d14048867 ImageMagick: update to 6.8.8-7
Fixes CVE-2014-{1947,1958,2030}.
2014-03-08 10:35:05 +01:00
Austin Seipp
c0f779ceee coq: add myself to maintainer list.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-07 20:52:33 -06:00
Austin Seipp
fa118fc677 coq: 8.4pl2 -> 8.4pl3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-07 20:52:26 -06:00
Austin Seipp
fb055c10f6 Make my packages slightly more consistent.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-07 20:27:02 -06:00
Bjørn Forsman
b0ec4b54e7 gnuradio: update 3.7.1 -> 3.7.2.1
I verified that gnuradio-companion (the GUI) still starts.
2014-03-07 23:59:36 +01:00
Bjørn Forsman
084ff142ad gnuradio: wrap example programs too
Without this the examples don't work. Example:

$ /nix/store/HASH-gnuradio-3.7.1/share/gnuradio/examples/uhd/usrp_am_mw_rcv.py
Traceback (most recent call last):
  File "/nix/store/HASH-gnuradio-3.7.1/share/gnuradio/examples/uhd/usrp_am_mw_rcv.py", line 24, in <module>
    from gnuradio import gr, eng_notation
ImportError: No module named gnuradio
2014-03-07 23:59:35 +01:00
Peter Simons
41e0214bb1 R: update to version 3.0.3 2014-03-07 22:51:39 +01:00
Domen Kožar
a73ab2f4cf Merge pull request #1893 from ttuegel/maintainer
Claim maintainership of recently added packages
2014-03-07 21:53:12 +01:00
José Romildo Malaquias
69a3372f3f Added hexchat 2014-03-07 21:52:36 +01:00
Thomas Tuegel
df5639183c Claim maintainership of recently added packages
Also set platforms for some packages where it was missing.
2014-03-07 11:23:30 -06:00
Shea Levy
d690e2ef7a Merge branch 'jitsi' of git://github.com/berdario/nixpkgs
Added jitsi
2014-03-07 10:51:41 -05:00
Dario Bertini
eb8cf5427e
Avoid using a global implicitly defined java binary 2014-03-07 16:43:01 +01:00
Domen Kožar
eb6a290f5e bittorrentSync: 1.2.82 -> 1.2.91 2014-03-07 15:12:45 +01:00
Song Wenwu
08fb4d6bc4 praat: set meta.platforms to linux 2014-03-07 15:06:44 +01:00
Song Wenwu
1d52f7bd68 praat: update from 5323 to 5365 2014-03-07 15:06:44 +01:00
Domen Kožar
0592916851 Merge pull request #1680 from Calrama/seafile
Add packages for libzdb, libsearpc, ccnet, seafile-shared, and seafile-c...
2014-03-07 13:51:17 +01:00
Domen Kožar
58accbc745 Merge pull request #1821 from AndersonTorres/master
8086tiny: new package
2014-03-07 13:18:12 +01:00
Domen Kožar
152f87cc47 Merge pull request #959 from wizeman/vimrc
vim: add config option to generate global vimrc
2014-03-07 12:56:15 +01:00
Domen Kožar
c616f319d3 Merge pull request #1860 from jagajaga/dwb_update
dwb: update version
2014-03-07 12:36:00 +01:00
Domen Kožar
2ff577e558 Merge pull request #1861 from ttuegel/pcmanfm
Add pcmanfm-1.2.0
2014-03-07 12:27:10 +01:00
Shea Levy
5dcb18610a Merge branch 'master' of git://github.com/esterlus/nixpkgs
added telegram-cli as instant-messenger application
2014-03-07 04:37:09 -05:00
Vladimír Čunát
be58c4f9e4 mupdf: fix CVE-2014-2013 by upstream patch 2014-03-06 21:21:03 +01:00
Vladimír Čunát
8f577c576c filezilla: use default gnutls instead of vulnerable gnutls2 2014-03-05 14:23:05 +01:00
Eelco Dolstra
48ce981d13 mercurial: Update to 2.9.1 2014-03-05 11:29:32 +01:00
Domen Kožar
402198de56 Merge pull request #1838 from pSub/calibre-update
calibre: upgrade from 1.23.0 to 1.25.0
2014-03-05 08:35:21 +01:00