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

Merge pull request #307 from groxxda/fix/trivial

Browse source 
Trivial fixes (readme, comment, missing dependency in release.nix)
This commit is contained in:
Domen Kožar 2016-05-31 09:59:07 +01:00
parent a55942603a 2b7fd6e509
commit 6bcbabb4df
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -1,5 +1,6 @@
To start hacking on Hydra, run: To start hacking on Hydra, run:
$ bootstrap
$ nix-shell $ nix-shell
$ ./configure $configureFlags --prefix=/opt/hydra $ ./configure $configureFlags --prefix=/opt/hydra
$ make $ make

2
hydra-module.nix
View file

@ -164,7 +164,7 @@ in
}; };
buildMachinesFiles = mkOption { buildMachinesFiles = mkOption {
type = types.list types.path; type = types.listOf types.path;
default = []; default = [];
example = [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ]; example = [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ];
description = "List of files containing build machines."; description = "List of files containing build machines.";

2
release.nix
View file

@ -118,7 +118,7 @@ rec {
[ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx
gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
guile # optional, for Guile + Guix support guile # optional, for Guile + Guix support
perlDeps perl perlDeps perl nix
postgresql92 # for running the tests postgresql92 # for running the tests
(lib.overrideDerivation (aws-sdk-cpp.override { (lib.overrideDerivation (aws-sdk-cpp.override {
apis = ["s3"]; apis = ["s3"];