release.nix: Get rid of the "system" argument
[?]
Jul 1, 2013, 5:37 PM
IZYR3KTL4M5OERLZM4LAC6N6TWZLQXMRVQIFOCIKMDQU3F2E7FHQCDependencies
- [2]
IKC3UFA3Fix VM test - [3]
IGD6FZHDVM test: start the web server - [4]
SQVJAUORFix the test - [5]
6K5PBUUNUse buildEnv to combine Hydra's Perl dependencies - [6]
YJRBNHT3Fail on failure - [7]
LOHWNXEJCleanup - [8]
5FP63F5TMore command renaming. - [9]
NDJ6PZB7* Fix symbol to look for. - [10]
UQ6K57MS* Include nix-prefetch-svn in the Hydra binary distribution. - [11]
T4LLYESZ* Nix expression for building Hydra. - [12]
U2BNO3C5hydra: fix build job - [13]
6CZHII3QUse <...> syntax - [14]
FV2M6MOThydra: use autoconf/-make - [15]
YQWH4POV* Simplify. - [16]
Y2BFYLLK* Install the SQL schemata in $out/share/hydra/sql. - [17]
7C6HSXUQ* Start of a regression test for Hydra. - [18]
UHMUHQMUhydra: fix tarball build, add pre suffix to tarballs - [19]
NIQ2WDFPkeep build directory - [20]
KN3VYE5P* Cleaned up the foreign key constraints. - [21]
4UBEIJRArelease.nix: Remove `services' arguments to ${nixos}/lib/testing.nix. - [22]
3PNG7NIBRemove trailing whitespace
Change contents
- edit in release.nix at line 4
let - replacement in release.nix at line 7
rec {pkgs = import <nixpkgs> {};genAttrs' = pkgs.lib.genAttrs [ "x86_64-linux" "i686-linux" ]; - edit in release.nix at line 11
in rec { - replacement in release.nix at line 49[6.89]→[6.742:752](∅→∅),[6.1548]→[6.742:752](∅→∅),[6.752]→[6.1560:1593](∅→∅),[6.1560]→[6.1560:1593](∅→∅)
build ={ system ? "x86_64-linux" }:build = genAttrs' (system: - replacement in release.nix at line 51
let pkgs = import <nixpkgs> {inherit system;}; inwith import <nixpkgs> { inherit system; }; - edit in release.nix at line 53
with pkgs; - replacement in release.nix at line 139
};}); - replacement in release.nix at line 142
tests ={ nixos ? ../nixos, system ? "x86_64-linux" }:let hydra = build { inherit system; }; intests.install = genAttrs' (system: - replacement in release.nix at line 144[6.72]→[6.251:258](∅→∅),[6.217]→[6.251:258](∅→∅),[6.251]→[6.251:258](∅→∅),[6.258]→[6.775:776](∅→∅),[6.776]→[6.259:289](∅→∅),[6.139]→[6.259:289](∅→∅),[6.289]→[6.777:795](∅→∅),[6.795]→[6.308:388](∅→∅),[6.308]→[6.308:388](∅→∅),[6.388]→[4.0:61](∅→∅),[4.61]→[6.388:536](∅→∅),[6.388]→[6.388:536](∅→∅)
{install = simpleTest {machine ={ config, pkgs, ... }:{ services.postgresql.enable = true;services.postgresql.package = pkgs.postgresql92;environment.systemPackages = [ hydra ];};testScript =''$machine->waitForJob("postgresql");let hydra = builtins.getAttr system build; in # build.${system}simpleTest {machine ={ config, pkgs, ... }:{ services.postgresql.enable = true;services.postgresql.package = pkgs.postgresql92;environment.systemPackages = [ hydra ];}; - replacement in release.nix at line 153
# Initialise the database and the state.$machine->mustSucceed( "createdb -O root hydra",, "psql hydra -f ${hydra}/libexec/hydra/sql/hydra-postgresql.sql", "mkdir /var/lib/hydra");testScript =''$machine->waitForJob("postgresql"); - replacement in release.nix at line 157[6.809]→[6.809:848](∅→∅),[6.848]→[3.0:174](∅→∅),[3.174]→[6.1027:1041](∅→∅),[6.1027]→[6.1027:1041](∅→∅),[6.1041]→[6.796:797](∅→∅),[6.797]→[6.1052:1061](∅→∅),[6.1052]→[6.1052:1061](∅→∅),[6.1061]→[6.798:799](∅→∅),[6.799]→[6.1068:1075](∅→∅),[6.1068]→[6.1068:1075](∅→∅)
# Start the web interface.$machine->mustSucceed("HYDRA_DATA=/var/lib/hydra HYDRA_DBI='dbi:Pg:dbname=hydra;user=hydra;' hydra-server >&2 &");$machine->waitForOpenPort("3000");'';};};# Initialise the database and the state.$machine->mustSucceed( "createdb -O root hydra",, "psql hydra -f ${hydra}/libexec/hydra/sql/hydra-postgresql.sql", "mkdir /var/lib/hydra"); - edit in release.nix at line 164
# Start the web interface.$machine->mustSucceed("HYDRA_DATA=/var/lib/hydra HYDRA_DBI='dbi:Pg:dbname=hydra;user=hydra;' hydra-server >&2 &");$machine->waitForOpenPort("3000");'';});