diff options
Diffstat (limited to 'pkgs/development')
19 files changed, 18 insertions, 26 deletions
diff --git a/pkgs/development/interpreters/perl-5.10/default.nix b/pkgs/development/interpreters/perl-5.10/default.nix index 89e6335c703..31168291e3d 100644 --- a/pkgs/development/interpreters/perl-5.10/default.nix +++ b/pkgs/development/interpreters/perl-5.10/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchurl - , ...}: +{ stdenv, fetchurl }: let diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 3b94d0f8477..8865738b0d7 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -11,7 +11,6 @@ , arch ? null , sw_vers ? null , ncurses ? null -, ... }: assert zlibSupport -> zlib != null; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 54bf2550035..410a07761ee 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser , expat, gettext, intltool, glib, gtk, qt4 ? null, lib -, qt4Support ? false, ...}: +, qt4Support ? false }: assert qt4Support -> qt4 != null; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index a14b7fdc2da..dc8bb2a9b52 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -4,7 +4,6 @@ , xcbSupport ? false , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype , zlib, libpng, pixman, libxcb ? null, xcbutil ? null -, ... }: assert postscriptSupport -> zlib != null; diff --git a/pkgs/development/libraries/consolekit/default.nix b/pkgs/development/libraries/consolekit/default.nix index 30823489057..5cebc5874bd 100644 --- a/pkgs/development/libraries/consolekit/default.nix +++ b/pkgs/development/libraries/consolekit/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib, - libX11, polkit, expat - , ...}: + libX11, polkit, expat }: stdenv.mkDerivation rec { name = "consolekit-0.4.1"; diff --git a/pkgs/development/libraries/enchant/default.nix b/pkgs/development/libraries/enchant/default.nix index 65aa7cd572e..388d042d3ac 100644 --- a/pkgs/development/libraries/enchant/default.nix +++ b/pkgs/development/libraries/enchant/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchurl, aspell, pkgconfig, glib, - ...}: +{ stdenv, fetchurl, aspell, pkgconfig, glib }: stdenv.mkDerivation rec { name = "enchant-1.3.0"; diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index d88fa1d0ae3..d3814bdb972 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -5,7 +5,6 @@ # option allows them to be enabled. See # http://www.freetype.org/patents.html. useEncumberedCode ? false - , ... }: stdenv.mkDerivation (rec { diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix index f60d40cfa03..c45af907aab 100644 --- a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2, ... }: +{ fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2 }: stdenv.mkDerivation rec { name = "gst-ffmpeg-0.10.9"; diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix index d506cfe4e6a..37d0a058fff 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, python, gstreamer , libX11, libXv, libXext, alsaLib, cdparanoia , libogg , libtheora, libvorbis, freetype, pango -, liboil, gtk, which, gtkdoc, ... }: +, liboil, gtk, which, gtkdoc }: stdenv.mkDerivation rec { name = "gst-plugins-base-0.10.26"; diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix index da4045a9d21..2998c89a51e 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, gstPluginsBase, aalib, cairo , flac , hal, libjpeg, zlib, speex, libpng, libdv, libcaca, dbus , libiec61883, libavc1394, ladspaH, taglib, gdbm, pulseaudio -, libsoup, libcap, libtasn1, ... +, libsoup, libcap, libtasn1 }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/gstreamer/default.nix index 435a80f05c7..91a699f564f 100644 --- a/pkgs/development/libraries/gstreamer/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamer/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, perl, bison, flex, pkgconfig, python -, which, gtkdoc, glib, libxml2, ... }: +, which, gtkdoc, glib, libxml2 }: stdenv.mkDerivation rec { name = "gstreamer-0.10.26"; diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index d47887fd96b..bc3245cf76d 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchurl, - ...}: +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "libjpeg-8"; diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index 1e253ad7842..05cafecff27 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, ...}: +{stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { name = "liboil-0.3.15"; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 3481e56b3ab..af591fbef7d 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,5 +1,4 @@ -{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true - , ...}: +{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true }: assert pythonSupport -> python != null; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 84732891cd1..46dc1435bcd 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libxml2, ...}: +{stdenv, fetchurl, libxml2 }: stdenv.mkDerivation rec { name = "libxslt-1.1.26"; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 4bc93869f9d..4e567cf6577 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, ...}: +{ stdenv, fetchurl, perl }: let opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] diff --git a/pkgs/development/libraries/policykit/default.nix b/pkgs/development/libraries/policykit/default.nix index 067e8d50e22..87e06e9a57a 100644 --- a/pkgs/development/libraries/policykit/default.nix +++ b/pkgs/development/libraries/policykit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, expat, pam -, intltool, gettext, libxslt, docbook_xsl, ... }: +, intltool, gettext, libxslt, docbook_xsl }: stdenv.mkDerivation rec { name = "policykit-0.9"; diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 3842ca4a131..829dd89147f 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./tmake.patch ]; buildInputs = [ graphviz perl flex bison libX11 libXext ] - ++ (if qt != null then [ qt ] else []); + ++ (if (qt != null) then [ qt ] else []); prefixKey = "--prefix "; configureFlags = "--release" @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { ; preConfigure = - (if qt == null + (if (qt == null) then "" else '' echo "using QTDIR=${qt}..." export QTDIR=${qt} - ''); + ''); # export CPLUS_INCLUDE_PATH="${qt}/include:$CPLUS_INCLUDE_PATH" # export LIBRARY_PATH="${qt}/lib:$LIBRARY_PATH" diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 83111c916fc..0c73ba1f738 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ...}: +{stdenv, fetchurl}: stdenv.mkDerivation { name = "gnum4-1.4.13"; |