From 5ea24925b5f4216b6ba3134065eb80ba65352064 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Oct 2008 23:02:20 +0000
Subject: [PATCH] * Use Subversion 1.5.

svn path=/nixos/trunk/; revision=12980
---
 upstart-jobs/apache-httpd/subversion.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/upstart-jobs/apache-httpd/subversion.nix b/upstart-jobs/apache-httpd/subversion.nix
index 3b86a1507eab..5baecc837231 100644
--- a/upstart-jobs/apache-httpd/subversion.nix
+++ b/upstart-jobs/apache-httpd/subversion.nix
@@ -19,15 +19,13 @@ let
 
 
   # Build a Subversion instance with Apache modules and Swig/Python bindings.
-  subversion = import ../../../nixpkgs/pkgs/applications/version-management/subversion-1.4.x {
-    inherit (pkgs) fetchurl stdenv apr aprutil neon expat swig zlib;
+  subversion = pkgs.subversion15.function (origArgs: {
     bdbSupport = true;
     httpServer = true;
     sslSupport = true;
     compressionSupport = true;
     pythonBindings = true;
-    httpd = pkgs.apacheHttpd;
-  };
+  });
 
 
   # Build the maintenance scripts and commit hooks.