lix-project/hydra
4
0
Fork 6
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

release.nix: Get rid of the "system" argument

Browse source
This commit is contained in:
Eelco Dolstra 2013-07-01 19:37:14 +02:00
parent fe030331b5
commit 663b6a747b
1 changed files with 33 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
release.nix
View file

@ -2,7 +2,13 @@
, officialRelease ? false , officialRelease ? false
}: }:
rec { let
pkgs = import <nixpkgs> {};
genAttrs' = pkgs.lib.genAttrs [ "x86_64-linux" "i686-linux" ];
in rec {
tarball = tarball =
with import <nixpkgs> { }; with import <nixpkgs> { };
@ -40,12 +46,9 @@ rec {
}; };
build = build = genAttrs' (system:
{ system ? "x86_64-linux" }:
let pkgs = import <nixpkgs> {inherit system;}; in with import <nixpkgs> { inherit system; };
with pkgs;
let let
@ -133,20 +136,13 @@ rec {
LOGNAME = "foo"; LOGNAME = "foo";
meta.description = "Build of Hydra on ${system}"; meta.description = "Build of Hydra on ${system}";
}; });
tests = tests.install = genAttrs' (system:
{ nixos ? ../nixos, system ? "x86_64-linux" }:
let hydra = build { inherit system; }; in
with import <nixos/lib/testing.nix> { inherit system; }; with import <nixos/lib/testing.nix> { inherit system; };
let hydra = builtins.getAttr system build; in # build.${system}
{ simpleTest {
install = simpleTest {
machine = machine =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ services.postgresql.enable = true; { services.postgresql.enable = true;
@ -169,10 +165,6 @@ rec {
$machine->mustSucceed("HYDRA_DATA=/var/lib/hydra HYDRA_DBI='dbi:Pg:dbname=hydra;user=hydra;' hydra-server >&2 &"); $machine->mustSucceed("HYDRA_DATA=/var/lib/hydra HYDRA_DBI='dbi:Pg:dbname=hydra;user=hydra;' hydra-server >&2 &");
$machine->waitForOpenPort("3000"); $machine->waitForOpenPort("3000");
''; '';
});
};
};
} }