* Removed some assertions that rely on pointer equality. (It's kind
of unfortunate that consitency checks like "httpd.apr == apr" don't really work. Perhaps equality tests on derivations should just compare the drvPath or outPath attributes.) svn path=/nixpkgs/trunk/; revision=15569
This commit is contained in:
parent
895f15eb04
commit
d78a404063
@ -12,7 +12,7 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
assert bdbSupport -> aprutil.bdbSupport;
|
assert bdbSupport -> aprutil.bdbSupport;
|
||||||
assert httpServer -> httpd != null && httpd.apr == apr && httpd.aprutil == aprutil;
|
assert httpServer -> httpd != null;
|
||||||
assert pythonBindings -> swig != null && swig.pythonSupport;
|
assert pythonBindings -> swig != null && swig.pythonSupport;
|
||||||
assert javahlBindings -> jdk != null;
|
assert javahlBindings -> jdk != null;
|
||||||
assert sslSupport -> neon.sslSupport;
|
assert sslSupport -> neon.sslSupport;
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
assert bdbSupport -> aprutil.bdbSupport;
|
assert bdbSupport -> aprutil.bdbSupport;
|
||||||
assert httpServer -> httpd != null && httpd.apr == apr && httpd.aprutil == aprutil;
|
assert httpServer -> httpd != null;
|
||||||
assert pythonBindings -> swig != null && swig.pythonSupport;
|
assert pythonBindings -> swig != null && swig.pythonSupport;
|
||||||
assert javahlBindings -> jdk != null;
|
assert javahlBindings -> jdk != null;
|
||||||
assert sslSupport -> neon.sslSupport;
|
assert sslSupport -> neon.sslSupport;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
args: with args;
|
args: with args;
|
||||||
|
|
||||||
assert dbus_glib.glib == gtkLibs.glib;
|
#assert dbus_glib.glib == gtkLibs.glib;
|
||||||
|
|
||||||
let gnome =
|
let gnome =
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{stdenv, fetchurl, tetex, lazylist}:
|
{stdenv, fetchurl, tetex, lazylist}:
|
||||||
|
|
||||||
assert tetex == lazylist.tetex;
|
#assert tetex == lazylist.tetex;
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "polytable-0.8.2";
|
name = "polytable-0.8.2";
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{cabal, tetex, polytable, regexCompat, utf8String}:
|
{cabal, tetex, polytable, regexCompat, utf8String}:
|
||||||
|
|
||||||
assert tetex == polytable.tetex;
|
#assert tetex == polytable.tetex;
|
||||||
|
|
||||||
cabal.mkDerivation (self : {
|
cabal.mkDerivation (self : {
|
||||||
pname = "lhs2tex";
|
pname = "lhs2tex";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user