From 2c03c134f5e9b83fd715eaabb93d8843628b2b33 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 24 Jun 2009 09:14:28 +0000
Subject: [PATCH] * Build the big CD image in Hydra.

svn path=/nixos/branches/modular-nixos/; revision=16033
---
 release.nix | 78 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 45 insertions(+), 33 deletions(-)

diff --git a/release.nix b/release.nix
index b6a1e5556e38..49713c26486d 100644
--- a/release.nix
+++ b/release.nix
@@ -1,6 +1,40 @@
 { nixpkgs ? ../nixpkgs-wc }:
 
-let 
+let
+
+
+  makeIso =
+    { module, description }:
+    { nixosSrc ? {outPath = ./.; rev = 1234;}
+    , officialRelease ? false
+    , system ? "i686-linux"
+    }:
+
+    with import nixpkgs {inherit system;};
+
+    let
+
+      version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
+
+      iso = (import lib/eval-config.nix {
+        inherit system nixpkgs;        
+        configuration =
+          { require = module;
+            system.nixosVersion = version;
+          };
+      }).config.system.build.isoImage;
+
+    in
+      # Declare the ISO as a build product so that it shows up in Hydra.
+      runCommand "nixos-iso-${version}"
+        { meta = {
+            description = "NixOS installation CD (${description}) - ISO image for ${system}";
+          };
+        }
+        ''
+          ensureDir $out/nix-support
+          echo "file iso" ${iso}/iso/*.iso* >> $out/nix-support/hydra-build-products
+        ''; # */
 
 
   jobs = rec {
@@ -43,38 +77,16 @@ let
       };
 
 
-    iso = 
-      { nixosSrc ? {outPath = ./.; rev = 1234;}
-      , officialRelease ? false
-      , system ? "i686-linux"
-      }:
-
-      with import nixpkgs {inherit system;};
-
-      let
-
-        version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
-
-        iso = (import lib/eval-config.nix {
-          inherit system nixpkgs;        
-          configuration =
-            { require = ./modules/installer/cd-dvd/installation-cd-minimal.nix;
-              system.nixosVersion = version;
-            };
-        }).config.system.build.isoImage;
-
-      in
-        # Declare the ISO as a build product so that it shows up in Hydra.
-        runCommand "nixos-iso-${version}"
-          { meta = {
-              description = "NixOS installation CD ISO image for ${system}";
-            };
-          }
-          ''
-            ensureDir $out/nix-support
-            echo "file iso" ${iso}/iso/*.iso* >> $out/nix-support/hydra-build-products
-          ''; # */
-      
+    iso_minimal = makeIso {
+      module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;
+      description = "minimal";
+    };
+    
+    iso_graphical = makeIso {
+      module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
+      description = "graphical";
+    };
+    
 
   };