* "!isNull x" -> "x != null". Done automatically. Hope nothing

broke.

svn path=/nixpkgs/trunk/; revision=870
This commit is contained in:
Eelco Dolstra 2004-03-29 10:25:25 +00:00
parent e3ff964291
commit 2fcc5fdb08
47 changed files with 81 additions and 81 deletions

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, pkgconfig, gtk, libpng}:
assert !isNull pkgconfig && !isNull gtk && !isNull libpng;
assert pkgconfig != null && gtk != null && libpng != null;
# Note that we cannot just copy gtk's png attribute, since gtk might
# not be linked against png.
assert libpng == gtk.libpng;

View file

@ -1,8 +1,8 @@
{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL
}:
assert !isNull pkgconfig && !isNull gtk && !isNull perl
&& !isNull zip && !isNull libIDL;
assert pkgconfig != null && gtk != null && perl != null
&& zip != null && libIDL != null;
assert libIDL.glib == gtk.glib;

View file

@ -1,8 +1,8 @@
{ alsaSupport ? false
, stdenv, fetchurl, x11, freetype, alsa ? null}:
assert !isNull x11 && !isNull freetype;
assert alsaSupport -> !isNull alsa;
assert x11 != null && freetype != null;
assert alsaSupport -> alsa != null;
derivation {
name = "MPlayer-1.0pre3";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, x11}:
assert !isNull x11;
assert x11 != null;
derivation {
name = "mplayerplug-in-1.0pre2";

View file

@ -1,9 +1,9 @@
{ stdenv, fetchurl, x11, wxGTK, libdvdcss, libdvdplay
, mpeg2dec, a52dec, libmad, alsa}:
assert !isNull x11 && !isNull wxGTK && !isNull libdvdcss
&& !isNull libdvdplay && !isNull mpeg2dec && !isNull a52dec
&& !isNull libmad && !isNull alsa;
assert x11 != null && wxGTK != null && libdvdcss != null
&& libdvdplay != null && mpeg2dec != null && a52dec != null
&& libmad != null && alsa != null;
assert libdvdplay.libdvdread.libdvdcss == libdvdcss;
derivation {

View file

@ -5,15 +5,15 @@
, libglade, scrollkeeper, esound, gettext
, zvbi ? null, libjpeg ? null, libpng ? null }:
assert !isNull pkgconfig && !isNull perl && !isNull python &&
!isNull x11 && !isNull libgnomeui && !isNull libglade &&
!isNull scrollkeeper && !isNull esound && !isNull gettext;
assert pkgconfig != null && perl != null && python != null &&
x11 != null && libgnomeui != null && libglade != null &&
scrollkeeper != null && esound != null && gettext != null;
assert teletextSupport -> !isNull zvbi && zvbi.pngSupport
assert teletextSupport -> zvbi != null && zvbi.pngSupport
&& pngSupport && zvbi.libpng == libpng;
assert jpegSupport -> !isNull libjpeg;
assert pngSupport -> !isNull libpng;
assert jpegSupport -> libjpeg != null;
assert pngSupport -> libpng != null;
derivation {
name = "zapping-0.7cvs6";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, unzip}:
assert !isNull unzip;
assert unzip != null;
derivation {
name = "docbook-xml-4.2";

View file

@ -1,9 +1,9 @@
{stdenv, fetchurl, x11, freetype, expat, ed}:
assert !isNull x11 && x11.buildClientLibs;
assert !isNull freetype;
assert !isNull expat;
assert !isNull ed;
assert x11 != null && x11.buildClientLibs;
assert freetype != null;
assert expat != null;
assert ed != null;
derivation {
name = "fontconfig-2.2.90";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, pkgconfig, glib}:
assert !isNull pkgconfig && !isNull glib;
assert pkgconfig != null && glib != null;
derivation {
name = "gnet-2.0.4";

View file

@ -1,8 +1,8 @@
{stdenv, fetchurl, pkgconfig, perl, glib, gtk, libxml2, ORBit2, popt}:
assert !isNull pkgconfig && !isNull perl
&& !isNull glib && !isNull gtk
&& !isNull libxml2 && !isNull ORBit2 && !isNull popt;
assert pkgconfig != null && perl != null
&& glib != null && gtk != null
&& libxml2 != null && ORBit2 != null && popt != null;
derivation {
name = "GConf-2.4.0.1";

View file

@ -1,7 +1,7 @@
{stdenv, fetchurl, pkgconfig, glib, libIDL, popt}:
assert !isNull pkgconfig && !isNull glib && !isNull libIDL
&& !isNull popt;
assert pkgconfig != null && glib != null && libIDL != null
&& popt != null;
derivation {
name = "ORBit2-2.8.3";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, audiofile}:
assert !isNull audiofile;
assert audiofile != null;
derivation {
name = "esound-0.2.32";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, pkgconfig, perl}:
assert !isNull pkgconfig && !isNull perl;
assert pkgconfig != null && perl != null;
derivation {
name = "gnome-mime-data-2.4.0";

View file

@ -1,9 +1,9 @@
{ stdenv, fetchurl, pkgconfig, perl, glib, libxml2, GConf
, libbonobo, gnomemimedata, popt, bzip2 }:
assert !isNull pkgconfig && !isNull perl && !isNull glib
&& !isNull libxml2 && !isNull GConf && !isNull libbonobo
&& !isNull gnomemimedata && !isNull bzip2;
assert pkgconfig != null && perl != null && glib != null
&& libxml2 != null && GConf != null && libbonobo != null
&& gnomemimedata != null && bzip2 != null;
derivation {
name = "gnome-vfs-2.4.1";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, pkgconfig, glib, lex, yacc}:
assert !isNull pkgconfig && !isNull glib && !isNull lex && !isNull yacc;
assert pkgconfig != null && glib != null && lex != null && yacc != null;
derivation {
name = "libIDL-0.8.2";

View file

@ -1,7 +1,7 @@
{stdenv, fetchurl, pkgconfig, perl, ORBit2, libxml2, popt, yacc, flex}:
assert !isNull pkgconfig && !isNull perl && !isNull ORBit2
&& !isNull libxml2 && !isNull popt && !isNull yacc && !isNull flex;
assert pkgconfig != null && perl != null && ORBit2 != null
&& libxml2 != null && popt != null && yacc != null && flex != null;
derivation {
name = "libbonobo-2.4.2";

View file

@ -1,8 +1,8 @@
{stdenv, fetchurl, pkgconfig, perl, libxml2, libglade, libgnome
, libgnomecanvas}:
assert !isNull pkgconfig && !isNull perl && !isNull libxml2
&& !isNull libglade && !isNull libgnome && !isNull libgnomecanvas;
assert pkgconfig != null && perl != null && libxml2 != null
&& libglade != null && libgnome != null && libgnomecanvas != null;
derivation {
name = "libbonoboui-2.4.1";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, pkgconfig, gtk, libxml2}:
assert !isNull pkgconfig && !isNull gtk && !isNull libxml2;
assert pkgconfig != null && gtk != null && libxml2 != null;
derivation {
name = "libglade-2.0.1";

View file

@ -1,9 +1,9 @@
{ stdenv, fetchurl, pkgconfig, perl, glib, gnomevfs, libbonobo
, GConf, popt, zlib }:
assert !isNull pkgconfig && !isNull perl && !isNull glib
&& !isNull gnomevfs && !isNull libbonobo && !isNull GConf
&& !isNull popt && !isNull zlib;
assert pkgconfig != null && perl != null && glib != null
&& gnomevfs != null && libbonobo != null && GConf != null
&& popt != null && zlib != null;
# !!! TO CHECK:
# libgnome tries to install stuff into GConf (which fails):

View file

@ -1,7 +1,7 @@
{stdenv, fetchurl, pkgconfig, gtk, libart, libglade}:
assert !isNull pkgconfig && !isNull gtk && !isNull libart
&& !isNull libglade;
assert pkgconfig != null && gtk != null && libart != null
&& libglade != null;
derivation {
name = "libgnomecanvas-2.4.0";

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, libgnome, libgnomecanvas, libbonoboui, libglade }:
assert !isNull pkgconfig && !isNull libgnome && !isNull libgnomecanvas
&& !isNull libbonoboui && !isNull libglade;
assert pkgconfig != null && libgnome != null && libgnomecanvas != null
&& libbonoboui != null && libglade != null;
derivation {
name = "libgnomeui-2.4.0.1";

View file

@ -1,7 +1,7 @@
{stdenv, fetchurl, gtk, libtiff, libjpeg, libpng}:
assert !isNull gtk && !isNull libtiff
&& !isNull libjpeg && !isNull libpng;
assert gtk != null && libtiff != null
&& libjpeg != null && libpng != null;
derivation {
name = "gdk-pixbuf-0.22.0";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, x11, glib}:
assert !isNull x11 && !isNull glib;
assert x11 != null && glib != null;
assert x11.buildClientLibs;
derivation {

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, pkgconfig, glib, perl}:
assert !isNull pkgconfig && !isNull glib && !isNull perl;
assert pkgconfig != null && glib != null && perl != null;
derivation {
name = "atk-1.2.4";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, pkgconfig, gettext, perl}:
assert !isNull pkgconfig && !isNull gettext && !isNull perl;
assert pkgconfig != null && gettext != null && perl != null;
derivation {
name = "glib-2.2.3";

View file

@ -1,9 +1,9 @@
{ stdenv, fetchurl, pkgconfig, x11, glib, atk
, pango, perl, libtiff, libjpeg, libpng}:
assert !isNull pkgconfig && !isNull x11 && !isNull glib && !isNull atk
&& !isNull pango && !isNull perl && !isNull perl && !isNull libtiff
&& !isNull libjpeg && !isNull libpng;
assert pkgconfig != null && x11 != null && glib != null && atk != null
&& pango != null && perl != null && perl != null && libtiff != null
&& libjpeg != null && libpng != null;
assert x11.buildClientLibs;
assert glib == atk.glib;
assert glib == pango.glib;

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, pkgconfig, x11, glib, xft}:
assert !isNull pkgconfig && !isNull x11 && !isNull glib && !isNull xft;
assert pkgconfig != null && x11 != null && glib != null && xft != null;
assert x11.buildClientLibs;
assert xft.x11 == x11;

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, libdvdread}:
assert !isNull libdvdread;
assert libdvdread != null;
derivation {
name = "libdvdplay-1.0.1";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, libdvdcss}:
assert !isNull libdvdcss;
assert libdvdcss != null;
derivation {
name = "libdvdread-20030812";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, zlib}:
assert !isNull zlib;
assert zlib != null;
derivation {
name = "libpng-1.2.5";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, zlib, libjpeg}:
assert !isNull zlib && !isNull libjpeg;
assert zlib != null && libjpeg != null;
derivation {
name = "libtiff-3.5.7";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, zlib}:
assert !isNull zlib;
assert zlib != null;
derivation {
name = "libxml2-2.6.7";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, libxml2}:
assert !isNull libxml2;
assert libxml2 != null;
derivation {
name = "libxslt-1.1.0";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, gettext}:
assert !isNull gettext;
assert gettext != null;
derivation {
name = "popt-1.7";

View file

@ -1,8 +1,8 @@
{ stdenv, fetchurl, perl, libxml2, libxslt, docbook_xml_dtd
, perlXMLParser}:
assert !isNull perl && !isNull libxml2 && !isNull libxslt
&& !isNull docbook_xml_dtd && !isNull perlXMLParser;
assert perl != null && libxml2 != null && libxslt != null
&& docbook != null_xml_dtd && perlXMLParser != null;
# !!! seems to need iconv, but cannot find it since $glibc/bin is not in PATH

View file

@ -1,10 +1,10 @@
{stdenv, fetchurl, pkgconfig, gtk, compat22 ? true}:
assert !isNull pkgconfig && !isNull gtk;
assert !isNull gtk.libtiff;
assert !isNull gtk.libjpeg;
assert !isNull gtk.libpng;
assert !isNull gtk.libpng.zlib;
assert pkgconfig != null && gtk != null;
assert gtk.libtiff != null;
assert gtk.libjpeg != null;
assert gtk.libpng != null;
assert gtk.libpng.zlib != null;
derivation {
name = "wxGTK-2.4.2";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, pkgconfig, x11, fontconfig}:
assert !isNull pkgconfig && !isNull x11 && !isNull fontconfig;
assert pkgconfig != null && x11 != null && fontconfig != null;
assert fontconfig.x11 == x11;
derivation {

View file

@ -1,8 +1,8 @@
{ pngSupport ? true
, stdenv, fetchurl, x11, libpng ? null}:
assert !isNull x11;
assert pngSupport -> !isNull libpng;
assert x11 != null;
assert pngSupport -> libpng != null;
derivation {
name = "zvbi-0.2.5";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, perl, db4}:
assert !isNull perl && !isNull db4;
assert perl != null && db4 != null;
derivation {
name = "perl-BerkeleyDB-0.25";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, perl, expat}:
assert !isNull perl && !isNull expat;
assert perl != null && expat != null;
derivation {
name = "perl-XML-Parser-2.34";

View file

@ -1,8 +1,8 @@
{ perlSupport, pythonSupport
, stdenv, fetchurl, perl ? null, python ? null}:
assert perlSupport -> !isNull perl;
assert pythonSupport -> !isNull python;
assert perlSupport -> perl != null;
assert pythonSupport -> python != null;
derivation {
name = "swig-1.3.19";

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, m4}:
assert !isNull m4;
assert m4 != null;
derivation {
name = "bison-1.875c";

View file

@ -1,5 +1,5 @@
{stdenv, fetchurl, m4}:
assert !isNull m4;
assert m4 != null;
derivation {
name = "bison-1.875";
system = stdenv.system;

View file

@ -1,5 +1,5 @@
{stdenv, fetchurl, yacc}:
assert !isNull yacc;
assert yacc != null;
derivation {
name = "flex-2.5.4a";
system = stdenv.system;

View file

@ -3,7 +3,7 @@
{stdenv, fetchurl, yacc, m4}:
assert !isNull yacc;
assert yacc != null;
derivation {
name = "flex-2.5.31";

View file

@ -4,7 +4,7 @@
assert !buildServer; # we don't support this currently
assert buildClientLibs; # we don't support *not* doing this currently
assert !isNull bison && !isNull flex;
assert bison != null && flex != null;
derivation {
name = "xfree86-4.3";

View file

@ -1,7 +1,7 @@
{stdenv, fetchurl, x11, libpng, libjpeg, expat}:
assert !isNull x11 && !isNull libpng && !isNull libjpeg
&& !isNull expat;
assert x11 != null && libpng != null && libjpeg != null
&& expat != null;
derivation {
name = "graphviz-1.10";