about summary refs log tree commit diff
path: root/pkgs/applications/version-management/subversion
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2009-05-12 12:50:07 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2009-05-12 12:50:07 +0000
commitd78a4040639e50cecd6d6c2def9bedd7c35f0d97 (patch)
treee64e002b553ff53e7de1587ac93a528a2595d685 /pkgs/applications/version-management/subversion
parent895f15eb04a67f6a7243fcc82f6765cae9a24b4f (diff)
downloadnixlib-d78a4040639e50cecd6d6c2def9bedd7c35f0d97.tar
nixlib-d78a4040639e50cecd6d6c2def9bedd7c35f0d97.tar.gz
nixlib-d78a4040639e50cecd6d6c2def9bedd7c35f0d97.tar.bz2
nixlib-d78a4040639e50cecd6d6c2def9bedd7c35f0d97.tar.lz
nixlib-d78a4040639e50cecd6d6c2def9bedd7c35f0d97.tar.xz
nixlib-d78a4040639e50cecd6d6c2def9bedd7c35f0d97.tar.zst
nixlib-d78a4040639e50cecd6d6c2def9bedd7c35f0d97.zip
* 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
Diffstat (limited to 'pkgs/applications/version-management/subversion')
-rw-r--r--pkgs/applications/version-management/subversion/1.5.nix2
-rw-r--r--pkgs/applications/version-management/subversion/1.6.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/subversion/1.5.nix b/pkgs/applications/version-management/subversion/1.5.nix
index e2b85bf1d49a..c892ac8652b6 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 625a74b2bd8f..6f7ef84a4686 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;