diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index ea7cb81a48e..7f29b43e0e1 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" "verbose=yes" ]; + crossAttrs = { + makeFlags = makeFlags ++ [ "CC=${stdenv.cross.config}-gcc" "STRIP="]; + }; + meta = { description = "Image viewing and manipulation programs"; }; diff --git a/pkgs/applications/graphics/kuickshow/builder.sh b/pkgs/applications/graphics/kuickshow/builder.sh index e2e0659ae34..2283e956f7b 100644 --- a/pkgs/applications/graphics/kuickshow/builder.sh +++ b/pkgs/applications/graphics/kuickshow/builder.sh @@ -2,11 +2,9 @@ source $stdenv/setup 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 diff --git a/pkgs/applications/graphics/kuickshow/default.nix b/pkgs/applications/graphics/kuickshow/default.nix index fde29735b71..b26ac12300b 100644 --- a/pkgs/applications/graphics/kuickshow/default.nix +++ b/pkgs/applications/graphics/kuickshow/default.nix @@ -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 ]; } diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index a881ef2e272..9fff2943d30 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -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/; }; diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix index 25cdd1f1646..652450e510b 100644 --- a/pkgs/applications/misc/taskjuggler/default.nix +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -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 @@ stdenv.mkDerivation rec { --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"} "; diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix index 2994ca19065..b2f4217afb5 100644 --- a/pkgs/applications/misc/yate/default.nix +++ b/pkgs/applications/misc/yate/default.nix @@ -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 @@ composableDerivation.composableDerivation {} ( fixed : { }; # 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 = diff --git a/pkgs/applications/networking/kphone/default.nix b/pkgs/applications/networking/kphone/default.nix index 7b1c7c76dd8..dceb24a48b8 100644 --- a/pkgs/applications/networking/kphone/default.nix +++ b/pkgs/applications/networking/kphone/default.nix @@ -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 @@ stdenv.mkDerivation { 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 ]; diff --git a/pkgs/applications/networking/p2p/valknut/default.nix b/pkgs/applications/networking/p2p/valknut/default.nix index 994f6b44f94..2290cf52314 100644 --- a/pkgs/applications/networking/p2p/valknut/default.nix +++ b/pkgs/applications/networking/p2p/valknut/default.nix @@ -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 @@ stdenv.mkDerivation { md5 = "848f9b3f25af15c3f1837133ac4b9415"; }; - buildInputs = [perl x11 libxml2 libjpeg libpng openssl qt dclib]; + buildInputs = [perl x11 libxml2 libjpeg libpng openssl qt3 dclib]; inherit openssl; } diff --git a/pkgs/applications/networking/twinkle/default.nix b/pkgs/applications/networking/twinkle/default.nix index 905f7efc43a..0824210c4b5 100644 --- a/pkgs/applications/networking/twinkle/default.nix +++ b/pkgs/applications/networking/twinkle/default.nix @@ -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 @@ stdenv.mkDerivation { 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 diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 24060c277fd..4c1cf318b5a 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -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 @@ stdenv.mkDerivation { patches = [ ./larger-line-buffer.patch ]; - buildInputs = [ cmake qt mesa ]; + buildInputs = [ cmake qt4 mesa ]; NIX_LDFLAGS = "-lGLU"; diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 6ca6651c571..821c37d9c51 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -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"; diff --git a/pkgs/applications/virtualization/qemu/0.15.nix b/pkgs/applications/virtualization/qemu/0.15.nix new file mode 100644 index 00000000000..f75b2129243 --- /dev/null +++ b/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; + }; +} diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 814b054f74e..a10b605076d 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -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 { }; diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index c141da4324d..0215b341f93 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -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 @@ stdenv.mkDerivation rec { 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 ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnome-keyring/default.nix b/pkgs/desktops/gnome-2/platform/libgnome-keyring/default.nix new file mode 100644 index 00000000000..f937ce26018 --- /dev/null +++ b/pkgs/desktops/gnome-2/platform/libgnome-keyring/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, xz, +intltool }: + +stdenv.mkDerivation { + name = "libgnome-keyring-2.32.0"; + + src = fetchurl { + url = mirror://gnome/sources/libgnome-keyring/2.32/libgnome-keyring-2.32.0.tar.bz2; + sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n"; + }; + + propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; + buildNativeInputs = [ pkgconfig xz intltool ]; + + meta = { + inherit (glib.meta) platforms maintainers; + }; +} diff --git a/pkgs/desktops/kde-3/kdelibs/default.nix b/pkgs/desktops/kde-3/kdelibs/default.nix index 69c6c5c332e..0f3494c0581 100644 --- a/pkgs/desktops/kde-3/kdelibs/default.nix +++ b/pkgs/desktops/kde-3/kdelibs/default.nix @@ -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 @@ stdenv.mkDerivation { ./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 ]; diff --git a/pkgs/desktops/kde-4.8/support/akonadi/default.nix b/pkgs/desktops/kde-4.8/support/akonadi/default.nix index 38ec7f85907..434a1446369 100644 --- a/pkgs/desktops/kde-4.8/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.8/support/akonadi/default.nix @@ -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 ]; diff --git a/pkgs/development/libraries/arts/default.nix b/pkgs/development/libraries/arts/default.nix index d895724f691..50c270f534e 100644 --- a/pkgs/development/libraries/arts/default.nix +++ b/pkgs/development/libraries/arts/default.nix @@ -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 @@ stdenv.mkDerivation { --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/; diff --git a/pkgs/development/libraries/atkmm/2.22.x.nix b/pkgs/development/libraries/atkmm/2.22.x.nix index 66237c4c7b9..2d415821fc5 100644 --- a/pkgs/development/libraries/atkmm/2.22.x.nix +++ b/pkgs/development/libraries/atkmm/2.22.x.nix @@ -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 @@ stdenv.mkDerivation rec { sha256 = "1dmf72i7jv2a2gavjiah2722bf5qk3hb97hn5dasxqxr0r8jjx0a"; }; + buildInputs = [ xz ]; propagatedBuildInputs = [ atk glibmm ]; buildNativeInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix index 596e645c686..eb7eaf91bb0 100644 --- a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix +++ b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix @@ -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 @@ stdenv.mkDerivation { }; # !!! 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"; diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index f7dd889c673..fa210279ec0 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -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 ]; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 9035c606ed8..5f506021c14 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -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 diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index 4c12880f557..aeb9331c8ad 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -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 @@ stdenv.mkDerivation rec { 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; }; diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 7ea9eb4db87..16001e689dd 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -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/; diff --git a/pkgs/development/libraries/libgphoto2/libgphoto2-2.2.1.patch b/pkgs/development/libraries/libgphoto2/libgphoto2-2.2.1.patch deleted file mode 100644 index 8d39d663719..00000000000 --- a/pkgs/development/libraries/libgphoto2/libgphoto2-2.2.1.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ruN libgphoto2-2.2.1/packaging/generic/print-camera-list.c libgphoto2-2.2.1.new/packaging/generic/print-camera-list.c ---- libgphoto2-2.2.1/packaging/generic/print-camera-list.c 2006-04-19 03:54:05.000000000 +0200 -+++ libgphoto2-2.2.1.new/packaging/generic/print-camera-list.c 2006-07-06 22:54:42.000000000 +0200 -@@ -48,8 +48,8 @@ - #include - #include - --#include --#include -+#include -+#include - - #ifndef TRUE - #define TRUE (0==0) diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix new file mode 100644 index 00000000000..504bddb777a --- /dev/null +++ b/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 ]; +} diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 13f0a69950c..384c31a7cd4 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -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 @@ stdenv.mkDerivation { 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 diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix index 5cd4744fed3..c004b7160f2 100644 --- a/pkgs/development/libraries/pangomm/2.28.x.nix +++ b/pkgs/development/libraries/pangomm/2.28.x.nix @@ -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 @@ stdenv.mkDerivation rec { sha256 = "10kcdpg080m393f1vz0km41kd3483fkyabprm59gvjwklxkcp3bp"; }; + buildInputs = [ xz]; buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ pango glibmm cairomm libpng ]; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 64b984c3f3a..e023235b936 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -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 }: diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index df51c51bde1..86f2e8cf2b2 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -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 @@ stdenv.mkDerivation { 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 @@ stdenv.mkDerivation { ''; 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; }; } diff --git a/pkgs/development/tools/misc/xxdiff/3.2.nix b/pkgs/development/tools/misc/xxdiff/3.2.nix deleted file mode 100644 index ddaa8e6849b..00000000000 --- a/pkgs/development/tools/misc/xxdiff/3.2.nix +++ /dev/null @@ -1,42 +0,0 @@ -args : with args; -rec { - src = fetchurl { - url = http://downloads.sourceforge.net/xxdiff/xxdiff-3.2.tar.bz2; - sha256 = "1f5j9l9n5j2ab0h3iwaz0mnz0y8h7ilc0dbcrfmaibk2njx38mcn"; - }; - - buildInputs = [qt flex bison python pkgconfig makeWrapper - libX11 libXext]; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = ["prepareMainBuild" "fixInc" - "deploy" - "installPythonPackage" - (makeManyWrappers - ''$out/bin/*'' - ''--prefix PYTHONPATH : $(toPythonPath $out):$PYTHONPATH'') - ]; - - prepareMainBuild = fullDepEntry ('' - cd src - export QTDIR=${qt}/ - make -f Makefile.bootstrap makefile - '') ["minInit" "doUnpack"]; - - fixInc = fullDepEntry('' - sed -e '1i\#include ' -i resources.inline.h - '') ["minInit" "doUnpack"]; - - deploy = fullDepEntry ('' - ensureDir $out/bin/ - cp ../bin/xxdiff $out/bin - cd .. - '') ["minInit" "doMake" "defEnsureDir" "addInputs"]; - - name = "xxdiff-3.2"; - meta = { - description = "Interactive merge tool"; - homepage = http://furius.ca/xxdiff/; - }; -} diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix new file mode 100644 index 00000000000..f4847e1b42d --- /dev/null +++ b/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"; +} diff --git a/pkgs/games/orbit/default.nix b/pkgs/games/orbit/default.nix index f2e12f22912..65e394f60bb 100644 --- a/pkgs/games/orbit/default.nix +++ b/pkgs/games/orbit/default.nix @@ -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 @@ with builderDefs; 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 @@ with builderDefs; 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 diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index e73e6ff05fe..514655bd727 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -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 { diff --git a/pkgs/misc/uboot/nanonote.nix b/pkgs/misc/uboot/nanonote.nix index ff7c7742265..ad8237bc8e4 100644 --- a/pkgs/misc/uboot/nanonote.nix +++ b/pkgs/misc/uboot/nanonote.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation { 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 diff --git a/pkgs/os-specific/linux/fbterm/src-for-default.nix b/pkgs/os-specific/linux/fbterm/src-for-default.nix index 39aaa2ca626..6705404ac9f 100644 --- a/pkgs/os-specific/linux/fbterm/src-for-default.nix +++ b/pkgs/os-specific/linux/fbterm/src-for-default.nix @@ -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"; } diff --git a/pkgs/os-specific/linux/fbterm/stdenv.nix b/pkgs/os-specific/linux/fbterm/stdenv.nix index 893dba11b60..e257a7d46eb 100644 --- a/pkgs/os-specific/linux/fbterm/stdenv.nix +++ b/pkgs/os-specific/linux/fbterm/stdenv.nix @@ -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 @@ stdenv.mkDerivation { 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:\ diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index 05137acc043..d26617d8e66 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -5,12 +5,12 @@ let 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 = [ diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index 8f814c7212a..9366c2cf95f 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -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 @@ stdenv.mkDerivation rec { sha256 = "db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036"; }; - buildInputs = [ hal intltool utillinuxng ]; + buildInputs = [ intltool utillinuxng ]; configureFlags = "" + " --with-media-dir=${mediaDir}" @@ -23,9 +23,7 @@ stdenv.mkDerivation rec { + " --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. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2da9fe27df..3164ea8984d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2901,13 +2901,9 @@ let 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 @@ let 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 @@ let 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 @@ let 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 @@ let 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 @@ let 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 @@ let 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 @@ let 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 @@ let 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 @@ let 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 @@ let 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 @@ let 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 @@ let 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 @@ let 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 @@ let 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 @@ let }; 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 @@ let 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 @@ let 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 @@ let 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 { };