From 0982859b6c79fa1073ee2314db2f07655a71dbb2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 6 Oct 2011 11:31:14 +0000
Subject: [PATCH] * Neon: build with the new and patched OpenSSL.  With this,  
 Subversion can check out the Nix repositories without any   warnings about
 untrusted certificates. * Make Firefox 7 the default.

svn path=/nixpkgs/trunk/; revision=29691
---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fcc36c10c78..035cd00bc9e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4203,6 +4203,7 @@ let
   neon029 = callPackage ../development/libraries/neon/0.29.nix {
     compressionSupport = true;
     sslSupport = true;
+    openssl = opensslNew;
   };
 
   nethack = builderDefsPackage (import ../games/nethack) {
@@ -5958,7 +5959,7 @@ let
     tunctl = true; mconsole = true;
   };
 
-  untie = callPackage ../os-specific/linux/untie {};
+  untie = callPackage ../os-specific/linux/untie { };
 
   upower = callPackage ../os-specific/linux/upower {
     dbus_glib = pkgs.dbus_glib_0_94;