MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
27439 commits 244 branches 124 tags 6.1 GiB
Commit graph

23 commits

Author SHA1 Message Date
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