Author: sandervanderburg
Date: Fri Feb 18 12:55:27 2011
New Revision: 26021
URL: https://svn.nixos.org/websvn/nix/?rev=26021&sc=1
Log:
- It seems that disnix-env still passes an infrastructure model to
disnix-activate, which causes random failures.
- The pkgs model in the testsuite should not manually import Nixpkgs
Modified:
disnix/disnix/trunk/scripts/disnix-env.in
disnix/disnix/trunk/tests/manifest/pkgs/default.nix
disnix/disnix/trunk/tests/manifest/services-complete.nix
disnix/disnix/trunk/tests/manifest/services-composition.nix
disnix/disnix/trunk/tests/manifest/services-incomplete.nix
disnix/disnix/trunk/version
Modified: disnix/disnix/trunk/scripts/disnix-env.in
==============================================================================
--- disnix/disnix/trunk/scripts/disnix-env.in Fri Feb 18 09:16:11 2011
(r26020)
+++ disnix/disnix/trunk/scripts/disnix-env.in Fri Feb 18 12:55:27 2011
(r26021)
@@ -116,4 +116,4 @@
distributionExport=`disnix-manifest -s $servicesFile -i $infrastructureFile -d
$distributionFile --target-property $targetProperty --no-out-link $showTraceArg`
disnix-distribute --interface $interface $distributionExport
-disnix-activate --interface $interface -i $infrastructureFile $profileArg
$coordinatorProfilePathArg $distributionExport
+disnix-activate --interface $interface $profileArg $coordinatorProfilePathArg
$distributionExport
Modified: disnix/disnix/trunk/tests/manifest/pkgs/default.nix
==============================================================================
--- disnix/disnix/trunk/tests/manifest/pkgs/default.nix Fri Feb 18 09:16:11
2011 (r26020)
+++ disnix/disnix/trunk/tests/manifest/pkgs/default.nix Fri Feb 18 12:55:27
2011 (r26021)
@@ -1,23 +1,19 @@
-{system}:
-
-let pkgs = import (builtins.getEnv "NIXPKGS_ALL") { inherit system; };
-in
-with pkgs;
+{pkgs, system}:
rec {
testService1 = import ./testService1.nix {
- inherit stdenv;
+ inherit (pkgs) stdenv;
};
testService2 = import ./testService2.nix {
- inherit stdenv;
+ inherit (pkgs) stdenv;
};
testService2B = import ./testService2B.nix {
- inherit stdenv;
+ inherit (pkgs) stdenv;
};
testService3 = import ./testService3.nix {
- inherit stdenv;
+ inherit (pkgs) stdenv;
};
}
Modified: disnix/disnix/trunk/tests/manifest/services-complete.nix
==============================================================================
--- disnix/disnix/trunk/tests/manifest/services-complete.nix Fri Feb 18
09:16:11 2011 (r26020)
+++ disnix/disnix/trunk/tests/manifest/services-complete.nix Fri Feb 18
12:55:27 2011 (r26021)
@@ -1,7 +1,7 @@
{distribution, system, pkgs}:
let
- customPkgs = import ./pkgs { inherit system; };
+ customPkgs = import ./pkgs { inherit pkgs system; };
in
rec {
testService1 = {
Modified: disnix/disnix/trunk/tests/manifest/services-composition.nix
==============================================================================
--- disnix/disnix/trunk/tests/manifest/services-composition.nix Fri Feb 18
09:16:11 2011 (r26020)
+++ disnix/disnix/trunk/tests/manifest/services-composition.nix Fri Feb 18
12:55:27 2011 (r26021)
@@ -1,7 +1,7 @@
{distribution, system, pkgs}:
let
- customPkgs = import ./pkgs { inherit system; };
+ customPkgs = import ./pkgs { inherit pkgs system; };
in
rec {
testService1 = {
Modified: disnix/disnix/trunk/tests/manifest/services-incomplete.nix
==============================================================================
--- disnix/disnix/trunk/tests/manifest/services-incomplete.nix Fri Feb 18
09:16:11 2011 (r26020)
+++ disnix/disnix/trunk/tests/manifest/services-incomplete.nix Fri Feb 18
12:55:27 2011 (r26021)
@@ -1,7 +1,7 @@
{distribution, system, pkgs}:
let
- customPkgs = import ./pkgs { inherit system; };
+ customPkgs = import ./pkgs { inherit pkgs system; };
in
rec {
testService1 = {
Modified: disnix/disnix/trunk/version
==============================================================================
--- disnix/disnix/trunk/version Fri Feb 18 09:16:11 2011 (r26020)
+++ disnix/disnix/trunk/version Fri Feb 18 12:55:27 2011 (r26021)
@@ -1 +1 @@
-0.2
\ No newline at end of file
+0.3
\ No newline at end of file
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
