From d4d7931a6296cd72d3d5f360d628be86bb62246b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Wed, 18 Jan 2012 20:53:01 +0000 Subject: [PATCH] =?UTF-8?q?*=20Cleanup:=20remove=20obsolete=20references?= =?UTF-8?q?=20to=20=E2=80=98xz=E2=80=99,=20which=20is=20in=20stdenv=20now.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/nixpkgs/branches/stdenv-updates/; revision=31678 --- pkgs/applications/graphics/ImageMagick/default.nix | 3 --- pkgs/applications/graphics/dia/default.nix | 4 ++-- pkgs/applications/misc/calibre/default.nix | 2 +- pkgs/applications/misc/lyx/default.nix | 2 +- .../networking/browsers/icecat-3/default.nix | 4 ++-- .../applications/networking/browsers/opera/default.nix | 2 -- .../science/electronics/gtkwave/default.nix | 4 ++-- pkgs/applications/version-management/meld/default.nix | 4 ++-- pkgs/applications/video/xine-ui/default.nix | 4 ++-- pkgs/applications/window-managers/awesome/default.nix | 4 ++-- pkgs/data/fonts/cantarell-fonts/default.nix | 4 +--- pkgs/desktops/gnome-2/platform/audiofile/default.nix | 4 +--- .../gnome-2/platform/libgnome-keyring/default.nix | 4 ++-- pkgs/desktops/gnome-3/platform/GConf.nix | 4 ++-- pkgs/desktops/gnome-3/platform/clutter.nix | 4 ++-- pkgs/desktops/gnome-3/platform/glib-networking.nix | 4 ++-- pkgs/desktops/gnome-3/platform/gnome-user-docs.nix | 4 ++-- .../gnome-3/platform/gsettings-desktop-schemas.nix | 4 ++-- pkgs/desktops/gnome-3/platform/libgnome-keyring.nix | 4 ++-- pkgs/desktops/gnome-3/platform/libsoup.nix | 2 +- pkgs/desktops/kde-4.7/kde-runtime.nix | 4 ++-- pkgs/desktops/kde-4.7/kdelibs.nix | 7 +++---- pkgs/desktops/kde-4.7/kdeutils/ark.nix | 4 ++-- pkgs/desktops/kde-4.8/kde-runtime.nix | 4 ++-- pkgs/desktops/kde-4.8/kdelibs.nix | 2 +- pkgs/desktops/kde-4.8/kdeutils/ark.nix | 4 ++-- pkgs/development/interpreters/guile/default.nix | 4 ++-- pkgs/development/libraries/atk/2.2.x.nix | 4 ++-- pkgs/development/libraries/atkmm/2.22.x.nix | 3 +-- pkgs/development/libraries/cogl/default.nix | 4 ++-- pkgs/development/libraries/gdk-pixbuf/2.24.x.nix | 2 +- pkgs/development/libraries/glib/2.28.x.nix | 4 ++-- pkgs/development/libraries/glib/2.30.x.nix | 4 ++-- pkgs/development/libraries/glibmm/2.28.x.nix | 4 ++-- pkgs/development/libraries/glibmm/2.30.x.nix | 4 ++-- pkgs/development/libraries/gnutls/default.nix | 4 ++-- pkgs/development/libraries/gtk+/2.24.x.nix | 2 +- pkgs/development/libraries/gtk+/3.2.x.nix | 2 +- pkgs/development/libraries/gtkmm/2.24.x.nix | 4 ++-- pkgs/development/libraries/json-glib/default.nix | 4 ++-- pkgs/development/libraries/libarchive/default.nix | 4 ++-- pkgs/development/libraries/libav/default.nix | 2 +- pkgs/development/libraries/libdmtx/default.nix | 4 ++-- pkgs/development/libraries/libgsf/default.nix | 2 +- pkgs/development/libraries/libpng/default.nix | 4 +--- pkgs/development/libraries/libwpd/default.nix | 4 ++-- pkgs/development/libraries/pango/1.29.x.nix | 4 ++-- pkgs/development/libraries/pangomm/2.28.x.nix | 3 +-- pkgs/development/libraries/phonon/default.nix | 4 ++-- pkgs/development/tools/misc/cppi/default.nix | 4 +--- pkgs/development/tools/misc/elfutils/default.nix | 4 ++-- pkgs/os-specific/linux/upower/default.nix | 4 ++-- pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix | 4 ++-- pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix | 4 ++-- pkgs/servers/http/myserver/default.nix | 4 ++-- pkgs/servers/pulseaudio/default.nix | 4 ++-- pkgs/tools/filesystems/squashfs/default.nix | 2 +- pkgs/tools/graphics/pngcrush/default.nix | 4 ++-- pkgs/tools/misc/coreutils/default.nix | 3 +-- pkgs/tools/misc/grub/1.9x.nix | 4 ++-- pkgs/tools/misc/parted/2.3.nix | 3 +-- pkgs/tools/misc/parted/default.nix | 3 +-- pkgs/tools/misc/system-config-printer/default.nix | 4 ++-- pkgs/tools/networking/lftp/default.nix | 2 +- pkgs/tools/networking/modemmanager/default.nix | 4 ++-- .../networking/network-manager-applet/default.nix | 4 ++-- pkgs/tools/networking/network-manager/pptp.nix | 4 ++-- pkgs/tools/package-management/rpm/default.nix | 4 ++-- pkgs/tools/text/gnugrep/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 10 ++-------- 70 files changed, 117 insertions(+), 142 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index a4bd960655cd..0b62ffdca5af 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -12,7 +12,6 @@ , libtool , jasper , libX11 -, xz , tetex ? null , librsvg ? null }: @@ -41,8 +40,6 @@ stdenv.mkDerivation rec { buildInputs = [ tetex graphviz ]; - buildNativeInputs = [ xz ]; - preConfigure = if tetex != null then '' export DVIDecodeDelegate=${tetex}/bin/dvips diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index f9579336d2cd..f0c666b14ea0 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl_gnome, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext , python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl -, withGNOME ? false, libgnomeui, xz }: +, withGNOME ? false, libgnomeui }: stdenv.mkDerivation rec { name = src.pkgname; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { libxslt docbook_xsl libart_lgpl ] ++ stdenv.lib.optional withGNOME libgnomeui; - buildNativeInputs = [ pkgconfig intltool perl xz ]; + buildNativeInputs = [ pkgconfig intltool perl ]; configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index b8100fbd7093..9ee87fe30625 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { inherit python; - buildNativeInputs = [ makeWrapper xz pkgconfig ]; + buildNativeInputs = [ makeWrapper pkgconfig ]; buildInputs = [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index faddeb70e998..27ac0b7bd6a8 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "a790951d6ed660b254e82d682b478665f119dd522ab4759fdeb5cd8d42f66f61"; }; - buildInputs = [texLive qt python makeWrapper xz ]; + buildInputs = [texLive qt python makeWrapper ]; # don't ask me why it can't find libX11.so.6 postInstall = '' diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index 7fc5ddbcce51..e916c34631e5 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL +{ fetchurl, stdenv, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib , libnotify, gnome_vfs, libgnomeui , freetype, fontconfig, wirelesstools ? null, pixman @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; buildInputs = - [ xz libgnomeui libnotify gnome_vfs alsaLib + [ libgnomeui libnotify gnome_vfs alsaLib pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman python ply dbus dbus_glib pango freetype fontconfig xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 3dddc8569637..19a55c0f89cd 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -15,8 +15,6 @@ in stdenv.mkDerivation rec { name = "opera-11.51-1087"; - buildNativeInputs = [ xz ]; - src = if stdenv.system == "i686-linux" then fetchurl { diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index e1bf95700c9b..ddffc6ee34b2 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, xz, tcl, tk, judy} : +{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy} : stdenv.mkDerivation rec { name = "gtkwave-3.3.28"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "0y3dmx39xwc3m23fwjkxvp9gqxpckk8s5814nhs8fnxa384z5cz0"; }; - buildInputs = [ gtk gperf pkgconfig bzip2 xz tcl tk judy]; + buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy]; configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--enable-judy" ]; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 4775a419fd14..42650b3afb30 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xz, pygtk, python, intltool, scrollkeeper, makeWrapper }: +{stdenv, fetchurl, pygtk, python, intltool, scrollkeeper, makeWrapper }: let minor = "1.5"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "05rbkqflbqnh2c4682d2fmidhwz2bvlggrhp1p7xbi3z8ci87pdx"; }; - buildInputs = [ pygtk python intltool scrollkeeper makeWrapper xz ]; + buildInputs = [ pygtk python intltool scrollkeeper makeWrapper ]; patchPhase = '' sed -e s,/usr/local,$out, -i INSTALL diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 092f5270b783..14fdfdc4660f 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng, readline, ncurses, curl -, lirc, xz, shared_mime_info }: +, lirc, shared_mime_info }: stdenv.mkDerivation rec { name = "xine-ui-0.99.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1wwylnckm5kfq5fi154w8jqf5cwvp7c1ani15q7sgfrfdkmy7caf"; }; - buildNativeInputs = [ xz pkgconfig shared_mime_info ]; + buildNativeInputs = [ pkgconfig shared_mime_info ]; buildInputs = [ xineLib libpng readline ncurses curl lirc diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index b44f6d9f3aa8..5110e42fb183 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xz, cmake, gperf, imagemagick, pkgconfig, lua +{stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua , glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil , xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau , libXdmcp, pixman, doxygen @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "576b4f6d2c3f56dfbe52ad92f2eecece111f0f05816e32126cd03d4b4387761d"; }; - buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango + buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ]; diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index c7697c4f0728..70a8b2bc9f47 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz }: +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "cantarell-fonts-0.0.7"; @@ -8,8 +8,6 @@ stdenv.mkDerivation { sha256 = "1410ywvi951ngmx58g339phzsaf1rgjja6i0xvg49r4ds90zh8ba"; }; - buildNativeInputs = [ xz ]; - meta = { maintainers = [ stdenv.lib.maintainers.urkud ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/desktops/gnome-2/platform/audiofile/default.nix b/pkgs/desktops/gnome-2/platform/audiofile/default.nix index c39178cdf178..74007218347d 100644 --- a/pkgs/desktops/gnome-2/platform/audiofile/default.nix +++ b/pkgs/desktops/gnome-2/platform/audiofile/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xz, alsaLib}: +{stdenv, fetchurl, alsaLib}: stdenv.mkDerivation { name = "audiofile-0.3.2"; @@ -8,7 +8,5 @@ stdenv.mkDerivation { sha256 = "185j69j6b0vp6h6bb4j4ipvcyysxf63ghxnvdhh8kbc7ixm71hgs"; }; - buildNativeInputs = [ xz ]; - buildInputs = [ alsaLib ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnome-keyring/default.nix b/pkgs/desktops/gnome-2/platform/libgnome-keyring/default.nix index f937ce26018c..05a21f3c82e2 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, xz, +{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; - buildNativeInputs = [ pkgconfig xz intltool ]; + buildNativeInputs = [ pkgconfig intltool ]; meta = { inherit (glib.meta) platforms maintainers; diff --git a/pkgs/desktops/gnome-3/platform/GConf.nix b/pkgs/desktops/gnome-3/platform/GConf.nix index 637d619d022b..52f3cba7bdb7 100644 --- a/pkgs/desktops/gnome-3/platform/GConf.nix +++ b/pkgs/desktops/gnome-3/platform/GConf.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, glib, dbus_glib, pkgconfig, xz, libxml2, gtk, intltool }: +{ stdenv, fetchurl_gnome, glib, dbus_glib, pkgconfig, libxml2, gtk, intltool }: stdenv.mkDerivation rec { name = src.pkgname; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ glib dbus_glib libxml2 gtk ]; - buildNativeInputs = [ pkgconfig xz intltool ]; + buildNativeInputs = [ pkgconfig intltool ]; configureFlags = "--disable-orbit"; diff --git a/pkgs/desktops/gnome-3/platform/clutter.nix b/pkgs/desktops/gnome-3/platform/clutter.nix index 4e7bc54c1295..b2ee5539008a 100644 --- a/pkgs/desktops/gnome-3/platform/clutter.nix +++ b/pkgs/desktops/gnome-3/platform/clutter.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, xz, pkgconfig, mesa, libX11, libXext, libXfixes +{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes , libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0bzsvnharawfg525lpavrp55mq4aih5nb01dwwqwnccg8hk9z2fw"; }; - buildNativeInputs = [ xz pkgconfig ]; + buildNativeInputs = [ pkgconfig ]; buildInputs = [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango atk json_glib diff --git a/pkgs/desktops/gnome-3/platform/glib-networking.nix b/pkgs/desktops/gnome-3/platform/glib-networking.nix index 7fa0295fe742..37537b274e14 100644 --- a/pkgs/desktops/gnome-3/platform/glib-networking.nix +++ b/pkgs/desktops/gnome-3/platform/glib-networking.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, xz, pkgconfig, intltool, gnutls, libgcrypt +{ stdenv, fetchurl, glib, pkgconfig, intltool, gnutls, libgcrypt , gsettings_desktop_schemas }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ glib gnutls libgcrypt ]; buildInputs = [ gsettings_desktop_schemas ]; - buildNativeInputs = [ xz pkgconfig intltool ]; + buildNativeInputs = [ pkgconfig intltool ]; configureFlags = "--without-ca-certificates"; postConfigure = "export makeFlags=GIO_MODULE_DIR=$out/${glib.gioModuleDir}"; diff --git a/pkgs/desktops/gnome-3/platform/gnome-user-docs.nix b/pkgs/desktops/gnome-3/platform/gnome-user-docs.nix index f434b5c155c5..f92882b9a832 100644 --- a/pkgs/desktops/gnome-3/platform/gnome-user-docs.nix +++ b/pkgs/desktops/gnome-3/platform/gnome-user-docs.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz, itstool, libxml2, gettext }: +{ stdenv, fetchurl, itstool, libxml2, gettext }: stdenv.mkDerivation { name = "gnome-user-docs-3.2.2"; @@ -8,5 +8,5 @@ stdenv.mkDerivation { sha256 = "1ka0nw2kc85p10y8x31v0wv06a88k7qrgafp4ys04y9fzz0rkcjj"; }; - buildNativeInputs = [ xz itstool libxml2 gettext ]; + buildNativeInputs = [ itstool libxml2 gettext ]; } diff --git a/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix b/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix index db6453a53c35..4527b2fec0b1 100644 --- a/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix +++ b/pkgs/desktops/gnome-3/platform/gsettings-desktop-schemas.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz, glib, pkgconfig, intltool }: +{ stdenv, fetchurl, glib, pkgconfig, intltool }: stdenv.mkDerivation { name = "gsettings-desktop-schemas-3.2.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; buildInputs = [ glib ]; - buildNativeInputs = [ pkgconfig xz intltool ]; + buildNativeInputs = [ pkgconfig intltool ]; meta = { inherit (glib.meta) maintainers platforms; diff --git a/pkgs/desktops/gnome-3/platform/libgnome-keyring.nix b/pkgs/desktops/gnome-3/platform/libgnome-keyring.nix index b3ceb6df3d50..a8b8e98ced99 100644 --- a/pkgs/desktops/gnome-3/platform/libgnome-keyring.nix +++ b/pkgs/desktops/gnome-3/platform/libgnome-keyring.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, xz, +{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; - buildNativeInputs = [ pkgconfig xz intltool ]; + buildNativeInputs = [ pkgconfig intltool ]; meta = { inherit (glib.meta) platforms maintainers; diff --git a/pkgs/desktops/gnome-3/platform/libsoup.nix b/pkgs/desktops/gnome-3/platform/libsoup.nix index 1827d5c9cd73..fdf9e5bd9fee 100644 --- a/pkgs/desktops/gnome-3/platform/libsoup.nix +++ b/pkgs/desktops/gnome-3/platform/libsoup.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; - buildNativeInputs = [ pkgconfig xz ]; + buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 ] ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ]; passthru.propagatedUserEnvPackages = [ glib_networking ]; diff --git a/pkgs/desktops/kde-4.7/kde-runtime.nix b/pkgs/desktops/kde-4.7/kde-runtime.nix index 96b6c3a1c784..003c4aceea93 100644 --- a/pkgs/desktops/kde-4.7/kde-runtime.nix +++ b/pkgs/desktops/kde-4.7/kde-runtime.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica +{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica , libcanberra, virtuoso, samba, ntrack }: kde { buildInputs = - [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica + [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica samba (libcanberra.override { gtk = null; }) ntrack ]; diff --git a/pkgs/desktops/kde-4.7/kdelibs.nix b/pkgs/desktops/kde-4.7/kdelibs.nix index d4383b3e93a2..3a6ae7a4afb5 100644 --- a/pkgs/desktops/kde-4.7/kdelibs.nix +++ b/pkgs/desktops/kde-4.7/kdelibs.nix @@ -1,6 +1,6 @@ { kde, gcc, cmake, perl , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper -, xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver +, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1 , getopt, udev, herqq, phonon, libjpeg @@ -8,10 +8,9 @@ kde { buildInputs = - [ - acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper + [ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2 - shared_desktop_ontologies udev xz libxml2 libjpeg + shared_desktop_ontologies udev libxml2 libjpeg ]; propagatedBuildInputs = [ qt4 soprano strigi phonon ]; diff --git a/pkgs/desktops/kde-4.7/kdeutils/ark.nix b/pkgs/desktops/kde-4.7/kdeutils/ark.nix index 4449dd8228f2..7fbdaf586d66 100644 --- a/pkgs/desktops/kde-4.7/kdeutils/ark.nix +++ b/pkgs/desktops/kde-4.7/kdeutils/ark.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, libarchive, xz, bzip2, kde_baseapps }: +{ kde, kdelibs, libarchive, bzip2, kde_baseapps }: kde { - buildInputs = [ kdelibs kde_baseapps libarchive xz bzip2 ]; + buildInputs = [ kdelibs kde_baseapps libarchive bzip2 ]; meta = { description = "KDE Archiving Tool"; diff --git a/pkgs/desktops/kde-4.8/kde-runtime.nix b/pkgs/desktops/kde-4.8/kde-runtime.nix index d827802bb090..9b25e77b0835 100644 --- a/pkgs/desktops/kde-4.8/kde-runtime.nix +++ b/pkgs/desktops/kde-4.8/kde-runtime.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica +{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica , libcanberra, virtuoso, samba, ntrack, libjpeg }: kde { buildInputs = - [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica + [ kdelibs shared_desktop_ontologies bzip2 libssh exiv2 attica samba (libcanberra.override { gtk = null; }) ntrack libjpeg ]; diff --git a/pkgs/desktops/kde-4.8/kdelibs.nix b/pkgs/desktops/kde-4.8/kdelibs.nix index 106909ac3dbb..7f0ac15d8001 100644 --- a/pkgs/desktops/kde-4.8/kdelibs.nix +++ b/pkgs/desktops/kde-4.8/kdelibs.nix @@ -1,6 +1,6 @@ { kde, gcc, cmake, perl , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper -, xz, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver +, openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1 , getopt, udev, herqq, phonon, libjpeg diff --git a/pkgs/desktops/kde-4.8/kdeutils/ark.nix b/pkgs/desktops/kde-4.8/kdeutils/ark.nix index 4449dd8228f2..7fbdaf586d66 100644 --- a/pkgs/desktops/kde-4.8/kdeutils/ark.nix +++ b/pkgs/desktops/kde-4.8/kdeutils/ark.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs, libarchive, xz, bzip2, kde_baseapps }: +{ kde, kdelibs, libarchive, bzip2, kde_baseapps }: kde { - buildInputs = [ kdelibs kde_baseapps libarchive xz bzip2 ]; + buildInputs = [ kdelibs kde_baseapps libarchive bzip2 ]; meta = { description = "KDE Archiving Tool"; diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index bb64d35f8a47..ffdb957963a0 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, xz, libtool, readline, gmp, pkgconfig, boehmgc, libunistring +{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring , libffi, gawk, makeWrapper, coverageAnalysis ? null }: # Do either a coverage analysis build or a standard build. @@ -14,7 +14,7 @@ rec { sha256 = "14rhlpxxa4v5y3gl992l7lnd5qnqawx0a84idnwq0w2qviwcvsyj"; }; - buildNativeInputs = [ xz makeWrapper gawk pkgconfig ]; + buildNativeInputs = [ makeWrapper gawk pkgconfig ]; buildInputs = [ readline libtool libunistring libffi ]; propagatedBuildInputs = [ gmp boehmgc ] diff --git a/pkgs/development/libraries/atk/2.2.x.nix b/pkgs/development/libraries/atk/2.2.x.nix index 8f49532c025e..d0f7e1097953 100644 --- a/pkgs/development/libraries/atk/2.2.x.nix +++ b/pkgs/development/libraries/atk/2.2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, glib, xz }: +{ stdenv, fetchurl, pkgconfig, perl, glib }: stdenv.mkDerivation rec { name = "atk-2.2.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17bkqg89l9hxbkgc76cxlin1bwczk7m6ikbccx677lrxh3kz08lb"; }; - buildNativeInputs = [ pkgconfig perl xz ]; + buildNativeInputs = [ pkgconfig perl ]; propagatedBuildInputs = [ glib ]; diff --git a/pkgs/development/libraries/atkmm/2.22.x.nix b/pkgs/development/libraries/atkmm/2.22.x.nix index 2d415821fc58..66237c4c7b99 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, xz }: +{ stdenv, fetchurl, atk, glibmm, pkgconfig }: stdenv.mkDerivation rec { name = "atkmm-2.22.6"; @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { sha256 = "1dmf72i7jv2a2gavjiah2722bf5qk3hb97hn5dasxqxr0r8jjx0a"; }; - buildInputs = [ xz ]; propagatedBuildInputs = [ atk glibmm ]; buildNativeInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 6b517b918102..11a6e374e2e4 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf , pangoSupport ? true, pango, cairo -, libXfixes, libXcomposite, libXdamage, xz }: +, libXfixes, libXcomposite, libXdamage }: stdenv.mkDerivation rec { name = "cogl-1.8.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1ix87hz3qxqysqwx58wbc46lzchlmfs08fjzbf3l6mmsqj8gs9pc"; }; - buildNativeInputs = [ xz pkgconfig ]; + buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ]; diff --git a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix index eb7eaf91bb07..5c0860196d39 100644 --- a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix +++ b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. buildInputs = [ libX11 ]; - buildNativeInputs = [ pkgconfig xz ]; + buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; diff --git a/pkgs/development/libraries/glib/2.28.x.nix b/pkgs/development/libraries/glib/2.28.x.nix index 3b7f8b18495d..dd613c6ce3c1 100644 --- a/pkgs/development/libraries/glib/2.28.x.nix +++ b/pkgs/development/libraries/glib/2.28.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, gettext, perl, libiconv, zlib, xz }: +{ stdenv, fetchurl_gnome, pkgconfig, gettext, perl, libiconv, zlib }: # TODO: # * Add gio-module-fam @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # configure script looks for d-bus but it is only needed for tests buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; - buildNativeInputs = [ perl pkgconfig gettext xz ]; + buildNativeInputs = [ perl pkgconfig gettext ]; propagatedBuildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/glib/2.30.x.nix b/pkgs/development/libraries/glib/2.30.x.nix index a0d8ac0eff7b..0f1812b4ec56 100644 --- a/pkgs/development/libraries/glib/2.30.x.nix +++ b/pkgs/development/libraries/glib/2.30.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, xz, libffi +{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, libffi , python }: # TODO: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # configure script looks for d-bus but it is only needed for tests buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; - buildNativeInputs = [ perl pkgconfig gettext xz python ]; + buildNativeInputs = [ perl pkgconfig gettext python ]; propagatedBuildInputs = [ zlib libffi ]; diff --git a/pkgs/development/libraries/glibmm/2.28.x.nix b/pkgs/development/libraries/glibmm/2.28.x.nix index 3c2c1fbadce4..2c1d9a45c8d3 100644 --- a/pkgs/development/libraries/glibmm/2.28.x.nix +++ b/pkgs/development/libraries/glibmm/2.28.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx, xz }: +{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx }: stdenv.mkDerivation rec { name = src.pkgname; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1qyb8jb9avfzcdyhldxx7qljjhf30czwnh7c2r9p0x4nin2rjkpq"; }; - buildNativeInputs = [pkgconfig xz]; + buildNativeInputs = [pkgconfig]; propagatedBuildInputs = [glib libsigcxx]; meta = { diff --git a/pkgs/development/libraries/glibmm/2.30.x.nix b/pkgs/development/libraries/glibmm/2.30.x.nix index e3565a4e6146..1ed2d0ede625 100644 --- a/pkgs/development/libraries/glibmm/2.30.x.nix +++ b/pkgs/development/libraries/glibmm/2.30.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx, xz }: +{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx }: stdenv.mkDerivation rec { name = src.pkgname; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1d0dxq4iamch8igrnbvbfwkfpvcnjfzyr9iq2x8hi89b9k1kzbd7"; }; - buildNativeInputs = [pkgconfig xz]; + buildNativeInputs = [pkgconfig]; propagatedBuildInputs = [glib libsigcxx]; meta = { diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 3cd8e7180212..e998887f5912 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, xz, zlib, lzo, libtasn1, nettle +{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle , guileBindings, guile, perl }: assert guileBindings -> guile != null; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib lzo ] ++ stdenv.lib.optional guileBindings guile; - buildNativeInputs = [ xz perl ]; + buildNativeInputs = [ perl ]; propagatedBuildInputs = [ nettle libtasn1 ]; diff --git a/pkgs/development/libraries/gtk+/2.24.x.nix b/pkgs/development/libraries/gtk+/2.24.x.nix index e3908b2ba371..c9e95ecc9c36 100644 --- a/pkgs/development/libraries/gtk+/2.24.x.nix +++ b/pkgs/development/libraries/gtk+/2.24.x.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildNativeInputs = [ perl pkgconfig xz ]; + buildNativeInputs = [ perl pkgconfig ]; propagatedBuildInputs = [ xlibs.xlibs glib atk pango gdk_pixbuf cairo diff --git a/pkgs/development/libraries/gtk+/3.2.x.nix b/pkgs/development/libraries/gtk+/3.2.x.nix index a72411d16367..ae6b692e44f2 100644 --- a/pkgs/development/libraries/gtk+/3.2.x.nix +++ b/pkgs/development/libraries/gtk+/3.2.x.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildNativeInputs = [ perl pkgconfig xz ]; + buildNativeInputs = [ perl pkgconfig ]; propagatedBuildInputs = [ xlibs.xlibs glib atk pango gdk_pixbuf cairo diff --git a/pkgs/development/libraries/gtkmm/2.24.x.nix b/pkgs/development/libraries/gtkmm/2.24.x.nix index 89e12bc4c1c6..56d151101c5d 100644 --- a/pkgs/development/libraries/gtkmm/2.24.x.nix +++ b/pkgs/development/libraries/gtkmm/2.24.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm, xz }: +{ stdenv, fetchurl_gnome, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }: stdenv.mkDerivation rec { name = src.pkgname; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0gcm91sc1a05c56kzh74l370ggj0zz8nmmjvjaaxgmhdq8lpl369"; }; - buildNativeInputs = [pkgconfig xz]; + buildNativeInputs = [pkgconfig]; propagatedBuildInputs = [ glibmm gtk atkmm cairomm pangomm ]; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 25d2f1c44355..ace271b7a357 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, glib, pkgconfig, xz }: +{ stdenv, fetchurl_gnome, glib, pkgconfig }: stdenv.mkDerivation rec { name = src.pkgname; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ glib ]; - buildNativeInputs = [ pkgconfig xz ]; + buildNativeInputs = [ pkgconfig ]; meta = { homepage = http://live.gnome.org/JsonGlib; diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index ab862fd56f0f..36e345043e3c 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,4 +1,4 @@ -{fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, xz, e2fsprogs +{fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs , sharutils}: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a"; }; - propagatedBuildInputs = [libxml2 zlib bzip2 xz openssl] ++ + propagatedBuildInputs = [libxml2 zlib bzip2 openssl] ++ (if stdenv.isLinux then [e2fsprogs attr acl] else []); buildInputs = [sharutils]; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 0d6637d6116b..3fb1650bf46f 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional xvidSupport "--enable-libxvid" ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"; - buildInputs = [ pkgconfig lame yasm xz ] + buildInputs = [ pkgconfig lame yasm ] ++ stdenv.lib.optional mp3Support lame ++ stdenv.lib.optional speexSupport speex ++ stdenv.lib.optional theoraSupport libtheora diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index f9b864143ec5..97622bb7b24b 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, imagemagick, xz }: +{ stdenv, fetchurl, pkgconfig, imagemagick }: stdenv.mkDerivation rec { name = "libdmtx-0.7.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildNativeInputs = [ pkgconfig ]; - propagatedBuildInputs = [ imagemagick xz ]; + propagatedBuildInputs = [ imagemagick ]; meta = { description = "An open source software for reading and writing Data Matrix barcodes"; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 3f6de4cfb1d7..168a2e7381ef 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0gvq1gbbcl078s3kgdc508jp7p3a3ps34fj4pf8vsamprbikpwm5"; }; - buildNativeInputs = [ xz intltool pkgconfig ]; + buildNativeInputs = [ intltool pkgconfig ]; buildInputs = [ perl perlXMLParser gettext bzip2 gnome_vfs python ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 7ba9bfb54b37..85c2fa13a93a 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, xz }: +{ stdenv, fetchurl, zlib }: assert zlib != null; @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib ]; - buildNativeInputs = [ xz ]; - passthru = { inherit zlib; }; meta = { diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index dc3f8b5352de..d857b6e17ea4 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, xz }: +{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2 }: stdenv.mkDerivation rec { name = "libwpd-0.9.4"; @@ -10,5 +10,5 @@ stdenv.mkDerivation rec { buildInputs = [ glib libgsf libxml2 ]; - buildNativeInputs = [ pkgconfig xz ]; + buildNativeInputs = [ pkgconfig ]; } diff --git a/pkgs/development/libraries/pango/1.29.x.nix b/pkgs/development/libraries/pango/1.29.x.nix index b255f05dd23b..5a0ff2b53745 100644 --- a/pkgs/development/libraries/pango/1.29.x.nix +++ b/pkgs/development/libraries/pango/1.29.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, gettext, x11, glib, cairo, libpng, xz }: +{ stdenv, fetchurl_gnome, pkgconfig, gettext, x11, glib, cairo, libpng }: stdenv.mkDerivation rec { name = src.pkgname; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; - buildNativeInputs = [ pkgconfig xz ]; + buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ x11 glib cairo libpng ]; diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix index c004b7160f20..5cd4744fed38 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, xz }: +{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }: stdenv.mkDerivation rec { name = "pangomm-2.28.4"; @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { sha256 = "10kcdpg080m393f1vz0km41kd3483fkyabprm59gvjwklxkcp3bp"; }; - buildInputs = [ xz]; buildNativeInputs = [ pkgconfig ]; propagatedBuildInputs = [ pango glibmm cairomm libpng ]; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index c8eae2eac4e1..c7de1df71909 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, automoc4, qt4, xz }: +{ stdenv, fetchurl, cmake, automoc4, qt4 }: let v = "4.5.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 ]; - buildNativeInputs = [ cmake automoc4 xz ]; + buildNativeInputs = [ cmake automoc4 ]; cmakeFlags = "-DPHONON_MKSPECS_DIR=mkspecs"; preConfigure = diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index b6c0e9a99b45..c72aa02a88a0 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, xz, stdenv }: +{ fetchurl, stdenv }: stdenv.mkDerivation rec { name = "cppi-1.15"; @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { sha256 = "1avwwpcwx6rvk9j4id8jq58n5kk756dwnd0wqw4a4p3smvby7gw2"; }; - buildInputs = [ xz ]; - doCheck = true; meta = { diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 6254b955a239..61b4647552d5 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, m4, zlib, bzip2, xz, bison, flex, gettext}: +{stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext}: # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # We need bzip2 in NativeInputs because otherwise we can't unpack the src, # as the host-bzip2 will be in the path. buildNativeInputs = [m4 bison flex gettext bzip2]; - buildInputs = [zlib bzip2 xz]; + buildInputs = [zlib bzip2]; crossAttrs = { diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 32698ac4efbe..2679d23d76e1 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz, pkgconfig, glib, dbus, dbus_glib, polkit +{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, polkit , intltool, libxslt, docbook_xsl, udev, libusb1, pmutils }: assert stdenv.isLinux; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 ]; - buildNativeInputs = [ xz pkgconfig ]; + buildNativeInputs = [ pkgconfig ]; configureFlags = "--with-backend=linux --localstatedir=/var"; diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix b/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix index 78a36c73ca55..9d1f710c4154 100644 --- a/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix +++ b/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix @@ -1,4 +1,4 @@ -args @ {stdenv, fetchurl, xz, runCommand, userModeLinux ? false, extraConfig ? "", +args @ {stdenv, fetchurl, runCommand, userModeLinux ? false, extraConfig ? "", kernelPatches ? [], extraMeta ? {}, features ? {}, preConfigure ? "", ...}: @@ -20,7 +20,7 @@ import ../kernel/generic.nix ( kernelPatches = [ { name = "zen4"; - patch = runCommand "2.6.32-zen4.patch" {} "${xz}/bin/lzma -d < ${ fetchurl { + patch = runCommand "2.6.32-zen4.patch" {} "lzma -d < ${ fetchurl { name = "2.6.32-zen4"; url = "http://downloads.zen-kernel.org/2.6.32/2.6.32-zen4.patch.lzma"; sha256 = "1dyp9sfigqjfqw1c94010c521bhcy1xnzp91kkhg3dwgzfpsp2k2"; diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix b/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix index 5c1a315cb387..ab7a0059bbe8 100644 --- a/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix +++ b/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix @@ -1,4 +1,4 @@ -args @ {stdenv, fetchurl, xz, runCommand, userModeLinux ? false, extraConfig ? "", +args @ {stdenv, fetchurl, runCommand, userModeLinux ? false, extraConfig ? "", kernelPatches ? [], extraMeta ? {}, features ? {}, preConfigure ? "", ...}: @@ -23,7 +23,7 @@ import ../kernel/generic.nix ( kernelPatches = [ { name = "${ZenSuffix}"; - patch = runCommand "${baseKernelVersion}-${ZenSuffix}.patch" {} "${xz}/bin/lzma -d < ${ fetchurl { + patch = runCommand "${baseKernelVersion}-${ZenSuffix}.patch" {} "lzma -d < ${ fetchurl { name = "${baseKernelVersion}-${ZenSuffix}.patch.lzma"; url = "http://downloads.zen-kernel.org/${baseKernelVersion}/${baseKernelVersion}-${ZenSuffix}.patch.lzma"; sha256 = "0a72d8allr4qi4p6hbbjh33kmcgbg84as0dfb50gsffvaj2d3kwf"; diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index 32526ddf65de..b6aff880e62e 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls -, libxml2, zlib, guile, texinfo, cppunit, xz, psmisc }: +, libxml2, zlib, guile, texinfo, cppunit, psmisc }: let version = "0.11"; in stdenv.mkDerivation (rec { @@ -14,7 +14,7 @@ let version = "0.11"; in [ ./disable-dns-lookup-in-chroot.patch ]; buildInputs = - [ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo xz ] + [ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo ] ++ stdenv.lib.optional doCheck cppunit; makeFlags = [ "V=1" ]; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 13d0af8987ce..211122505975 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -3,7 +3,7 @@ , alsaLib, libsamplerate, libsndfile, speex, bluez, udev , jackaudioSupport ? false, jackaudio ? null , x11Support ? false, xlibs -, xz, json_c +, json_c }: assert jackaudioSupport -> jackaudio != null; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gnum4 libtool intltool glib dbus avahi libsamplerate libsndfile speex alsaLib bluez udev - xz json_c + json_c #gtk gconf ] ++ stdenv.lib.optional jackaudioSupport jackaudio diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index a7eb9eb0a1f2..2fc0befb9aa0 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0sh40r7gz81fg7ivgr7rld8spvqb6hsfvnf6gd3gbcr5b830v1rs"; }; - buildInputs = [zlib attr xz]; + buildInputs = [zlib attr]; preBuild = '' cd squashfs-tools diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index caa99d2c4e2a..08a7e6b2c426 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpng, xz }: +{ stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { name = "pngcrush-1.7.17"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sed -i s,/usr,$out, Makefile ''; - buildInputs = [ xz libpng ]; + buildInputs = [ libpng ]; meta = { homepage = http://pmt.sourceforge.net/pngcrush; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 7a69f01dad2f..597ab802d74e 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, perl, gmp ? null , aclSupport ? false, acl ? null , selinuxSupport? false, libselinux ? null, libsepol ? null -, xz }: assert aclSupport -> acl != null; @@ -15,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "176lgw810xw84c6fz5xwhydxggkndmzggl0pxqzldbjf85vv6zl3"; }; - buildNativeInputs = [ perl xz ]; + buildNativeInputs = [ perl ]; buildInputs = [ gmp ] ++ stdenv.lib.optional aclSupport acl ++ stdenv.lib.optional selinuxSupport libselinux diff --git a/pkgs/tools/misc/grub/1.9x.nix b/pkgs/tools/misc/grub/1.9x.nix index 14a4932f1003..49cc4884e636 100644 --- a/pkgs/tools/misc/grub/1.9x.nix +++ b/pkgs/tools/misc/grub/1.9x.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, xz, flex, bison, gettext, ncurses, libusb, freetype, qemu +{ fetchurl, stdenv, flex, bison, gettext, ncurses, libusb, freetype, qemu , EFIsupport ? false }: let @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "06q2a7bg1mbsms604a89fkdnwrc1jg9hr2mmfdmg3il39j6i827k"; }; - buildNativeInputs = [ xz flex bison ]; + buildNativeInputs = [ flex bison ]; buildInputs = [ ncurses libusb freetype gettext ] ++ stdenv.lib.optional doCheck qemu; diff --git a/pkgs/tools/misc/parted/2.3.nix b/pkgs/tools/misc/parted/2.3.nix index 52b3c4b4dcf0..649def691155 100644 --- a/pkgs/tools/misc/parted/2.3.nix +++ b/pkgs/tools/misc/parted/2.3.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, devicemapper, libuuid, gettext, readline -, utillinux, xz, enableStatic ? false, hurd ? null }: +, utillinux, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { name = "parted-2.3"; @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0sabj81nawcjm8ww34lxg65ka8crv3w2ab4crh8ypw5agg681836"; }; - buildNativeInputs = [ xz ]; buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 80abefc97ad0..3d217d2660c5 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, devicemapper, libuuid, gettext, readline -, utillinux, xz, check, enableStatic ? false, hurd ? null }: +, utillinux, check, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { name = "parted-3.0"; @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { sha256 = "054ybvjkj1mbm4mpn1rl12jzhvqg37b0xwwr4ly1zisvzrjhi11a"; }; - buildNativeInputs = [ xz ]; buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index a7a08f291872..8923637bbdbf 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto , makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl , pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups -, xz, pythonPackages +, pythonPackages , withGUI ? true }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ xz intltool pkgconfig glib udev libusb cups xmlto + [ intltool pkgconfig glib udev libusb cups xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils pythonPackages.python pythonPackages.wrapPython ]; diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 1b651cab996c..64e7ac50bc0f 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -8,5 +8,5 @@ stdenv.mkDerivation rec { sha256 = "0v3591fknmimarzk5icm0qxdcfzfckwi2drh165vsiggmj590iyx"; }; - buildInputs = [gnutls libtasn1 pkgconfig readline zlib xz]; + buildInputs = [gnutls libtasn1 pkgconfig readline zlib]; } diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index b17894edfabc..c9c975d557c6 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, udev, polkit, dbus_glib, ppp, intltool, pkgconfig, xz }: +{ stdenv, fetchurl_gnome, udev, polkit, dbus_glib, ppp, intltool, pkgconfig }: stdenv.mkDerivation rec { name = src.pkgname; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0zvwrni4l21d856nq28khigrhwgrq5cc7nh45zidwjj8q7bsxiz7"; }; - buildNativeInputs = [ xz intltool pkgconfig ]; + buildNativeInputs = [ intltool pkgconfig ]; buildInputs = [ udev polkit dbus_glib ppp ]; diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index cb0ffe321594..d41b2ad00109 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk, glib, libglade , networkmanager, GConf, libnotify, gnome_keyring, dbus_glib -, polkit, xz }: +, polkit }: let pn = "network-manager-applet"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk libglade networkmanager GConf libnotify gnome_keyring polkit]; - buildNativeInputs = [ intltool pkgconfig xz ]; + buildNativeInputs = [ intltool pkgconfig ]; meta = with stdenv.lib; { homepage = http://projects.gnome.org/NetworkManager/; diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index dbb66a43d380..3abea68366dc 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, networkmanager, pptp, ppp, xz, intltool, pkgconfig }: +{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig }: let pn = "networkmanager-pptp"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ networkmanager pptp ppp ]; - buildNativeInputs = [ xz intltool pkgconfig ]; + buildNativeInputs = [ intltool pkgconfig ]; configureFlags = "--without-gnome --disable-nls"; } diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 50f495ec8a62..f9c942f333ea 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cpio, zlib, bzip2, xz, file, elfutils, nspr, nss, popt, db4 }: +{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db4 }: stdenv.mkDerivation rec { name = "rpm-4.7.2"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha1 = "07b90f653775329ea726ce0005c4c82f56167ca0"; }; - buildInputs = [ cpio zlib bzip2 xz file nspr nss popt db4 ]; + buildInputs = [ cpio zlib bzip2 file nspr nss popt db4 ]; # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 957b70f1e580..8368edef6563 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pcre, libiconv ? null, xz }: +{ stdenv, fetchurl, pcre, libiconv ? null }: let version = "2.10"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation ({ sha256 = "1cvsqyfzk1p38fcaav22dn76fkd02g7bjnqna6vrpk9vy9rnfybc"; }; - buildInputs = [ pcre xz ] + buildInputs = [ pcre ] ++ (stdenv.lib.optional (libiconv != null) libiconv); doCheck = if stdenv.isDarwin then false else true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc6424ae60dc..a4cc45f53bb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6945,20 +6945,14 @@ let i810switch = callPackage ../os-specific/linux/i810switch { }; - icecat3 = lowPrio (import ../applications/networking/browsers/icecat-3 { - inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo - python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify - wirelesstools; + icecat3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 { inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango; inherit (xlibs) pixman; inherit (pythonPackages) ply; }); - icecatXulrunner3 = lowPrio (import ../applications/networking/browsers/icecat-3 { + icecatXulrunner3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 { application = "xulrunner"; - inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo - python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify - wirelesstools; inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango; inherit (xlibs) pixman; inherit (pythonPackages) ply;