public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix nix-build errors of tests.

Browse Source 
svn path=/nixos/trunk/; revision=18151
This commit is contained in:
Nicolas Pierron 2009-11-05 18:21:09 +00:00
parent 7571055ad3
commit ca00f6f3f8
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/quake3.nix
View File

@ -20,7 +20,7 @@ rec {
{ server = { server =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ jobs = pkgs.lib.singleton { jobs.quake3Server =
{ name = "quake3-server"; { name = "quake3-server";
startOn = "startup"; startOn = "startup";
exec = exec =

29
tests/trac.nix
View File

@ -16,7 +16,7 @@ rec {
services.nfsKernel.exports = '' services.nfsKernel.exports = ''
/repos 192.168.1.0/255.255.255.0(rw,no_root_squash) /repos 192.168.1.0/255.255.255.0(rw,no_root_squash)
''; '';
services.nfsKernel.createMountPoints = true; services.nfsKernel.createMountPoints = true;
}; };
postgresql = postgresql =
@ -24,13 +24,13 @@ rec {
{ {
services.sshd.enable = true; services.sshd.enable = true;
services.postgresql.enable = true; services.postgresql.enable = true;
services.postgresql.enableTCPIP = true; services.postgresql.enableTCPIP = true;
services.postgresql.authentication = '' services.postgresql.authentication = ''
# Generated file; do not edit! # Generated file; do not edit!
local all all trust local all all trust
host all all 127.0.0.1/32 trust host all all 127.0.0.1/32 trust
host all all ::1/128 trust host all all ::1/128 trust
host all all 192.168.1.0/24 trust host all all 192.168.1.0/24 trust
''; '';
}; };
@ -38,17 +38,16 @@ rec {
{config, pkgs, ...}: {config, pkgs, ...}:
{ {
fileSystems = pkgs.lib.mkOverride 50 {} fileSystems = pkgs.lib.mkOverride 50 {}
[ [
{ mountPoint = "/repos"; { mountPoint = "/repos";
device = "storage:/repos"; } device = "storage:/repos"; }
]; ];
services.portmap.enable = true; services.portmap.enable = true;
services.nfsKernel.enable = true;
services.httpd.enable = true; services.httpd.enable = true;
services.httpd.adminAddr = "root@localhost"; services.httpd.adminAddr = "root@localhost";
services.httpd.extraSubservices = [ { serviceType = "trac"; } ]; services.httpd.extraSubservices = [ { serviceType = "trac"; } ];
environment.systemPackages = [ pkgs.pythonPackages.trac pkgs.subversion ]; environment.systemPackages = [ pkgs.pythonPackages.trac pkgs.subversion ];
}; };
client = client =
@ -57,17 +56,17 @@ rec {
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.displayManager.slim.enable = false; services.xserver.displayManager.slim.enable = false;
services.xserver.displayManager.kdm.enable = true; services.xserver.displayManager.kdm.enable = true;
services.xserver.displayManager.kdm.extraConfig = services.xserver.displayManager.kdm.extraConfig =
'' ''
[X-:0-Core] [X-:0-Core]
AutoLoginEnable=true AutoLoginEnable=true
AutoLoginUser=alice AutoLoginUser=alice
AutoLoginPass=foobar AutoLoginPass=foobar
''; '';
services.xserver.desktopManager.default = "kde4"; services.xserver.desktopManager.default = "kde4";
services.xserver.desktopManager.kde4.enable = true; services.xserver.desktopManager.kde4.enable = true;
users.extraUsers = pkgs.lib.singleton { users.extraUsers = pkgs.lib.singleton {
name = "alice"; name = "alice";
description = "Alice Foobar"; description = "Alice Foobar";
home = "/home/alice"; home = "/home/alice";
createHome = true; createHome = true;