Vladimír Čunát
b770365574
ReRevert Merge x-updates into master
...
This reverts commit ec3965d8d0
.
Conflicts (taken x-updates):
pkgs/development/libraries/libgcrypt/default.nix
pkgs/development/libraries/libgpg-error/default.nix
pkgs/development/libraries/poppler/default.nix
11 years ago
Vladimír Čunát
ec3965d8d0
Revert Merge x-updates into master due to mesa bloat
...
See #490 discussion.
This reverts commit 1278859d31
, reversing
changes made to 0c020c98f9
.
Conflicts:
pkgs/desktops/xfce/core/xfce4-session.nix (take master)
pkgs/lib/misc.nix (auto)
11 years ago
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
12 years ago
Eelco Dolstra
ab3eeabfed
Rename buildNativeInputs -> nativeBuildInputs
...
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
12 years ago
Florian Friesdorf
5436356733
a package does not need to include setuptools manually
...
this breaks for now
12 years ago
Cillian de Róiste
dd9d1b7cf9
#185 Fix calibre by adding setuptools as an input (thanks @chaoflow )
12 years ago
Eelco Dolstra
d9c0fc6a51
Fix Nixpkgs evaluation
...
http://hydra.nixos.org/build/3020333
12 years ago
Russell O'Connor
bc43657f1e
Updating calibre to 0.8.51
...
svn path=/nixpkgs/trunk/; revision=34075
12 years ago
Russell O'Connor
ff1fa88e3d
Adding pdftohtml to the PATH for calibre.
...
svn path=/nixpkgs/trunk/; revision=34074
12 years ago
Lluís Batlle i Rossell
7a4c5e084c
Updating calibre, and adding sourceforge as a backup url, suggested by roconnor.
...
svn path=/nixpkgs/trunk/; revision=33983
12 years ago
Lluís Batlle i Rossell
f5da2fe902
Updating calibre
...
svn path=/nixpkgs/trunk/; revision=33922
12 years ago
Eelco Dolstra
d4d7931a62
* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
13 years ago
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
13 years ago
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
13 years ago
Yury G. Kudryashov
471ebaf6f8
calibre-0.8.30
...
svn path=/nixpkgs/trunk/; revision=30900
13 years ago
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
13 years ago
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
13 years ago
Rob Vermaas
544cb2a0c9
updated calibre to 0.7.14
...
svn path=/nixpkgs/trunk/; revision=23268
14 years ago
Lluís Batlle i Rossell
d55ef92843
Updating calibre
...
svn path=/nixpkgs/trunk/; revision=22155
14 years ago
Yury G. Kudryashov
afe0368b9a
Bump to calibre-0.6.47
...
svn path=/nixpkgs/trunk/; revision=21013
14 years ago
Lluís Batlle i Rossell
54ccfcff2d
Updating calibre (now, with chm support)
...
svn path=/nixpkgs/trunk/; revision=20797
14 years ago
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
14 years ago
Lluís Batlle i Rossell
b7abafeedc
Adding a new python package to allow calibre preview the books
...
svn path=/nixpkgs/trunk/; revision=20292
15 years ago
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
15 years ago
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
15 years ago
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
15 years ago