Author: eelco Date: 2010-07-08 15:54:10 +0000 (Thu, 08 Jul 2010) New Revision: 22535
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22535&view=rev Modified: nixos/trunk/modules/services/web-servers/apache-httpd/subversion.nix Log: * Idem. Changes: Modified: nixos/trunk/modules/services/web-servers/apache-httpd/subversion.nix =================================================================== --- nixos/trunk/modules/services/web-servers/apache-httpd/subversion.nix 2010-07-08 15:53:48 UTC (rev 22534) +++ nixos/trunk/modules/services/web-servers/apache-httpd/subversion.nix 2010-07-08 15:54:10 UTC (rev 22535) @@ -36,7 +36,7 @@ # The variables to substitute: inherit reposDir dbDir logDir distsDir backupsDir tmpDir - urlPrefix adminAddr fsType subversion postCommitHook; + urlPrefix adminAddr fsType subversion postCommitHook mailer; inherit (config) notificationSender userCreationDomain; orgUrl = config.organisation.url; orgLogoUrl = config.organisation.logo; @@ -46,7 +46,7 @@ sendmail = "${pkgs.ssmtp}/sbin/sendmail"; - inherit (pkgs) libxslt enscript db4 coreutils bzip2; + inherit (pkgs) libxslt enscript db4 coreutils diffutils bzip2 python; inherit (serverInfo) canonicalName; @@ -61,6 +61,8 @@ pkgs.perlPackages.StringMkPasswd ]; + pythonPath = "${subversion}/lib/${pkgs.python.libPrefix}/site-packages"; + # Do a syntax check on the generated file. postInstall = '' $perl -c -T $out/cgi-bin/repoman.pl @@ -73,6 +75,14 @@ ''; }; + + # 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. authModules = import "${servicesPath}/subversion/src/auth" { _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
