Author: sandervanderburg
Date: Sat Jan 15 15:23:50 2011
New Revision: 25579
URL: https://svn.nixos.org/websvn/nix/?rev=25579&sc=1
Log:
Modified release.nix to build for multiple system architectures
Modified:
disnix/examples/viewvc/trunk/release.nix
Modified: disnix/examples/viewvc/trunk/release.nix
==============================================================================
--- disnix/examples/viewvc/trunk/release.nix Sat Jan 15 15:13:11 2011
(r25578)
+++ disnix/examples/viewvc/trunk/release.nix Sat Jan 15 15:23:50 2011
(r25579)
@@ -1,20 +1,21 @@
{ nixpkgs ? /etc/nixos/nixpkgs
, nixos ? /etc/nixos/nixos
-, system ? builtins.currentSystem
}:
let
- pkgs = import nixpkgs { inherit system; };
-
- disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
- inherit nixpkgs nixos system;
- };
jobs = rec {
tarball =
{ viewvc ? {outPath = ./.; rev = 1234;}
, officialRelease ? false}:
+ let
+ pkgs = import nixpkgs {};
+
+ disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
+ inherit nixpkgs nixos;
+ };
+ in
disnixos.sourceTarball {
name = "viewvc";
version = builtins.readFile ./version;
@@ -23,8 +24,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 = "viewvc";
version = builtins.readFile ./version;
@@ -36,10 +46,17 @@
tests =
+ let
+ pkgs = import nixpkgs {};
+
+ disnixos = import "${pkgs.disnixos}/share/disnixos/testing.nix" {
+ inherit nixpkgs nixos;
+ };
+ in
disnixos.disnixTest {
name = "viewvc";
tarball = tarball {};
- manifest = build {};
+ manifest = build { system = "x86_64-linux"; };
networkFile = "DistributedDeployment/network.nix";
testScript =
''
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
