* "!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}: {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 # Note that we cannot just copy gtk's png attribute, since gtk might
# not be linked against png. # not be linked against png.
assert libpng == gtk.libpng; assert libpng == gtk.libpng;

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, pkgconfig, glib, lex, yacc}: {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 { derivation {
name = "libIDL-0.8.2"; name = "libIDL-0.8.2";

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, pkgconfig, x11, glib, xft}: {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 x11.buildClientLibs;
assert xft.x11 == x11; assert xft.x11 == x11;

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,8 +1,8 @@
{ stdenv, fetchurl, perl, libxml2, libxslt, docbook_xml_dtd { stdenv, fetchurl, perl, libxml2, libxslt, docbook_xml_dtd
, perlXMLParser}: , perlXMLParser}:
assert !isNull perl && !isNull libxml2 && !isNull libxslt assert perl != null && libxml2 != null && libxslt != null
&& !isNull docbook_xml_dtd && !isNull perlXMLParser; && docbook != null_xml_dtd && perlXMLParser != null;
# !!! seems to need iconv, but cannot find it since $glibc/bin is not in PATH # !!! 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}: {stdenv, fetchurl, pkgconfig, gtk, compat22 ? true}:
assert !isNull pkgconfig && !isNull gtk; assert pkgconfig != null && gtk != null;
assert !isNull gtk.libtiff; assert gtk.libtiff != null;
assert !isNull gtk.libjpeg; assert gtk.libjpeg != null;
assert !isNull gtk.libpng; assert gtk.libpng != null;
assert !isNull gtk.libpng.zlib; assert gtk.libpng.zlib != null;
derivation { derivation {
name = "wxGTK-2.4.2"; name = "wxGTK-2.4.2";

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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