[Nix-commits] SVN commit: nix - r26999 - services/trunk/subversion

[Eelco Dolstra]

Author: eelco
Date: Wed Apr 27 14:52:24 2011
New Revision: 26999
URL: https://svn.nixos.org/websvn/nix/?rev=26999&sc=1

Log:
* Move the Subversion/Repoman module out of the NixOS tree.

Added:
   services/trunk/subversion/default.nix
      - copied, changed from r26996, 
nixos/trunk/modules/services/web-servers/apache-httpd/subversion.nix

Copied and modified: services/trunk/subversion/default.nix (from r26996, 
nixos/trunk/modules/services/web-servers/apache-httpd/subversion.nix)
==============================================================================
--- nixos/trunk/modules/services/web-servers/apache-httpd/subversion.nix        
Wed Apr 27 14:04:00 2011        (r26996, copy source)
+++ services/trunk/subversion/default.nix       Wed Apr 27 14:52:24 2011        
(r26999)
@@ -1,4 +1,4 @@
-{ config, pkgs, serverInfo, servicesPath, ... }:
+{ config, pkgs, serverInfo, ... }:
 
 let
 
@@ -31,7 +31,7 @@
   # Build the maintenance scripts and commit hooks.
   scripts = substituteInAll {
     name = "svn-server-scripts";
-    src = /* pkgs.lib.cleanSource */ "${servicesPath}/subversion/src/scripts";
+    src = ./src/scripts;
 
     # The variables to substitute:
     
@@ -85,7 +85,7 @@
 
   
   # Build our custom authentication modules.
-  authModules = import "${servicesPath}/subversion/src/auth" {
+  authModules = import ./src/auth {
     inherit (pkgs) stdenv apacheHttpd;
   };
 
@@ -125,7 +125,7 @@
 
 
   # Build ViewVC.
-  viewvc = import "${servicesPath}/subversion/src/viewvc" {
+  viewvc = import ./src/viewvc {
     inherit (pkgs) fetchurl stdenv python enscript;
     inherit urlPrefix reposDir adminAddr subversion;
   };
@@ -159,7 +159,7 @@
 
 
   # Build WebSVN.
-  websvn = import "${servicesPath}/subversion/src/websvn" {
+  websvn = import ./src/websvn {
     inherit (pkgs) fetchurl stdenv writeText enscript gnused diffutils;
     inherit urlPrefix reposDir subversion;
     cacheDir = tmpDir;
@@ -242,7 +242,7 @@
 
   staticFiles = substituteInSome {
     name = "svn-static-files";
-    src = /* pkgs.lib.cleanSource */ "${servicesPath}/subversion/root";
+    src = /* pkgs.lib.cleanSource */ ./root;
     files = ["xsl/svnindex.xsl"];
     inherit urlPrefix;
   };
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits