From ae475a72bf0304922b0a46ac828d866d9c10b30a Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 19 Mar 2008 22:32:00 +0000
Subject: renamed subversion-<version>-svnmerge to svmerge-version (fixed my 
 breakage of nixos-checkout : nix-env -i subversion)

svn path=/nixpkgs/trunk/; revision=11211
---
 pkgs/applications/version-management/subversion-1.4.x/default.nix  | 7 +++++--
 pkgs/applications/version-management/subversion-1.4.x/svnmerge.nix | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/subversion-1.4.x/default.nix b/pkgs/applications/version-management/subversion-1.4.x/default.nix
index d09176302b8..ce1e0f6b406 100644
--- a/pkgs/applications/version-management/subversion-1.4.x/default.nix
+++ b/pkgs/applications/version-management/subversion-1.4.x/default.nix
@@ -16,8 +16,11 @@ assert javahlBindings -> jdk != null;
 assert sslSupport -> neon.sslSupport;
 assert compressionSupport -> neon.compressionSupport;
 
-stdenv.mkDerivation {
-  name = "subversion-1.4.6";
+stdenv.mkDerivation rec {
+
+  version = "1.4.6"; # attribute version is used within svnmerge as well
+
+  name = "subversion-${version}";
 
   builder = ./builder.sh;
   src = fetchurl {
diff --git a/pkgs/applications/version-management/subversion-1.4.x/svnmerge.nix b/pkgs/applications/version-management/subversion-1.4.x/svnmerge.nix
index 34e9a0156fb..9c8b0349f4a 100644
--- a/pkgs/applications/version-management/subversion-1.4.x/svnmerge.nix
+++ b/pkgs/applications/version-management/subversion-1.4.x/svnmerge.nix
@@ -1,6 +1,6 @@
 {subversion, stdenv, python, shebangfix }:
 stdenv.mkDerivation {
-  name = "${subversion.name}-svnmerge";
+  name = "svnmerge-${subversion.version}";
 
   src = subversion.src;
 
-- 
cgit 1.4.1