From a60809353ac8b7625f6d0704eabc12aafd3ed051 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 11 Aug 2010 09:38:09 +0000
Subject: [PATCH] updated nss and nspr, added variant of nss including tools

svn path=/nixpkgs/trunk/; revision=23105
---
 pkgs/development/libraries/nspr/default.nix |  4 ++--
 pkgs/development/libraries/nss/default.nix  | 12 ++++++------
 pkgs/top-level/all-packages.nix             |  4 ++++
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 88dc9ffe696..d835ee56b75 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
-let version = "4.8.4"; in
+let version = "4.8.6"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "0ik73yimgfpj3lkqjnpf76b942j76i5yi1z8bn75dxxc08brl4cc";
+    sha256 = "0vcz39784bw42kv9f81dnfb9ciga66l4yg223j467yin2nq0n16r";
   };
 
   preConfigure = "cd mozilla/nsprpub";
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index a51c355b644..e79beb49f32 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, nspr, perl, zlib }:
+{ stdenv, fetchurl, nspr, perl, zlib, includeTools ? false}:
 
 let
 
@@ -10,11 +10,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "nss-3.12.6";
+  name = "nss-3.12.7";
   
   src = fetchurl {
-    url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_6_RTM/src/nss-3.12.6.tar.gz;
-    sha1 = "461e81adbdef6c3f848fcfee0dc5ad8c2dbebd46";
+    url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_7_RTM/src/nss-3.12.7.tar.gz;
+    sha256 = "0x5h0r5hn4qzafxakhvqyw1r8r0zy09b7b0kmdh3ff6v29v4bnzx";
   };
 
   buildInputs = [nspr perl zlib];
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
       mv $out/public $out/include
       mv $out/*.OBJ/* $out/
       rmdir $out/*.OBJ
-      rm -rf $out/bin
+      ${if includeTools then "" else "rm -rf $out/bin"}
 
       # Borrowed from Gentoo.  Firefox expects an nss-config script,
       # but NSS doesn't provide it.
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
       NSS_VMINOR=`cat lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'`
       NSS_VPATCH=`cat lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'`
 
-      mkdir $out/bin
+      ${if includeTools then "" else "mkdir $out/bin"}
       cp ${nssConfig} $out/bin/nss-config
       chmod u+x $out/bin/nss-config
       substituteInPlace $out/bin/nss-config \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0f27404d09..25a83a498bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3505,6 +3505,10 @@ let
 
   nss = callPackage ../development/libraries/nss { };
 
+  nssTools = callPackage ../development/libraries/nss { 
+    includeTools = true;
+  };
+
   ode = builderDefsPackage (import ../development/libraries/ode) {
   };