* Fixed the path to the services tree. This should be a NixOS module argument.

svn path=/nixos/trunk/; revision=16658
This commit is contained in:
Eelco Dolstra 2009-08-10 20:07:58 +00:00
parent 167ccdd537
commit f003f6d7cd

View File

@ -31,7 +31,7 @@ let
# Build the maintenance scripts and commit hooks. # Build the maintenance scripts and commit hooks.
scripts = substituteInAll { scripts = substituteInAll {
name = "svn-server-scripts"; name = "svn-server-scripts";
src = pkgs.lib.cleanSource ../../../services/subversion/src/scripts; src = pkgs.lib.cleanSource ../../../../services/subversion/src/scripts;
# The variables to substitute: # The variables to substitute:
@ -75,7 +75,7 @@ let
# Build our custom authentication modules. # Build our custom authentication modules.
authModules = import ../../../services/subversion/src/auth { authModules = import ../../../../services/subversion/src/auth {
inherit (pkgs) stdenv apacheHttpd; inherit (pkgs) stdenv apacheHttpd;
}; };
@ -115,7 +115,7 @@ let
# Build ViewVC. # Build ViewVC.
viewvc = import ../../../services/subversion/src/viewvc { viewvc = import ../../../../services/subversion/src/viewvc {
inherit (pkgs) fetchurl stdenv python enscript; inherit (pkgs) fetchurl stdenv python enscript;
inherit urlPrefix reposDir adminAddr subversion; inherit urlPrefix reposDir adminAddr subversion;
}; };
@ -149,7 +149,7 @@ let
# Build WebSVN. # Build WebSVN.
websvn = import ../../../services/subversion/src/websvn { websvn = import ../../../../services/subversion/src/websvn {
inherit (pkgs) fetchurl stdenv writeText enscript gnused diffutils; inherit (pkgs) fetchurl stdenv writeText enscript gnused diffutils;
inherit urlPrefix reposDir subversion; inherit urlPrefix reposDir subversion;
cacheDir = tmpDir; cacheDir = tmpDir;
@ -232,7 +232,7 @@ let
staticFiles = substituteInSome { staticFiles = substituteInSome {
name = "svn-static-files"; name = "svn-static-files";
src = pkgs.lib.cleanSource ../../../services/subversion/root; src = pkgs.lib.cleanSource ../../../../services/subversion/root;
files = ["xsl/svnindex.xsl"]; files = ["xsl/svnindex.xsl"];
inherit urlPrefix; inherit urlPrefix;
}; };