public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge trunk

Browse Source 
svn path=/nixpkgs/branches/libpng15/; revision=29653
This commit is contained in:
Yury G. Kudryashov
2011-10-05 10:04:06 +00:00
parent e66134d1fc 1b87ef25db
commit cd0b867199
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/calibre/default.nix
+4 -4
View File
@@ -1,21 +1,21 @@
{ stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
, imagemagick, libjpeg, fontconfig, podofo, qt4 , imagemagick, libjpeg, fontconfig, podofo, qt4, icu
, pil, makeWrapper, unrar, chmlib, pythonPackages , pil, makeWrapper, unrar, chmlib, pythonPackages
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "calibre-0.7.14"; name = "calibre-0.8.21";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.gz"; url = "mirror://sourceforge/calibre/${name}.tar.gz";
sha256 = "07vnmxxpg77pmd7fhcrlnark02bn6zj62hbsybdqz8fp1yp99wkn"; sha256 = "173is8qlsm1gbsx5a411c2226kakwyv200wcw97yfs613k7cz256";
}; };
inherit python; inherit python;
buildInputs = buildInputs =
[ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick libjpeg [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick libjpeg
fontconfig podofo qt4 pil makeWrapper chmlib fontconfig podofo qt4 pil makeWrapper chmlib icu
pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
pythonPackages.cssutils pythonPackages.beautifulsoap pythonPackages.sqlite3 pythonPackages.cssutils pythonPackages.beautifulsoap pythonPackages.sqlite3
]; ];
pkgs/development/tools/documentation/haddock/2.9.3.nix → pkgs/development/tools/documentation/haddock/2.9.4.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "haddock"; pname = "haddock";
version = "2.9.3"; version = "2.9.4";
sha256 = "0r3yp5s7qv9hmwwfz8rxbwj39qpysgyg53ka4alaxnfma0a96iyj"; sha256 = "18w5pa1zpjy9mmdzjh0hs8jybmky8j87vzry54nni6a3517c5x86";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
buildDepends = [ ghcPaths xhtml ]; buildDepends = [ ghcPaths xhtml ];
pkgs/top-level/haskell-packages.nix
+1 -1
View File
@@ -1378,7 +1378,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix {}; haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix {};
haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {}; haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {};
haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {}; haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {};
haddock_2_9_3 = callPackage ../development/tools/documentation/haddock/2.9.3.nix {}; haddock_2_9_4 = callPackage ../development/tools/documentation/haddock/2.9.4.nix {};
haddock = self.haddock_2_7_2; haddock = self.haddock_2_7_2;
happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {}; happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {};