Author: sandervanderburg
Date: Thu Feb 24 15:08:56 2011
New Revision: 26095
URL: https://svn.nixos.org/websvn/nix/?rev=26095&sc=1
Log:
Moved Disnix parameter to the top-level
Modified:
disnix/dydisnix/trunk/release.nix
Modified: disnix/dydisnix/trunk/release.nix
==============================================================================
--- disnix/dydisnix/trunk/release.nix Thu Feb 24 14:31:12 2011 (r26094)
+++ disnix/dydisnix/trunk/release.nix Thu Feb 24 15:08:56 2011 (r26095)
@@ -1,11 +1,12 @@
-{ nixpkgs ? /etc/nixos/nixpkgs }:
+{ nixpkgs ? /etc/nixos/nixpkgs
+, disnix #? (import ../../disnix/trunk/release.nix {}).build {}
+}:
let
jobs = rec {
tarball =
{ dydisnix ? {outPath = ./.; rev = 1234;}
, officialRelease ? false
- , disnix ? (import ../../disnix/trunk/release.nix {}).build {}
}:
with import nixpkgs {};
@@ -22,7 +23,6 @@
build =
{ tarball ? jobs.tarball {}
, system ? "x86_64-linux"
- , disnix ? (import ../../disnix/trunk/release.nix {}).build {}
}:
with import nixpkgs { inherit system; };
@@ -35,9 +35,7 @@
};
tests =
- { nixos ? /etc/nixos/nixos
- , disnix ? (import ../../disnix/trunk/release.nix {}).build {}
- }:
+ { nixos ? /etc/nixos/nixos }:
let
dydisnix = build { system = "x86_64-linux"; };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
