From 83aa130427443f38bee92be71dc98b5352a49747 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 Oct 2009 12:36:04 +0000
Subject: [PATCH] svn path=/nixpkgs/trunk/; revision=17598

---
 .../version-management/subversion/{1.6.nix => default.nix}    | 2 ++
 pkgs/top-level/all-packages.nix                               | 4 +---
 pkgs/top-level/release.nix                                    | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)
 rename pkgs/applications/version-management/subversion/{1.6.nix => default.nix} (96%)

diff --git a/pkgs/applications/version-management/subversion/1.6.nix b/pkgs/applications/version-management/subversion/default.nix
similarity index 96%
rename from pkgs/applications/version-management/subversion/1.6.nix
rename to pkgs/applications/version-management/subversion/default.nix
index 31bd312c8b0f..11f80193ee6e 100644
--- a/pkgs/applications/version-management/subversion/1.6.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -73,5 +73,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A version control system intended to be a compelling replacement for CVS in the open source community";
     homepage = http://subversion.tigris.org/;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = [ stdenv.lib.platforms.all ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 55bb09c4ccc6..b897173bdeb8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7502,9 +7502,7 @@ let
     clisp = clisp_2_44_1;
   };
 
-  subversion = subversion16;
-
-  subversion16 = makeOverridable (import ../applications/version-management/subversion/1.6.nix) {
+  subversion = makeOverridable (import ../applications/version-management/subversion/default.nix) {
     inherit (pkgsOverriden) fetchurl stdenv apr aprutil expat swig zlib jdk python perl sqlite;
     neon = neon028;
     bdbSupport = getConfig ["subversion" "bdbSupport"] true;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index d685474df955..b52465a878bb 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -342,8 +342,6 @@ in {
   stlport = linux;
   strace = linux;
   su = linux;
-  subversion = all;
-  subversion16 = all;
   sudo = linux;
   superTuxKart = linux;
   swig = linux;