Author: urkud
Date: Sat Jan 7 22:43:23 2012
New Revision: 31430
URL: https://nixos.org/websvn/nix/?rev=31430&sc=1
Log:
svn merge ^/nixpkgs/trunk
Added:
nixpkgs/branches/libpng15/pkgs/applications/virtualization/qemu/0.15.nix
- copied unchanged from r31429,
nixpkgs/trunk/pkgs/applications/virtualization/qemu/0.15.nix
nixpkgs/branches/libpng15/pkgs/desktops/gnome-2/platform/libgnome-keyring/
- copied from r31429,
nixpkgs/trunk/pkgs/desktops/gnome-2/platform/libgnome-keyring/
nixpkgs/branches/libpng15/pkgs/development/libraries/libwpd/0.8.nix
- copied unchanged from r31429,
nixpkgs/trunk/pkgs/development/libraries/libwpd/0.8.nix
nixpkgs/branches/libpng15/pkgs/development/tools/misc/xxdiff/default.nix
- copied unchanged from r31429,
nixpkgs/trunk/pkgs/development/tools/misc/xxdiff/default.nix
Deleted:
nixpkgs/branches/libpng15/pkgs/development/libraries/libgphoto2/libgphoto2-2.2.1.patch
nixpkgs/branches/libpng15/pkgs/development/tools/misc/xxdiff/3.2.nix
Modified:
nixpkgs/branches/libpng15/ (props changed)
nixpkgs/branches/libpng15/pkgs/applications/graphics/fbida/default.nix
nixpkgs/branches/libpng15/pkgs/applications/graphics/kuickshow/builder.sh
nixpkgs/branches/libpng15/pkgs/applications/graphics/kuickshow/default.nix
nixpkgs/branches/libpng15/pkgs/applications/misc/gphoto2/default.nix
nixpkgs/branches/libpng15/pkgs/applications/misc/taskjuggler/default.nix
nixpkgs/branches/libpng15/pkgs/applications/misc/yate/default.nix
nixpkgs/branches/libpng15/pkgs/applications/networking/kphone/default.nix
nixpkgs/branches/libpng15/pkgs/applications/networking/p2p/valknut/default.nix
nixpkgs/branches/libpng15/pkgs/applications/networking/twinkle/default.nix
nixpkgs/branches/libpng15/pkgs/applications/science/misc/vite/default.nix
nixpkgs/branches/libpng15/pkgs/applications/video/mythtv/default.nix
nixpkgs/branches/libpng15/pkgs/desktops/gnome-2/default.nix
nixpkgs/branches/libpng15/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
nixpkgs/branches/libpng15/pkgs/desktops/kde-3/kdelibs/default.nix
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/support/akonadi/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/arts/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/atkmm/2.22.x.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/conduit/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/hakyll/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/libdbusmenu-qt/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/libgphoto2/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/mlt/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/pangomm/2.28.x.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/qt-3/default.nix
nixpkgs/branches/libpng15/pkgs/development/tools/documentation/doxygen/default.nix
nixpkgs/branches/libpng15/pkgs/games/orbit/default.nix
nixpkgs/branches/libpng15/pkgs/misc/drivers/hplip/default.nix
nixpkgs/branches/libpng15/pkgs/misc/uboot/nanonote.nix
nixpkgs/branches/libpng15/pkgs/os-specific/linux/fbterm/src-for-default.nix
nixpkgs/branches/libpng15/pkgs/os-specific/linux/fbterm/stdenv.nix
nixpkgs/branches/libpng15/pkgs/os-specific/linux/pam_usb/default.nix
nixpkgs/branches/libpng15/pkgs/os-specific/linux/pmount/default.nix
nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/libpng15/pkgs/applications/graphics/fbida/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/applications/graphics/fbida/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/applications/graphics/fbida/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -27,6 +27,10 @@
makeFlags = [ "prefix=$(out)" "verbose=yes" ];
+ crossAttrs = {
+ makeFlags = makeFlags ++ [ "CC=${stdenv.cross.config}-gcc" "STRIP="];
+ };
+
meta = {
description = "Image viewing and manipulation programs";
};
Modified:
nixpkgs/branches/libpng15/pkgs/applications/graphics/kuickshow/builder.sh
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/applications/graphics/kuickshow/builder.sh
Sat Jan 7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/applications/graphics/kuickshow/builder.sh
Sat Jan 7 22:43:23 2012 (r31430)
@@ -2,11 +2,9 @@
patchPhase=patchPhase
patchPhase() {
- sed -e "s@-ljpeg6b@-ljpeg@" configure > configure.patched
- mv configure.patched configure
- chmod u+x configure
+ sed -e "s@-ljpeg6b@-ljpeg@" -i configure
}
genericBuild
-ln -s $KDEDIR/share/mimelnk $out/share
\ No newline at end of file
+ln -sv $KDEDIR/share/mimelnk $out/share
Modified:
nixpkgs/branches/libpng15/pkgs/applications/graphics/kuickshow/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/applications/graphics/kuickshow/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/applications/graphics/kuickshow/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -1,23 +1,14 @@
-{stdenv, fetchurl, libX11, libXext, libSM, kdelibs, qt, libjpeg, libungif,
libpng, libtiff, imlib, arts, expat, perl}:
+{ stdenv, fetchurl, kdelibs, imlib, cmake, pkgconfig, gettext }:
-stdenv.mkDerivation {
- name = "kuickshow-0.8.5";
- builder = ./builder.sh;
+stdenv.mkDerivation rec {
+ name = "kuickshow-0.9.1";
src = fetchurl {
- url = mirror://sourceforge/kuickshow/kuickshow-0.8.5.tgz;
- md5 = "7a95852a0670b18859a1e6789b256ebd";
+ url = "http://hosti.leonde.de/~gis/${name}.tar.bz2";;
+ sha256 = "0l488a6p0ligbhv6p1lnx5k2d00x9bkkvms30winifa8rmisa9wl";
};
- configureFlags = "
- --with-imlib-config=${imlib}/bin
- --with-extra-includes=${libjpeg}/include
- --with-extra-libs=${libjpeg}/lib
- --x-includes=${libX11}/include
- --x-libraries=${libX11}/lib";
+ buildInputs = [ kdelibs imlib ];
- buildInputs = [kdelibs libX11 libXext libSM qt libjpeg libungif libpng
libtiff imlib arts expat perl];
- inherit libjpeg;
-
- KDEDIR = kdelibs;
+ buildNativeInputs = [ cmake gettext pkgconfig ];
}
Modified: nixpkgs/branches/libpng15/pkgs/applications/misc/gphoto2/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/applications/misc/gphoto2/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/applications/misc/gphoto2/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -3,18 +3,16 @@
}:
stdenv.mkDerivation rec {
- name = "gphoto2-2.4.5";
+ name = "gphoto2-2.4.11";
src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
- sha256 = "0bjbgz9n7ijf8167i1bm7q3pg366axgx5zydck13d2znhd30x069";
+ sha256 = "0ah42b7rnqh0z8bb96z7cdycxdh5k19h6lmfc02kdhrhqdr3q81y";
};
- buildInputs = [pkgconfig libgphoto2 libexif popt gettext libjpeg readline
libtool];
+ buildNativeInputs = [ pkgconfig gettext ];
+ buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ];
- # There is a bug in 2.4.0 configure.ac (in their m4 macroses)
- #patchPhase = "sed -e 's@_tmp=true@_tmp=false@' -i configure configure.ac";
-
meta = {
homepage = http://www.gphoto.org/;
};
Modified:
nixpkgs/branches/libpng15/pkgs/applications/misc/taskjuggler/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/applications/misc/taskjuggler/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/applications/misc/taskjuggler/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -1,5 +1,5 @@
{stdenv, fetchurl,
-zlib, libpng, libjpeg, perl, expat, qt,
+zlib, libpng, libjpeg, perl, expat, qt3,
libX11, libXext, libSM, libICE,
withKde, kdelibs, kdebase
}:
@@ -50,7 +50,7 @@
--without-arts --disable-docs
--x-includes=${libX11}/include
--x-libraries=${libX11}/lib
- --with-qt-dir=${qt}
+ --with-qt-dir=${qt3}
--with-kde-support=${if withKde then "yes" else "no"}
--with-ical-support=${if withKde then "yes" else "no"}
";
Modified: nixpkgs/branches/libpng15/pkgs/applications/misc/yate/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/applications/misc/yate/default.nix Sat Jan
7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/applications/misc/yate/default.nix Sat Jan
7 22:43:23 2012 (r31430)
@@ -1,4 +1,4 @@
-{ composableDerivation, fetchurl, lib, qt, openssl, autoconf, automake,
pkgconfig }:
+{ composableDerivation, fetchurl, lib, qt4, openssl, autoconf, automake,
pkgconfig }:
let inherit (composableDerivation) edf wwf; in
@@ -11,7 +11,7 @@
};
# TODO zaptel ? postgres ?
- buildInputs = [ qt openssl autoconf automake pkgconfig ];
+ buildInputs = [ qt4 openssl autoconf automake pkgconfig ];
# /dev/null is used when linking which is a impure path for the wrapper
preConfigure =
Modified:
nixpkgs/branches/libpng15/pkgs/applications/networking/kphone/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/applications/networking/kphone/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/applications/networking/kphone/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, qt, pkgconfig
+{ stdenv, fetchurl, autoconf, automake, libtool, qt3, pkgconfig
, openssl, libpng, alsaLib, libX11, libXext, libXt, libICE
, libSM }:
@@ -6,12 +6,12 @@
name = "kphone-1.2";
src = fetchurl {
- url =
mirror://sourceforge/kphone/files/KPhone%20SI/KPhoneSIv1.2/kphoneSI_1.2.tar.gz;
+ url = mirror://sourceforge/kphone/kphoneSI_1.2.tar.gz;
sha256 = "1q309n2gsdsa8d7ff2zwnyc69ngpnnj143dys90dnlmzr9ckhhg3";
};
buildInputs =
- [ autoconf automake libtool qt pkgconfig openssl libpng alsaLib
+ [ autoconf automake libtool qt3 pkgconfig openssl libpng alsaLib
libX11 libXext libXt libICE libSM
];
Modified:
nixpkgs/branches/libpng15/pkgs/applications/networking/p2p/valknut/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/applications/networking/p2p/valknut/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++
nixpkgs/branches/libpng15/pkgs/applications/networking/p2p/valknut/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, x11, libxml2, libjpeg, libpng, openssl, qt, dclib}:
+{stdenv, fetchurl, perl, x11, libxml2, libjpeg, libpng, openssl, qt3, dclib}:
stdenv.mkDerivation {
name = "valknut-0.3.7";
@@ -9,6 +9,6 @@
md5 = "848f9b3f25af15c3f1837133ac4b9415";
};
- buildInputs = [perl x11 libxml2 libjpeg libpng openssl qt dclib];
+ buildInputs = [perl x11 libxml2 libjpeg libpng openssl qt3 dclib];
inherit openssl;
}
Modified:
nixpkgs/branches/libpng15/pkgs/applications/networking/twinkle/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/applications/networking/twinkle/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/applications/networking/twinkle/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, commoncpp2, ccrtp, openssl, boost
-, libsndfile, libxml2, libjpeg, readline, qt, perl, file
+, libsndfile, libxml2, libjpeg, readline, qt3, perl, file
, alsaLib, speex, libzrtpcpp, xorg }:
stdenv.mkDerivation {
@@ -14,7 +14,7 @@
buildInputs =
[ pkgconfig commoncpp2 ccrtp openssl boost libsndfile
- libxml2 libjpeg readline qt perl file
+ libxml2 libjpeg readline qt3 perl file
# optional ? :
alsaLib
speex libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext
Modified:
nixpkgs/branches/libpng15/pkgs/applications/science/misc/vite/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/applications/science/misc/vite/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/applications/science/misc/vite/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -1,4 +1,4 @@
-{ fetchsvn, stdenv, cmake, qt, mesa }:
+{ fetchsvn, stdenv, cmake, qt4, mesa }:
# ViTE 1.1 has several bugs, so use the SVN version.
let
@@ -25,7 +25,7 @@
patches = [ ./larger-line-buffer.patch ];
- buildInputs = [ cmake qt mesa ];
+ buildInputs = [ cmake qt4 mesa ];
NIX_LDFLAGS = "-lGLU";
Modified: nixpkgs/branches/libpng15/pkgs/applications/video/mythtv/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/applications/video/mythtv/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/applications/video/mythtv/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -1,9 +1,11 @@
-{ stdenv, fetchurl, which, qt3, x11, xlibs
+a@{ stdenv, fetchurl, which, qt3, x11, xlibs
, lame, zlib, mesa, alsaLib
, freetype, perl
}:
-assert qt3.mysqlSupport;
+let
+ qt3 = a.qt3.override { mysqlSupport = true; };
+in
stdenv.mkDerivation {
name = "mythtv-0.21";
Copied:
nixpkgs/branches/libpng15/pkgs/applications/virtualization/qemu/0.15.nix (from
r31429, nixpkgs/trunk/pkgs/applications/virtualization/qemu/0.15.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/libpng15/pkgs/applications/virtualization/qemu/0.15.nix
Sat Jan 7 22:43:23 2012 (r31430, copy of r31429,
nixpkgs/trunk/pkgs/applications/virtualization/qemu/0.15.nix)
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, python, zlib, pkgconfig, glib, SDL, ncurses }:
+
+stdenv.mkDerivation rec {
+ name = "qemu-0.15.1";
+
+ src = fetchurl {
+ url = "http://wiki.qemu.org/download/${name}.tar.gz";;
+ sha256 = "1fmm7l7hm0vsmahp41pgvbl62hh833k802brn6hg8kcfkd6v21bp";
+ };
+
+ buildInputs = [ python zlib pkgconfig glib SDL ncurses ];
+
+ meta = {
+ description = "QEmu processor emulator";
+ license = "GPLv2+";
+ maintainers = with stdenv.lib.maintainers; [viric];
+ platforms = with stdenv.lib.platforms; linux;
+ };
+}
Modified: nixpkgs/branches/libpng15/pkgs/desktops/gnome-2/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/desktops/gnome-2/default.nix Sat Jan 7
21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/desktops/gnome-2/default.nix Sat Jan 7
22:43:23 2012 (r31430)
@@ -50,6 +50,8 @@
gnome_vfs_monikers = callPackage ./platform/gnome-vfs-monikers { };
+ libgnome_keyring = callPackage ./platform/libgnome-keyring { };
+
libgnome = callPackage ./platform/libgnome { };
libgnomeui = callPackage ./platform/libgnomeui { };
Modified:
nixpkgs/branches/libpng15/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++
nixpkgs/branches/libpng15/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -1,5 +1,5 @@
{ stdenv, fetchurl_gnome, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib
-, glib, fam, hal, cdparanoia, intltool, GConf, gnome_mime_data}:
+, glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }:
stdenv.mkDerivation rec {
name = src.pkgname;
@@ -12,9 +12,8 @@
buildInputs =
[ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam cdparanoia
- intltool gnome_mime_data
- ]
- ++ (if stdenv.isLinux then [hal] else []);
+ intltool gnome_mime_data avahi acl
+ ];
propagatedBuildInputs = [ GConf glib ];
}
Modified: nixpkgs/branches/libpng15/pkgs/desktops/kde-3/kdelibs/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/desktops/kde-3/kdelibs/default.nix Sat Jan
7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/desktops/kde-3/kdelibs/default.nix Sat Jan
7 22:43:23 2012 (r31430)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xlibs, zlib, perl, qt, openssl, pcre
+{ stdenv, fetchurl, xlibs, zlib, perl, qt3, openssl, pcre
, pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
, freetype, bzip2, cups, attr, acl
}:
@@ -22,10 +22,10 @@
./kdelibs-3.5.10-openssl_1.0.0.patch
];
- passthru = {inherit openssl libjpeg qt; inherit (xlibs) libX11;};
+ passthru = {inherit openssl libjpeg qt3; inherit (xlibs) libX11;};
buildInputs = [
- zlib perl qt openssl pcre pkgconfig libjpeg libpng libtiff libxml2
+ zlib perl qt3 openssl pcre pkgconfig libjpeg libpng libtiff libxml2
libxslt expat libtool freetype bzip2 cups
xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft
];
Modified:
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/support/akonadi/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/support/akonadi/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/support/akonadi/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4,
soprano }:
stdenv.mkDerivation rec {
- name = "akonadi-1.6.1";
+ name = "akonadi-1.6.90";
src = fetchurl {
url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
- sha256 = "0r8sw7m1pwqc7qkaczm0r8adqi1wvlhdp32gy3q5p5plq50xhgra";
+ sha256 = "0a35wkrrdk4k7kw1d4rvq4w4wwlmz9vk2nb4c2yibpn9rmc6ighn";
};
buildInputs = [ qt4 soprano libxslt boost ];
Modified: nixpkgs/branches/libpng15/pkgs/development/libraries/arts/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/libraries/arts/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/arts/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, pkgconfig, glib, kdelibs, libX11, libXext, zlib, libjpeg,
libpng, perl, qt}:
+{stdenv, fetchurl, pkgconfig, glib, kdelibs, libX11, libXext, zlib, libjpeg
+, libpng, perl, qt3}:
stdenv.mkDerivation {
name = "arts-1.5.10";
@@ -19,7 +20,10 @@
--enable-final
'';
- buildInputs = [pkgconfig glib kdelibs libX11 libXext zlib libjpeg libpng
perl qt];
+ buildNativeInputs = [ pkgconfig perl ];
+
+ buildInputs =
+ [glib kdelibs libX11 libXext zlib libjpeg libpng qt3];
meta = {
homepage = http://www.arts-project.org/;
Modified: nixpkgs/branches/libpng15/pkgs/development/libraries/atkmm/2.22.x.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/libraries/atkmm/2.22.x.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/atkmm/2.22.x.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, atk, glibmm, pkgconfig }:
+{ stdenv, fetchurl, atk, glibmm, pkgconfig, xz }:
stdenv.mkDerivation rec {
name = "atkmm-2.22.6";
@@ -8,6 +8,7 @@
sha256 = "1dmf72i7jv2a2gavjiah2722bf5qk3hb97hn5dasxqxr0r8jjx0a";
};
+ buildInputs = [ xz ];
propagatedBuildInputs = [ atk glibmm ];
buildNativeInputs = [ pkgconfig ];
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, xlibs, xz
+{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz
, jasper }:
stdenv.mkDerivation {
@@ -10,13 +10,13 @@
};
# !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
- buildInputs = [ xlibs.xlibs ];
+ buildInputs = [ libX11 ];
buildNativeInputs = [ pkgconfig xz ];
propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
- configureFlags = "--with-libjasper";
+ configureFlags = "--with-libjasper --with-x11";
postInstall = "rm -rf $out/share/gtk-doc";
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/conduit/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/conduit/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/conduit/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
- version = "0.0.1";
- sha256 = "1klbwiqic6qgvzsxgb9x4hrfn0d3y679ml4f2qjdgx6p33gsyzns";
+ version = "0.0.1.1";
+ sha256 = "1144l40x8xvr3dkkhbg33fnajn9ggavxqa094zan0bdqljh48ips";
buildDepends = [
liftedBase monadControl text transformers transformersBase
];
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/hakyll/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/hakyll/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/haskell/hakyll/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "hakyll";
- version = "3.2.3.2";
- sha256 = "0410gg8sdnw0iyhqrw1wfv9abbrv7r6awgvlhqds17vnrdxxk2w8";
+ version = "3.2.4.0";
+ sha256 = "1hyvvcq4hvbwz8zaswi8949sqzjkby6754b0y5zp2cpax2ykkbgx";
buildDepends = [
binary blazeHtml citeprocHs cryptohash hamlet mtl pandoc parsec
regexBase regexPcre snapCore snapServer tagsoup time
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/libdbusmenu-qt/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/libraries/libdbusmenu-qt/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++
nixpkgs/branches/libpng15/pkgs/development/libraries/libdbusmenu-qt/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -3,13 +3,15 @@
let
baseName = "libdbusmenu-qt";
v = "0.9.0";
+ homepage = "http://launchpad.net/${baseName}";;
+ name = "${baseName}-${v}";
in
-stdenv.mkDerivation rec {
- name = "${baseName}-${v}";
+stdenv.mkDerivation {
+ inherit name;
src = fetchurl {
- url =
"http://launchpad.net/${baseName}/trunk/${v}/+download/${name}.tar.bz2";;
+ url = "${homepage}/trunk/${v}/+download/${name}.tar.bz2";
sha256 = "0xdicb3fmwgbyhc6cpcmdkwysdg18m5rcqc3izpwv6brq4aq4787";
};
@@ -20,7 +22,7 @@
meta = with stdenv.lib; {
description = "Provides a Qt implementation of the DBusMenu spec";
- homepage = http://people.canonical.com/~agateau/dbusmenu/;
+ inherit homepage;
maintainers = [ maintainers.urkud ];
inherit (qt4.meta) platforms;
};
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/libgphoto2/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/libraries/libgphoto2/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/libgphoto2/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -1,17 +1,18 @@
{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}:
stdenv.mkDerivation rec {
- name = "libgphoto2-2.4.10.1";
+ name = "libgphoto2-2.4.11";
src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
- sha256 = "12m99hcak59ppq1ijnfsrcm09mdj102f1xjmz4myggwjdymwc3lq";
+ sha256 = "08y40mqy714cg0160lny13z9kyxm63m3ksg8hljy5pspxanbn5ji";
};
- buildInputs = [pkgconfig libtool libjpeg gettext];
+ buildNativeInputs = [ pkgconfig gettext ];
+ buildInputs = [ libtool libjpeg ];
# These are mentioned in the Requires line of libgphoto's pkg-config file.
- propagatedBuildInputs = [libusb libexif];
+ propagatedBuildInputs = [ libusb libexif ];
meta = {
homepage = http://www.gphoto.org/proj/libgphoto2/;
Copied: nixpkgs/branches/libpng15/pkgs/development/libraries/libwpd/0.8.nix
(from r31429, nixpkgs/trunk/pkgs/development/libraries/libwpd/0.8.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/libwpd/0.8.nix Sat Jan
7 22:43:23 2012 (r31430, copy of r31429,
nixpkgs/trunk/pkgs/development/libraries/libwpd/0.8.nix)
@@ -0,0 +1,14 @@
+{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, bzip2 }:
+
+stdenv.mkDerivation rec {
+ name = "libwpd-0.8.14";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/libwpd/${name}.tar.gz";
+ sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01";
+ };
+
+ buildInputs = [ glib libgsf libxml2 ];
+
+ buildNativeInputs = [ pkgconfig bzip2 ];
+}
Modified: nixpkgs/branches/libpng15/pkgs/development/libraries/mlt/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/libraries/mlt/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/mlt/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, SDL, qt, pkgconfig, ffmpeg, libdv, libxml2, libsamplerate,
+{stdenv, fetchurl, SDL, qt4, pkgconfig, ffmpeg, libdv, libxml2, libsamplerate,
libvorbis, sox}:
stdenv.mkDerivation {
@@ -9,7 +9,7 @@
sha256 = "1xcrrd3xbz9hmahgl7xf610cm97chwpxwgcajkd10mpcxbqs08i0";
};
- buildInputs = [ qt SDL ffmpeg libdv libxml2 libsamplerate libvorbis sox ];
+ buildInputs = [ qt4 SDL ffmpeg libdv libxml2 libsamplerate libvorbis sox ];
# Mostly taken from:
#
http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/pangomm/2.28.x.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/libraries/pangomm/2.28.x.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/pangomm/2.28.x.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }:
+{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng, xz }:
stdenv.mkDerivation rec {
name = "pangomm-2.28.4";
@@ -8,6 +8,7 @@
sha256 = "10kcdpg080m393f1vz0km41kd3483fkyabprm59gvjwklxkcp3bp";
};
+ buildInputs = [ xz];
buildNativeInputs = [ pkgconfig ];
propagatedBuildInputs = [ pango glibmm cairomm libpng ];
Modified: nixpkgs/branches/libpng15/pkgs/development/libraries/qt-3/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/libraries/qt-3/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/qt-3/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -5,7 +5,7 @@
, xineramaSupport ? true, libXinerama ? null
, cursorSupport ? true, libXcursor ? null
, threadSupport ? true
-, mysqlSupport ? true, mysql ? null
+, mysqlSupport ? false, mysql ? null
, openglSupport ? false, mesa ? null, libXmu ? null
, x11, xextproto, zlib, libjpeg, libpng, which
}:
Modified:
nixpkgs/branches/libpng15/pkgs/development/tools/documentation/doxygen/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/tools/documentation/doxygen/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++
nixpkgs/branches/libpng15/pkgs/development/tools/documentation/doxygen/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, flex, bison, qt }:
+{ stdenv, fetchurl, perl, flex, bison, qt4 }:
let
name = "doxygen-1.7.4";
@@ -15,18 +15,18 @@
buildInputs =
[ perl flex bison ]
- ++ stdenv.lib.optional (qt != null) qt;
+ ++ stdenv.lib.optional (qt4 != null) qt4;
prefixKey = "--prefix ";
configureFlags =
[ "--dot dot" ]
- ++ stdenv.lib.optional (qt != null) "--with-doxywizard";
+ ++ stdenv.lib.optional (qt4 != null) "--with-doxywizard";
- preConfigure = stdenv.lib.optionalString (qt != null)
+ preConfigure = stdenv.lib.optionalString (qt4 != null)
''
- echo "using QTDIR=${qt}..."
- export QTDIR=${qt}
+ echo "using QTDIR=${qt4}..."
+ export QTDIR=${qt4}
'';
makeFlags = "MAN1DIR=share/man/man1";
@@ -47,6 +47,6 @@
'';
maintainers = [stdenv.lib.maintainers.simons];
- platforms = if (qt != null) then stdenv.lib.platforms.linux else
stdenv.lib.platforms.unix;
+ platforms = if (qt4 != null) then stdenv.lib.platforms.linux else
stdenv.lib.platforms.unix;
};
}
Copied:
nixpkgs/branches/libpng15/pkgs/development/tools/misc/xxdiff/default.nix (from
r31429, nixpkgs/trunk/pkgs/development/tools/misc/xxdiff/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/libpng15/pkgs/development/tools/misc/xxdiff/default.nix
Sat Jan 7 22:43:23 2012 (r31430, copy of r31429,
nixpkgs/trunk/pkgs/development/tools/misc/xxdiff/default.nix)
@@ -0,0 +1,25 @@
+{ stdenv, fetchhg, qt4, flex, bison }:
+
+stdenv.mkDerivation {
+ name = "xxdiff-4.0-beta1-20110723";
+
+ src = fetchhg {
+ name = "xxdiff";
+ url = https://hg.furius.ca/public/xxdiff;
+ sha256 = "0ahx80vdf67vq9w0g66dx39y27gvz6v1aybqj9554n6vxvg1zk5n";
+ };
+
+ buildNativeInputs = [ flex bison qt4 ];
+
+ buildInputs = [ qt4 ];
+
+ QMAKE = "qmake";
+
+ configurePhase =
+ ''
+ cd src
+ make -f Makefile.bootstrap
+ '';
+
+ installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin";
+}
Modified: nixpkgs/branches/libpng15/pkgs/games/orbit/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/games/orbit/default.nix Sat Jan 7
21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/games/orbit/default.nix Sat Jan 7
22:43:23 2012 (r31430)
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, builderDefs, mesa, libXi, libXt, libXext, libX11
-, libXmu, freeglut, esound }:
+, libXmu, freeglut }:
with builderDefs;
let localDefs = builderDefs.passthru.function (rec {
@@ -9,7 +9,7 @@
url =
http://ftp.de.debian.org/debian/pool/main/s/space-orbit/space-orbit_1.01.orig.tar.gz;
};
- buildInputs = [mesa libXi libXt libXext libX11 libXmu freeglut
esound];
+ buildInputs = [mesa libXi libXt libXext libX11 libXmu freeglut];
configureFlags = [];
debianPatch =
fetchurl {
@@ -20,7 +20,7 @@
gunzip < ${debianPatch} | patch -Np1
cd src
sed -e 's@/usr/share/games/orbit/@'$out'/dump/@g' -i *.c
- sed -e '/DIR=/d' -i Makefile
+ sed -e '/DIR=/d; s/-lesd//; s/-DESD//;' -i Makefile
make
ensureDir $out/bin
cp -r .. $out/dump
Modified: nixpkgs/branches/libpng15/pkgs/misc/drivers/hplip/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/misc/drivers/hplip/default.nix Sat Jan
7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/misc/drivers/hplip/default.nix Sat Jan
7 22:43:23 2012 (r31430)
@@ -1,5 +1,5 @@
{stdenv, fetchurl, cups, zlib, libjpeg, libusb, python, saneBackends, dbus
-, pkgconfig, polkit, qtSupport ? false, qt4
+, pkgconfig, polkit, qtSupport ? true, qt4
}:
stdenv.mkDerivation rec {
Modified: nixpkgs/branches/libpng15/pkgs/misc/uboot/nanonote.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/misc/uboot/nanonote.nix Sat Jan 7
21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/misc/uboot/nanonote.nix Sat Jan 7
22:43:23 2012 (r31430)
@@ -26,6 +26,8 @@
done
chmod +w -R *
sed -i -e 's/console=ttyS0,57600n8//' include/configs/qi_lb60.h
+ # Load more than 2MiB for the kernel
+ sed -i -e 's/0x200000;bootm/0x400000;bootm/' include/configs/qi_lb60.h
'';
# Remove the cross compiler prefix, and add reiserfs support
Modified:
nixpkgs/branches/libpng15/pkgs/os-specific/linux/fbterm/src-for-default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/os-specific/linux/fbterm/src-for-default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/os-specific/linux/fbterm/src-for-default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -1,9 +1,9 @@
rec {
- version="1.5";
- name="fbterm-1.5";
- hash="05qzc6g9a79has3cy7dlw70n4pn13r552a2i1g4xy23acnpvvjsb";
+ version="1.7";
+ name="fbterm-1.7";
+ hash="19qjb2zb4gwr1jlybmalaw3y3zybvc8vliwj85dfabmill1k1afh";
url="http://fbterm.googlecode.com/files/fbterm-${version}.tar.gz";;
- advertisedUrl="http://fbterm.googlecode.com/files/fbterm-1.5.tar.gz";;
+ advertisedUrl="http://fbterm.googlecode.com/files/fbterm-1.7.tar.gz";;
}
Modified: nixpkgs/branches/libpng15/pkgs/os-specific/linux/fbterm/stdenv.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/os-specific/linux/fbterm/stdenv.nix Sat Jan
7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/os-specific/linux/fbterm/stdenv.nix Sat Jan
7 22:43:23 2012 (r31430)
@@ -3,9 +3,9 @@
{ stdenv, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses }:
let
- version="1.5";
- name="fbterm-1.5";
- hash="05qzc6g9a79has3cy7dlw70n4pn13r552a2i1g4xy23acnpvvjsb";
+ version="1.7";
+ name="fbterm-1.7";
+ hash="19qjb2zb4gwr1jlybmalaw3y3zybvc8vliwj85dfabmill1k1afh";
url="http://fbterm.googlecode.com/files/fbterm-${version}.tar.gz";;
in
@@ -20,7 +20,7 @@
buildNativeInputs = [ ncurses ];
buildInputs = [ gpm freetype fontconfig pkgconfig ];
- patchPhase = ''
+ preConfigure = ''
sed -e '/ifdef SYS_signalfd/atypedef long long loff_t;' -i src/fbterm.cpp
sed -e '/install-exec-hook:/,/^[^\t]/{d}; /.NOEXPORT/iinstall-exec-hook:\
Modified: nixpkgs/branches/libpng15/pkgs/os-specific/linux/pam_usb/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/os-specific/linux/pam_usb/default.nix
Sat Jan 7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/os-specific/linux/pam_usb/default.nix
Sat Jan 7 22:43:23 2012 (r31430)
@@ -5,12 +5,12 @@
pumountBin = useSetUID pmount "/bin/pumount";
in
-stdenv.mkDerivation {
- name = "pam_usb-0.4.2";
+stdenv.mkDerivation rec {
+ name = "pam_usb-0.5.0";
src = fetchurl {
- url =
mirror://sourceforge/pamusb/pam_usb/pam_usb-0.4.2/pam_usb-0.4.2.tar.gz;
- sha256 =
"736afced7482c7c5d47127285f7defe0a304a6136a0090588fa8698d385ba202";
+ url = "mirror://sourceforge/pamusb/${name}.tar.gz";
+ sha256 = "1g1w0s9d8mfld8abrn405ll5grv3xgs0b0hsganrz6qafdq9j7q1";
};
buildInputs = [
Modified: nixpkgs/branches/libpng15/pkgs/os-specific/linux/pmount/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/os-specific/linux/pmount/default.nix Sat Jan
7 21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/os-specific/linux/pmount/default.nix Sat Jan
7 22:43:23 2012 (r31430)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cryptsetup, dbus, dbus_glib, hal, intltool, ntfs3g,
utillinuxng
+{stdenv, fetchurl, cryptsetup, dbus, dbus_glib, intltool, ntfs3g, utillinuxng
, mediaDir ? "/media/"
, lockDir ? "/var/lock/pmount"
, whiteList ? "/etc/pmount.allow"
@@ -15,7 +15,7 @@
sha256 =
"db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036";
};
- buildInputs = [ hal intltool utillinuxng ];
+ buildInputs = [ intltool utillinuxng ];
configureFlags = ""
+ " --with-media-dir=${mediaDir}"
@@ -23,9 +23,7 @@
+ " --with-whitelist=${whiteList}"
+ " --with-mount-prog=${utillinuxng}/bin/mount"
+ " --with-umount-prog=${utillinuxng}/bin/umount"
- + " --with-cryptsetup=${cryptsetup}/sbin/cryptsetup"
- + " --with-mount-ntfs3g=${ntfs3g}/sbin/mount.ntfs-3g"
- + " --enable-hal";
+ + " --with-mount-ntfs3g=${ntfs3g}/sbin/mount.ntfs-3g";
postConfigure = ''
# etc/Mafile.am is hardcoded and it does not respect the --prefix option.
Modified: nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Sat Jan 7
21:59:16 2012 (r31429)
+++ nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Sat Jan 7
22:43:23 2012 (r31430)
@@ -2901,13 +2901,9 @@
inherit python pil makeWrapper;
};
- doxygen = lowPrio (callPackage ../development/tools/documentation/doxygen {
- qt = null;
- });
+ doxygen = lowPrio (doxygen_gui.override { qt4 = null; });
- doxygen_gui = doxygen.override {
- qt = qt4;
- };
+ doxygen_gui = callPackage ../development/tools/documentation/doxygen { };
eggdbus = callPackage ../development/tools/misc/eggdbus { };
@@ -3095,11 +3091,7 @@
valkyrie = callPackage ../development/tools/analysis/valkyrie { };
- xxdiff = builderDefsPackage (import
../development/tools/misc/xxdiff/3.2.nix) {
- qt = qt3;
- inherit pkgconfig makeWrapper bison python flex;
- inherit (xlibs) libXext libX11;
- };
+ xxdiff = callPackage ../development/tools/misc/xxdiff { };
yacc = bison;
@@ -4162,6 +4154,10 @@
inherit (gnome) glib;
};
+ libwpd_08 = callPackage ../development/libraries/libwpd/0.8.nix {
+ inherit (gnome) glib;
+ };
+
libwpg = callPackage ../development/libraries/libwpg { };
libx86 = builderDefsPackage ../development/libraries/libx86 {};
@@ -4256,9 +4252,7 @@
mkvtoolnix = callPackage ../applications/video/mkvtoolnix { };
- mlt = callPackage ../development/libraries/mlt {
- qt = qt4;
- };
+ mlt = callPackage ../development/libraries/mlt { };
libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
@@ -4394,7 +4388,7 @@
phonon_backend_gstreamer = callPackage
../development/libraries/phonon-backend-gstreamer { };
- phonon_backend_vlc = newScope pkgs.kde4
../development/libraries/phonon-backend-vlc { };
+ phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc
{ };
physfs = callPackage ../development/libraries/physfs { };
@@ -4447,11 +4441,6 @@
qt3 = callPackage ../development/libraries/qt-3 {
openglSupport = mesaSupported;
- mysqlSupport = getConfig ["qt" "mysql"] false;
- };
-
- qt3mysql = qt3.override {
- mysqlSupport = true;
};
qt4 = pkgs.kde4.qt4;
@@ -7157,9 +7146,7 @@
mupdf = callPackage ../applications/misc/mupdf {
};
- mythtv = callPackage ../applications/video/mythtv {
- qt3 = qt3mysql;
- };
+ mythtv = callPackage ../applications/video/mythtv { };
nano = callPackage ../applications/editors/nano { };
@@ -7197,6 +7184,7 @@
inherit (perlPackages) ArchiveZip CompressZlib;
inherit (gnome) GConf ORBit2;
neon = neon029;
+ libwpd = libwpd_08;
};
go_oo = callPackage ../applications/office/openoffice/go-oo.nix {
@@ -7274,7 +7262,9 @@
pythonmagick = callPackage ../applications/graphics/PythonMagick { };
- qemu = callPackage ../applications/virtualization/qemu/0.13.nix { };
+ qemu = callPackage ../applications/virtualization/qemu/0.15.nix { };
+
+ qemu_0_13 = callPackage ../applications/virtualization/qemu/0.13.nix { };
qemuSVN = callPackage ../applications/virtualization/qemu/svn-6642.nix { };
@@ -7439,8 +7429,6 @@
teamspeak_client = callPackage
../applications/networking/instant-messengers/teamspeak/client.nix { };
taskjuggler = callPackage ../applications/misc/taskjuggler {
- qt = qt3;
-
# KDE support is not working yet.
inherit (kde3) kdelibs kdebase;
withKde = getConfig [ "taskJuggler" "kde" ] false;
@@ -7479,7 +7467,6 @@
tribler = callPackage ../applications/networking/p2p/tribler { };
twinkle = callPackage ../applications/networking/twinkle {
- qt = qt3;
boost = boostFull;
ccrtp = ccrtp_1_8;
libzrtpcpp = libzrtpcpp_1_6;
@@ -7501,9 +7488,7 @@
inherit (gnome) glib_networking libsoup;
};
- valknut = callPackage ../applications/networking/p2p/valknut {
- qt = qt3;
- };
+ valknut = callPackage ../applications/networking/p2p/valknut { };
vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
@@ -7705,9 +7690,7 @@
inherit (gnome) scrollkeeper libglade;
};
- yate = callPackage ../applications/misc/yate {
- qt = qt4;
- };
+ yate = callPackage ../applications/misc/yate { };
qgis = callPackage ../applications/misc/qgis {};
@@ -7891,8 +7874,7 @@
soi = callPackage ../games/soi {};
# You still can override by passing more arguments.
- spaceOrbit = callPackage ../games/orbit {
- inherit (gnome) esound; };
+ spaceOrbit = callPackage ../games/orbit { };
spring = callPackage ../games/spring { };
@@ -8014,13 +7996,10 @@
kdelibs = callPackage ../desktops/kde-3/kdelibs {
stdenv = overrideGCC stdenv gcc43;
- qt = qt3;
};
arts = callPackage ../development/libraries/arts {
- qt = qt3;
- inherit (gnome) glib;
- inherit (kde3) kdelibs;
+ inherit (pkgs.kde3) kdelibs;
};
k3b = callPackage ../applications/misc/k3b/1.0.nix {
@@ -8033,15 +8012,9 @@
};
kphone = callPackage ../applications/networking/kphone {
- qt = qt3;
stdenv = overrideGCC stdenv gcc42; # I'm to lazy to clean up header files
};
- kuickshow = callPackage ../applications/graphics/kuickshow {
- inherit (kde3) arts kdelibs;
- qt = qt3;
- };
-
};
kde4 = recurseIntoAttrs pkgs.kde47;
@@ -8120,6 +8093,8 @@
ktorrent = callPackage ../applications/networking/p2p/ktorrent { };
+ kuickshow = callPackage ../applications/graphics/kuickshow { };
+
libktorrent = callPackage ../development/libraries/libktorrent { };
libkvkontakte = callPackage ../development/libraries/libkvkontakte { };
@@ -8357,9 +8332,7 @@
tulip = callPackage ../applications/science/misc/tulip { };
- vite = callPackage ../applications/science/misc/vite {
- qt = qt4;
- };
+ vite = callPackage ../applications/science/misc/vite { };
### MISC
@@ -8436,9 +8409,7 @@
gxemul = callPackage ../misc/gxemul { };
- hplip = callPackage ../misc/drivers/hplip {
- qtSupport = true;
- };
+ hplip = callPackage ../misc/drivers/hplip { };
# using the new configuration style proposal which is unstable
jack1d = callPackage ../misc/jackaudio/jack1.nix { };
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
