From 977f5183ddd7615b9f8ee5100dc3d4711c5cd24c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 May 2005 08:42:03 +0000
Subject: [PATCH] * Subversion 1.2.0; this is now the default.

svn path=/nixpkgs/trunk/; revision=3113
---
 .../version-management/subversion-1.2.x/default.nix         | 6 +++---
 pkgs/system/all-packages-generic.nix                        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/subversion-1.2.x/default.nix b/pkgs/applications/version-management/subversion-1.2.x/default.nix
index a8c35da99693..228c189dd68c 100644
--- a/pkgs/applications/version-management/subversion-1.2.x/default.nix
+++ b/pkgs/applications/version-management/subversion-1.2.x/default.nix
@@ -19,12 +19,12 @@ assert javahlBindings -> j2sdk != null;
 assert compressionSupport -> zlib != null;
 
 stdenv.mkDerivation {
-  name = "subversion-1.2.0-pre-rc4";
+  name = "subversion-1.2.0";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://subversion.tigris.org/downloads/subversion-1.2.0-rc4.tar.bz2;
-    md5 = "7913900ef3d92afcbdf63a3163574798";
+    url = http://subversion.tigris.org/downloads/subversion-1.2.0.tar.bz2;
+    md5 = "f25c0c884201f411e99a6cb6c25529ff";
   };
 
   # This is a hopefully temporary fix for the problem that
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index a4f79f7b9f15..43e36fe16dd1 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1037,7 +1037,7 @@ rec {
 
   ### APPLICATIONS
 
-  subversion = (import ../applications/version-management/subversion-1.1.x) {
+  subversion11x = (import ../applications/version-management/subversion-1.1.x) {
     inherit fetchurl stdenv openssl db4 expat swig zlib;
     localServer = true;
     httpServer = false;
@@ -1046,7 +1046,7 @@ rec {
     httpd = apacheHttpd;
   };
 
-  subversion12x = (import ../applications/version-management/subversion-1.2.x) {
+  subversion = (import ../applications/version-management/subversion-1.2.x) {
     inherit fetchurl stdenv openssl db4 expat swig zlib;
     localServer = true;
     httpServer = false;
@@ -1055,7 +1055,7 @@ rec {
     httpd = apacheHttpd;
   };
 
-  subversionWithJava = (import ../applications/version-management/subversion-1.1.x) {
+  subversionWithJava = (import ../applications/version-management/subversion-1.2.x) {
     inherit fetchurl stdenv openssl db4 expat;
     swig = swigWithJava;
     localServer = true;