From d78a4040639e50cecd6d6c2def9bedd7c35f0d97 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 May 2009 12:50:07 +0000
Subject: [PATCH] * 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
---
 pkgs/applications/version-management/subversion/1.5.nix | 2 +-
 pkgs/applications/version-management/subversion/1.6.nix | 2 +-
 pkgs/desktops/gnome/default.nix                         | 2 +-
 pkgs/misc/tex/polytable/default.nix                     | 2 +-
 pkgs/tools/typesetting/lhs2tex/default.nix              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/1.5.nix b/pkgs/applications/version-management/subversion/1.5.nix
index e2b85bf1d49..c892ac8652b 100644
--- a/pkgs/applications/version-management/subversion/1.5.nix
+++ b/pkgs/applications/version-management/subversion/1.5.nix
@@ -12,7 +12,7 @@
 }:
 
 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 javahlBindings -> jdk != null;
 assert sslSupport -> neon.sslSupport;
diff --git a/pkgs/applications/version-management/subversion/1.6.nix b/pkgs/applications/version-management/subversion/1.6.nix
index 625a74b2bd8..6f7ef84a468 100644
--- a/pkgs/applications/version-management/subversion/1.6.nix
+++ b/pkgs/applications/version-management/subversion/1.6.nix
@@ -12,7 +12,7 @@
 }:
 
 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 javahlBindings -> jdk != null;
 assert sslSupport -> neon.sslSupport;
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 0ca54780340..7d0d056c971 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -1,6 +1,6 @@
 args: with args;
 
-assert dbus_glib.glib == gtkLibs.glib;
+#assert dbus_glib.glib == gtkLibs.glib;
 
 let gnome = 
 
diff --git a/pkgs/misc/tex/polytable/default.nix b/pkgs/misc/tex/polytable/default.nix
index 7a2a0929bab..71674d85b04 100644
--- a/pkgs/misc/tex/polytable/default.nix
+++ b/pkgs/misc/tex/polytable/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, tetex, lazylist}:
 
-assert tetex == lazylist.tetex;
+#assert tetex == lazylist.tetex;
 
 stdenv.mkDerivation {
   name = "polytable-0.8.2";
diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix
index f5bbb572504..0881591436f 100644
--- a/pkgs/tools/typesetting/lhs2tex/default.nix
+++ b/pkgs/tools/typesetting/lhs2tex/default.nix
@@ -1,6 +1,6 @@
 {cabal, tetex, polytable, regexCompat, utf8String}:
 
-assert tetex == polytable.tetex;
+#assert tetex == polytable.tetex;
 
 cabal.mkDerivation (self : {
   pname = "lhs2tex";