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

[?]
Jul 1, 2013, 5:37 PM
IZYR3KTL4M5OERLZM4LAC6N6TWZLQXMRVQIFOCIKMDQU3F2E7FHQC

Dependencies

  • [2] IKC3UFA3 Fix VM test
  • [3] IGD6FZHD VM test: start the web server
  • [4] SQVJAUOR Fix the test
  • [5] 6K5PBUUN Use buildEnv to combine Hydra's Perl dependencies
  • [6] LOHWNXEJ Cleanup
  • [7] YQWH4POV * Simplify.
  • [8] Y2BFYLLK * Install the SQL schemata in $out/share/hydra/sql.
  • [9] NDJ6PZB7 * Fix symbol to look for.
  • [10] NIQ2WDFP keep build directory
  • [11] UQ6K57MS * Include nix-prefetch-svn in the Hydra binary distribution.
  • [12] YJRBNHT3 Fail on failure
  • [13] 7C6HSXUQ * Start of a regression test for Hydra.
  • [14] U2BNO3C5 hydra: fix build job
  • [15] FV2M6MOT hydra: use autoconf/-make
  • [16] 4UBEIJRA release.nix: Remove `services' arguments to ${nixos}/lib/testing.nix.
  • [17] 5FP63F5T More command renaming.
  • [18] T4LLYESZ * Nix expression for building Hydra.
  • [19] KN3VYE5P * Cleaned up the foreign key constraints.
  • [20] UHMUHQMU hydra: fix tarball build, add pre suffix to tarballs
  • [21] 6CZHII3Q Use <...> syntax
  • [22] 3PNG7NIB Remove trailing whitespace

Change contents

  • edit in release.nix at line 4
    [6.94]
    [6.7]
    let
  • replacement in release.nix at line 7
    [6.8][6.95:101]()
    rec {
    [6.8]
    [6.0]
    pkgs = import <nixpkgs> {};
    genAttrs' = pkgs.lib.genAttrs [ "x86_64-linux" "i686-linux" ];
  • edit in release.nix at line 11
    [6.1]
    [6.729]
    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" }:
    [6.89]
    [6.737]
    build = genAttrs' (system:
  • replacement in release.nix at line 51
    [6.738][6.101:155]()
    let pkgs = import <nixpkgs> {inherit system;}; in
    [6.738]
    [6.738]
    with import <nixpkgs> { inherit system; };
  • edit in release.nix at line 53
    [6.739][6.1647:1662](),[6.1662][5.0:1]()
    with pkgs;
  • replacement in release.nix at line 139
    [6.64][6.3474:3481](),[6.668][6.3474:3481](),[6.1839][6.3474:3481]()
    };
    [6.668]
    [6.51]
    });
  • replacement in release.nix at line 142
    [6.53][6.53:162]()
    tests =
    { nixos ? ../nixos, system ? "x86_64-linux" }:
    let hydra = build { inherit system; }; in
    [6.53]
    [6.156]
    tests.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");
    [6.217]
    [6.536]
    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
    [6.537][6.537:668](),[6.668][2.0:82](),[2.82][6.748:808](),[6.748][6.748:808]()
    # 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"
    );
    [6.537]
    [6.808]
    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");
    '';
    };
    };
    [6.809]
    [6.1075]
    # 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
    [6.1076]
    [6.1076]
    # 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");
    '';
    });