Author: sandervanderburg
Date: Sat Jan 15 14:54:10 2011
New Revision: 25575
URL: https://svn.nixos.org/websvn/nix/?rev=25575&sc=1
Log:
Modified release.nix to build for multiple system architectures
Modified:
disnix/examples/HelloWorldExample/trunk/release-composition.nix
disnix/examples/HelloWorldExample/trunk/release-loadbalancing.nix
disnix/examples/HelloWorldExample/trunk/release-lookup.nix
disnix/examples/HelloWorldExample/trunk/release-simple.nix
Modified: disnix/examples/HelloWorldExample/trunk/release-composition.nix
==============================================================================
--- disnix/examples/HelloWorldExample/trunk/release-composition.nix Sat Jan
15 14:19:03 2011 (r25574)
+++ disnix/examples/HelloWorldExample/trunk/release-composition.nix Sat Jan
15 14:54:10 2011 (r25575)
@@ -4,17 +4,19 @@
}:
let
- pkgs = import nixpkgs { inherit system; };
-
- disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
- inherit nixpkgs nixos system;
- };
jobs = rec {
tarball =
{ HelloWorldExample ? {outPath = ./.; rev = 1234;}
, officialRelease ? false}:
+ let
+ pkgs = import nixpkgs {};
+
+ disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
+ inherit nixpkgs nixos;
+ };
+ in
disnixos.sourceTarball {
name = "HelloWorldExample";
version = builtins.readFile ./version;
@@ -23,8 +25,17 @@
};
build =
- { tarball ? jobs.tarball {} }:
+ { tarball ? jobs.tarball {}
+ , system ? "x86_64-linux"
+ }:
+ let
+ pkgs = import nixpkgs { inherit system; };
+
+ disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
+ inherit nixpkgs nixos system;
+ };
+ in
disnixos.buildManifest {
name = "HelloWorldExample-composition";
version = builtins.readFile ./version;
@@ -35,10 +46,17 @@
};
tests =
+ let
+ pkgs = import nixpkgs {};
+
+ disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
+ inherit nixpkgs nixos;
+ };
+ in
disnixos.disnixTest {
name = "HelloWorldExample-composition";
tarball = tarball {};
- manifest = build {};
+ manifest = build { system = "x86_64-linux"; };
networkFile = "deployment/DistributedDeployment/network.nix";
testScript =
''
Modified: disnix/examples/HelloWorldExample/trunk/release-loadbalancing.nix
==============================================================================
--- disnix/examples/HelloWorldExample/trunk/release-loadbalancing.nix Sat Jan
15 14:19:03 2011 (r25574)
+++ disnix/examples/HelloWorldExample/trunk/release-loadbalancing.nix Sat Jan
15 14:54:10 2011 (r25575)
@@ -4,17 +4,19 @@
}:
let
- pkgs = import nixpkgs { inherit system; };
-
- disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
- inherit nixpkgs nixos system;
- };
jobs = rec {
tarball =
{ HelloWorldExample ? {outPath = ./.; rev = 1234;}
, officialRelease ? false}:
+ let
+ pkgs = import nixpkgs {};
+
+ disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
+ inherit nixpkgs nixos;
+ };
+ in
disnixos.sourceTarball {
name = "HelloWorldExample";
version = builtins.readFile ./version;
@@ -23,8 +25,17 @@
};
build =
- { tarball ? jobs.tarball {} }:
+ { tarball ? jobs.tarball {}
+ , system ? "x86_64-linux"
+ }:
+ let
+ pkgs = import nixpkgs { inherit system; };
+
+ disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
+ inherit nixpkgs nixos system;
+ };
+ in
disnixos.buildManifest {
name = "HelloWorldExample-loadbalancing";
version = builtins.readFile ./version;
@@ -34,11 +45,18 @@
distributionFile =
"deployment/DistributedDeployment/distribution-loadbalancing.nix";
};
- tests =
+ tests =
+ let
+ pkgs = import nixpkgs {};
+
+ disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
+ inherit nixpkgs nixos;
+ };
+ in
disnixos.disnixTest {
name = "HelloWorldExample-loadbalancing";
tarball = tarball {};
- manifest = build {};
+ manifest = build { system = "x86_64-linux"; };
networkFile = "deployment/DistributedDeployment/network.nix";
testScript =
''
Modified: disnix/examples/HelloWorldExample/trunk/release-lookup.nix
==============================================================================
--- disnix/examples/HelloWorldExample/trunk/release-lookup.nix Sat Jan 15
14:19:03 2011 (r25574)
+++ disnix/examples/HelloWorldExample/trunk/release-lookup.nix Sat Jan 15
14:54:10 2011 (r25575)
@@ -4,17 +4,19 @@
}:
let
- pkgs = import nixpkgs { inherit system; };
-
- disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
- inherit nixpkgs nixos system;
- };
jobs = rec {
tarball =
{ HelloWorldExample ? {outPath = ./.; rev = 1234;}
, officialRelease ? false}:
+ let
+ pkgs = import nixpkgs {};
+
+ disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
+ inherit nixpkgs nixos;
+ };
+ in
disnixos.sourceTarball {
name = "HelloWorldExample";
version = builtins.readFile ./version;
@@ -23,8 +25,17 @@
};
build =
- { tarball ? jobs.tarball {} }:
+ { tarball ? jobs.tarball {}
+ , system ? "x86_64-linux"
+ }:
+ let
+ pkgs = import nixpkgs { inherit system; };
+
+ disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
+ inherit nixpkgs nixos system;
+ };
+ in
disnixos.buildManifest {
name = "HelloWorldExample-lookup";
version = builtins.readFile ./version;
@@ -35,6 +46,13 @@
};
tests =
+ let
+ pkgs = import nixpkgs {};
+
+ disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
+ inherit nixpkgs nixos;
+ };
+ in
disnixos.disnixTest {
name = "HelloWorldExample-lookup";
tarball = tarball {};
Modified: disnix/examples/HelloWorldExample/trunk/release-simple.nix
==============================================================================
--- disnix/examples/HelloWorldExample/trunk/release-simple.nix Sat Jan 15
14:19:03 2011 (r25574)
+++ disnix/examples/HelloWorldExample/trunk/release-simple.nix Sat Jan 15
14:54:10 2011 (r25575)
@@ -4,17 +4,20 @@
}:
let
- pkgs = import nixpkgs { inherit system; };
-
- disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
- inherit nixpkgs nixos system;
- };
jobs = rec {
+
tarball =
{ HelloWorldExample ? {outPath = ./.; rev = 1234;}
, officialRelease ? false}:
+ let
+ pkgs = import nixpkgs {};
+
+ disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
+ inherit nixpkgs nixos;
+ };
+ in
disnixos.sourceTarball {
name = "HelloWorldExample";
version = builtins.readFile ./version;
@@ -23,8 +26,17 @@
};
build =
- { tarball ? jobs.tarball {} }:
+ { tarball ? jobs.tarball {}
+ , system ? "x86_64-linux"
+ }:
+ let
+ pkgs = import nixpkgs { inherit system; };
+
+ disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
+ inherit nixpkgs nixos system;
+ };
+ in
disnixos.buildManifest {
name = "HelloWorldExample-simple";
version = builtins.readFile ./version;
@@ -34,8 +46,14 @@
distributionFile =
"deployment/DistributedDeployment/distribution-simple.nix";
};
- tests =
-
+ tests =
+ let
+ pkgs = import nixpkgs {};
+
+ disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
+ inherit nixpkgs nixos;
+ };
+ in
disnixos.disnixTest {
name = "HelloWorldExample-simple";
tarball = tarball {};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
