* Remove the "tarball" jobset argument.

release.nix

@@ -1,4 +1,7 @@
-{ nixpkgs ? ../nixpkgs }:
+{ nixpkgs ? ../nixpkgs
+, nix ? { outPath = ./.; rev = 1234; }
+, officialRelease ? false
+}:
 
 let
 
@@ -6,10 +9,6 @@ let
 
 
     tarball =
-      { nix ? {outPath = ./.; rev = 1234;}
-      , officialRelease ? false
-      }:
-
       with import nixpkgs {};
 
       releaseTools.sourceTarball {
@@ -60,9 +59,7 @@ let
 
 
     build =
-      { tarball ? jobs.tarball {}
+      { system ? "i686-linux" }:
-      , system ? "i686-linux"
-      }:
 
       with import nixpkgs { inherit system; };
 
@@ -79,41 +76,15 @@ let
       };
 
 
-    /*
-    static =
-      { tarball ? jobs.tarball {}
-      , system ? "i686-linux"
-      }:
-
-      with import nixpkgs {inherit system;};
-
-      releaseTools.binaryTarball {
-        name = "nix-static-tarball";
-        src = tarball;
-
-        buildInputs = [curl perl bzip2];
-
-        configureFlags = ''
-          --disable-init-state
-          --with-bzip2=${bzip2}
-          --enable-static-nix
-        '';
-      };
-    */
-
-      
     coverage =
-      { tarball ? jobs.tarball {}
+      with import nixpkgs { system = "x86_64-linux"; };
-      }:
-
-      with import nixpkgs {};
 
       releaseTools.coverageAnalysis {
         name = "nix-build";
         src = tarball;
 
-        buildInputs = [
+        buildInputs =
-          curl perl bzip2 openssl
+          [ curl perl bzip2 openssl
             # These are for "make check" only:
             graphviz libxml2 libxslt
           ];
@@ -168,17 +139,15 @@ let
 
   makeRPM = 
     system: diskImageFun: prio:
-    { tarball ? jobs.tarball {}
-    }:
 
     with import nixpkgs { inherit system; };
 
     releaseTools.rpmBuild rec {
       name = "nix-rpm-${diskImage.name}";
-      src = tarball;
+      src = jobs.tarball;
       diskImage = diskImageFun vmTools.diskImages;
       memSize = 1024;
-      meta = { schedulingPriority = toString prio; };
+      meta = { schedulingPriority = prio; };
     };
 
 
@@ -187,17 +156,15 @@ let
   
   makeDeb =
     system: diskImageFun: prio:
-    { tarball ? jobs.tarball {}
-    }:
 
     with import nixpkgs { inherit system; };
 
     releaseTools.debBuild {
       name = "nix-deb";
-      src = tarball;
+      src = jobs.tarball;
       diskImage = diskImageFun vmTools.diskImages;
       memSize = 1024;
-      meta = { schedulingPriority = toString prio; };
+      meta = { schedulingPriority = prio; };
       configureFlags = "--sysconfdir=/etc";
       debRequires = [ "curl" ];
     };