Author: urkud
Date: Wed Oct 5 10:04:06 2011
New Revision: 29653
URL: https://ssl.nixos.org/websvn/nix/?rev=29653&sc=1
Log:
svn merge trunk
Added:
nixpkgs/branches/libpng15/pkgs/development/tools/documentation/haddock/2.9.4.nix
- copied unchanged from r29652,
nixpkgs/trunk/pkgs/development/tools/documentation/haddock/2.9.4.nix
Deleted:
nixpkgs/branches/libpng15/pkgs/development/tools/documentation/haddock/2.9.3.nix
Modified:
nixpkgs/branches/libpng15/ (props changed)
nixpkgs/branches/libpng15/pkgs/applications/graphics/xscreensaver/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/applications/misc/calibre/default.nix
nixpkgs/branches/libpng15/pkgs/applications/misc/xneur/0.8.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/applications/networking/browsers/icecat-4/
(props changed)
nixpkgs/branches/libpng15/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
(props changed)
nixpkgs/branches/libpng15/pkgs/build-support/gcc-wrapper/ (props changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/debian-build.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/nix-build.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/rpm-build.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/source-tarball.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/
(props changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.10.1.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.10.2.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.8.2.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.8.3.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/aterm/2.8.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/fltk/fltk11.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/glibc-2.9/ (props
changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/goocanvas/ (props
changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/pcre/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/readline/readline6.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/tools/misc/autoconf/2.13.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/tools/misc/gnum4/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/misc/tex/pgf/1.x.nix (props changed)
nixpkgs/branches/libpng15/pkgs/misc/tex/pgf/2.x.nix (props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/atheros/r3867.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/generic.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.25.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.28.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.29.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.33.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/qemu-kvm/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/util-linux-ng/ (props
changed)
nixpkgs/branches/libpng15/pkgs/servers/mail/dovecot/1.1.1.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/shells/bash/4.1.nix (props changed)
nixpkgs/branches/libpng15/pkgs/shells/bash/4.2.nix (props changed)
nixpkgs/branches/libpng15/pkgs/stdenv/generic/setup.sh (props changed)
nixpkgs/branches/libpng15/pkgs/stdenv/linux/make-bootstrap-tools.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/tools/networking/wget/default.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/branches/libpng15/pkgs/applications/misc/calibre/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/applications/misc/calibre/default.nix
Wed Oct 5 08:13:16 2011 (r29652)
+++ nixpkgs/branches/libpng15/pkgs/applications/misc/calibre/default.nix
Wed Oct 5 10:04:06 2011 (r29653)
@@ -1,21 +1,21 @@
{ stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
-, imagemagick, libjpeg, fontconfig, podofo, qt4
+, imagemagick, libjpeg, fontconfig, podofo, qt4, icu
, pil, makeWrapper, unrar, chmlib, pythonPackages
}:
stdenv.mkDerivation rec {
- name = "calibre-0.7.14";
+ name = "calibre-0.8.21";
src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.gz";
- sha256 = "07vnmxxpg77pmd7fhcrlnark02bn6zj62hbsybdqz8fp1yp99wkn";
+ sha256 = "173is8qlsm1gbsx5a411c2226kakwyv200wcw97yfs613k7cz256";
};
inherit python;
buildInputs =
[ 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.cssutils pythonPackages.beautifulsoap
pythonPackages.sqlite3
];
Copied:
nixpkgs/branches/libpng15/pkgs/development/tools/documentation/haddock/2.9.4.nix
(from r29652,
nixpkgs/trunk/pkgs/development/tools/documentation/haddock/2.9.4.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/libpng15/pkgs/development/tools/documentation/haddock/2.9.4.nix
Wed Oct 5 10:04:06 2011 (r29653, copy of r29652,
nixpkgs/trunk/pkgs/development/tools/documentation/haddock/2.9.4.nix)
@@ -0,0 +1,21 @@
+{ cabal, alex, ghcPaths, happy, xhtml }:
+
+cabal.mkDerivation (self: {
+ pname = "haddock";
+ version = "2.9.4";
+ sha256 = "18w5pa1zpjy9mmdzjh0hs8jybmky8j87vzry54nni6a3517c5x86";
+ isLibrary = true;
+ isExecutable = true;
+ buildDepends = [ ghcPaths xhtml ];
+ buildTools = [ alex happy ];
+ meta = {
+ homepage = "http://www.haskell.org/haddock/";;
+ description = "A documentation-generation tool for Haskell libraries";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [
+ self.stdenv.lib.maintainers.andres
+ self.stdenv.lib.maintainers.simons
+ ];
+ };
+})
Modified: nixpkgs/branches/libpng15/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/top-level/haskell-packages.nix Wed Oct
5 08:13:16 2011 (r29652)
+++ nixpkgs/branches/libpng15/pkgs/top-level/haskell-packages.nix Wed Oct
5 10:04:06 2011 (r29653)
@@ -1378,7 +1378,7 @@
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_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;
happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
