[Nix-commits] SVN commit: nix - r32783 - in nixos/trunk: . modules/installer/cd-dvd

[Eelco Dolstra]

Author: eelco
Date: Sun Mar  4 20:57:34 2012
New Revision: 32783
URL: https://nixos.org/websvn/nix/?rev=32783&sc=1

Log:
* Fix the NixOS jobset.

Modified:
   nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix
   nixos/trunk/release.nix

Modified: nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix
==============================================================================
--- nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix       Sun Mar 
 4 18:54:42 2012        (r32782)
+++ nixos/trunk/modules/installer/cd-dvd/installation-cd-base.nix       Sun Mar 
 4 20:57:34 2012        (r32783)
@@ -22,7 +22,7 @@
   nixosTarball = makeTarball "nixos.tar.bz2" (cleanSource ../../..);
 
   # Put Nixpkgs in a tarball.
-  nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (cleanSource pkgs.path);
+  nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (cleanSource <nixpkgs>);
 
   includeSources = true;
 

Modified: nixos/trunk/release.nix
==============================================================================
--- nixos/trunk/release.nix     Sun Mar  4 18:54:42 2012        (r32782)
+++ nixos/trunk/release.nix     Sun Mar  4 20:57:34 2012        (r32783)
@@ -1,5 +1,3 @@
-{ nixpkgs ? ../nixpkgs }:
-
 let
 
 
@@ -10,7 +8,7 @@
     , system ? "i686-linux"
     }:
 
-    with import nixpkgs {inherit system;};
+    with <nixpkgs> {inherit system;};
 
     let
 
@@ -22,7 +20,7 @@
         };
 
       config = (import lib/eval-config.nix {
-        inherit system nixpkgs;
+        inherit system;
         modules = [ module versionModule ];
       }).config;
 
@@ -51,14 +49,14 @@
     , system ? "i686-linux"
     }:
 
-    with import nixpkgs {inherit system;};
+    with import <nixpkgs> {inherit system;};
     let
       version = builtins.readFile ./VERSION + (if officialRelease then "" else 
"pre${toString nixosSrc.rev}");
 
       versionModule = { system.nixosVersion = version; };
 
       config = (import lib/eval-config.nix {
-        inherit system nixpkgs;
+        inherit system;
         modules = [ module versionModule ];
       }).config;
 
@@ -81,7 +79,7 @@
       , officialRelease ? false
       }:
 
-      with import nixpkgs {};
+      with import <nixpkgs> {};
 
       releaseTools.makeSourceTarball {
         name = "nixos-tarball";
@@ -109,10 +107,9 @@
       }:
 
       (import "${nixosSrc}/doc/manual" {
-        pkgs = import nixpkgs {};
+        pkgs = import <nixpkgs> {};
         options =
           (import lib/eval-config.nix {
-            inherit nixpkgs;
             modules = [ { fileSystems = []; } ];
           }).options;
         revision =
@@ -162,7 +159,6 @@
     tests =
       let
         t = import ./tests {
-          inherit nixpkgs;
           system = "i686-linux";
         };
       in {
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits