From c4332bb7a19ce48fd6bedcce0aeeef2861f2e8a1 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 25 Feb 2010 10:01:33 +0000
Subject: [PATCH] nix 0.15pre20231 as nixUnstable

svn path=/nixpkgs/trunk/; revision=20243
---
 pkgs/tools/package-management/nix/unstable.nix |  6 +++---
 pkgs/top-level/all-packages.nix                | 13 +++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 06c005f6b91..6bc2acbe2bc 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-0.14pre19767";
+  name = "nix-0.15pre20231";
   
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/278172/download/4/${name}.tar.bz2";
-    sha256 = "787f39d66b9548c8f56166e280ef53b3696e90d99b79f926e504235760146e04";
+    url = "http://hydra.nixos.org/build/303065/download/4/${name}.tar.bz2";
+    sha256 = "ecdb6669f98030b5e3c1aefed971e41eebb3a57b381f786637a8468c17d4c7f8";
   };
 
   buildInputs = [perl curl openssl];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e760a89831e..9167844474b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1498,6 +1498,10 @@ let
     inherit fetchurl stdenv expat;
   };
 
+  sawmill = import ../tools/networking/sawmill {
+    inherit fetchurl stdenv mysql zlib openssl;
+  };
+
   screen = import ../tools/misc/screen {
     inherit fetchurl stdenv ncurses;
   };
@@ -1753,6 +1757,10 @@ let
     inherit stdenv fetchurl neon fuse pkgconfig glib;
   };
 
+  webalizer = import ../tools/networking/webalizer {
+    inherit stdenv fetchurl zlib libpng gd db4 geoip;
+  };
+
   webdruid = builderDefsPackage ../tools/admin/webdruid {
     inherit zlib libpng freetype gd which
       libxml2 geoip;
@@ -6808,7 +6816,7 @@ let
 
   chrome = import ../applications/networking/browsers/chromium {
     inherit stdenv fetchurl ffmpeg cairo nspr nss fontconfig freetype alsaLib makeWrapper unzip expat zlib bzip2 libpng;
-    inherit (xlibs) libX11 libXext libXrender libXt ;
+    inherit (xlibs) libX11 libXext libXrender libXt libXScrnSaver;
     inherit (gtkLibs) gtk glib pango atk;
     inherit (gnome) GConf;
     libjpeg = libjpeg62;
@@ -8949,14 +8957,11 @@ let
   };
 
   # The bleeding edge.
-  nixUnstable = nix;
-  /*
   nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) {
     inherit fetchurl stdenv perl curl bzip2 openssl aterm;
     storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
     stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
   };
-  */
 
   nixCustomFun = src: preConfigure: enableScripts: configureFlags:
     import ../tools/package-management/nix/custom.nix {