dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* Idem.

Browse Source 
svn path=/nixos/trunk/; revision=22535
This commit is contained in:
Eelco Dolstra 2010-07-08 15:54:10 +00:00
parent 7123115d6f
commit 5c0f6619cf
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/services/web-servers/apache-httpd/subversion.nix
View File

@ -36,7 +36,7 @@ let
# The variables to substitute: # The variables to substitute:
inherit reposDir dbDir logDir distsDir backupsDir tmpDir inherit reposDir dbDir logDir distsDir backupsDir tmpDir
urlPrefix adminAddr fsType subversion postCommitHook; urlPrefix adminAddr fsType subversion postCommitHook mailer;
inherit (config) notificationSender userCreationDomain; inherit (config) notificationSender userCreationDomain;
orgUrl = config.organisation.url; orgUrl = config.organisation.url;
orgLogoUrl = config.organisation.logo; orgLogoUrl = config.organisation.logo;
@ -46,7 +46,7 @@ let
sendmail = "${pkgs.ssmtp}/sbin/sendmail"; sendmail = "${pkgs.ssmtp}/sbin/sendmail";
inherit (pkgs) libxslt enscript db4 coreutils bzip2; inherit (pkgs) libxslt enscript db4 coreutils diffutils bzip2 python;
inherit (serverInfo) canonicalName; inherit (serverInfo) canonicalName;
@ -61,6 +61,8 @@ let
pkgs.perlPackages.StringMkPasswd pkgs.perlPackages.StringMkPasswd
]; ];
pythonPath = "${subversion}/lib/${pkgs.python.libPrefix}/site-packages";
# Do a syntax check on the generated file. # Do a syntax check on the generated file.
postInstall = '' postInstall = ''
$perl -c -T $out/cgi-bin/repoman.pl $perl -c -T $out/cgi-bin/repoman.pl
@ -74,6 +76,14 @@ let
}; };
# Extract the mailer script from the Subversion source distribution.
mailer = pkgs.runCommand "svn-mailer.py" { inherit (subversion) src; }
''
unpackFile $src
cp subversion-*/tools/hook-scripts/mailer/mailer.py $out
'';
# Build our custom authentication modules. # Build our custom authentication modules.
authModules = import "${servicesPath}/subversion/src/auth" { authModules = import "${servicesPath}/subversion/src/auth" {
inherit (pkgs) stdenv apacheHttpd; inherit (pkgs) stdenv apacheHttpd;