From 9c0953b439f238e089b6675c6714b4cede71c043 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Dec 2008 14:30:43 +0000
Subject: [PATCH] svn path=/nixos/trunk/; revision=13652

---
 installer/cd-dvd/rescue-cd.nix | 14 ++++----------
 release.nix                    | 22 +++++++++++++++++-----
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/installer/cd-dvd/rescue-cd.nix b/installer/cd-dvd/rescue-cd.nix
index c34fc259340..66c707c77a7 100644
--- a/installer/cd-dvd/rescue-cd.nix
+++ b/installer/cd-dvd/rescue-cd.nix
@@ -220,18 +220,12 @@ rec {
   ";
 
   
-  # Put the current directory in a tarball (making sure to filter
-  # out crap like the .svn directories).
-  nixosTarball = makeTarball "nixos.tar.bz2" (builtins.filterSource svnFilter ./../..);
-
-  svnFilter = name: type:
-    let base = baseNameOf (toString name);
-    in base != ".svn" && base != "result";
+  # Put the current directory in a tarball.
+  nixosTarball = makeTarball "nixos.tar.bz2" ../..;
 
 
-  # Put Nixpkgs in a tarball
-  nixpkgsTarball = makeTarball "nixpkgs.tar.bz2"
-    (builtins.filterSource svnFilter nixpkgsPath);
+  # Put Nixpkgs in a tarball.
+  nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" nixpkgsPath;
 
 
   # The configuration file for Grub.
diff --git a/release.nix b/release.nix
index 25d4aa3658c..4e79ee27734 100644
--- a/release.nix
+++ b/release.nix
@@ -46,12 +46,24 @@ let
       , system ? "i686-linux"
       }:
 
-      (import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" {
-        platform = system;
-        compressImage = true;
-        nixpkgsPath = nixpkgs.path;
-      }).rescueCD;
+      with import nixpkgs.path {};
 
+      let
+
+        iso = (import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" {
+          platform = system;
+          compressImage = true;
+          nixpkgsPath = nixpkgs.path;
+        }).rescueCD;
+
+      in
+        # Declare the ISO as a build product so that it shows up in Hydra.
+        runCommand "nixos-iso" {}
+          ''
+            ensureDir $out/nix-support
+            echo "file iso" ${iso}/iso/*.iso* >> $out/nix-support/hydra-build-products
+          ''; # */
+      
 
   };