From 6c582fbc89ed57bb1f5e304da66de3923e3680c2 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 6 Jul 2008 15:44:46 +0000
Subject: [PATCH] Added disnix
svn path=/nixpkgs/trunk/; revision=12276
---
pkgs/build-support/fetchsvnssh/sshsubversion.exp | 4 ++--
pkgs/top-level/all-packages.nix | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/pkgs/build-support/fetchsvnssh/sshsubversion.exp b/pkgs/build-support/fetchsvnssh/sshsubversion.exp
index c00f39714e5b..7525a66a6d57 100755
--- a/pkgs/build-support/fetchsvnssh/sshsubversion.exp
+++ b/pkgs/build-support/fetchsvnssh/sshsubversion.exp
@@ -14,8 +14,8 @@ match_max 100000
expect "*continue connecting*" { send -- "yes\r"; expect "*?assword:*"; send -- "$password\r" } \
"*?assword:*" { send -- "$password\r" }
-expect "*?assword:*"
-send -- "$password\r"
+#expect "*?assword:*"
+#send -- "$password\r"
# Send blank line
send -- "\r"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f37002655017..4bfcbdc07a83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7085,6 +7085,10 @@ let pkgs = rec {
inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m;
};
+ disnix = import ../tools/package-management/disnix {
+ inherit stdenv fetchsvn openssl dbus autoconf automake pkgconfig dbus_glib;
+ };
+
ntfs3g = import ../misc/ntfs-3g {
inherit fetchurl stdenv fuse pkgconfig utillinux;
};