From c26271927a94fd67554e476fb3e91bd043e5a95d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 25 Apr 2009 11:19:42 +0000
Subject: [PATCH] Remove multiversion expression for tailor for easier use of
 custom versions

svn path=/nixpkgs/trunk/; revision=15296
---
 .../version-management/tailor/0.9.31.nix      | 19 -------------------
 .../tailor/{0.9.35.nix => default.nix}        |  3 ++-
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/applications/version-management/tailor/0.9.31.nix
 rename pkgs/applications/version-management/tailor/{0.9.35.nix => default.nix} (75%)

diff --git a/pkgs/applications/version-management/tailor/0.9.31.nix b/pkgs/applications/version-management/tailor/0.9.31.nix
deleted file mode 100644
index bd4dced82657..000000000000
--- a/pkgs/applications/version-management/tailor/0.9.31.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://darcs.arstecnica.it/tailor-0.9.31.tar.gz;
-    sha256 = "1apzd6mfmhgmxffzgzwsr17gnyqj6bycn783l9105cihsfcv9v3j";
-  };
-
-  buildInputs = [python makeWrapper];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["installPythonPackage" "wrapBinContentsPython"];
-      
-  name = "tailor-" + version;
-  meta = {
-    description = "Version control tools integration tool";
-  };
-}
- 
diff --git a/pkgs/applications/version-management/tailor/0.9.35.nix b/pkgs/applications/version-management/tailor/default.nix
similarity index 75%
rename from pkgs/applications/version-management/tailor/0.9.35.nix
rename to pkgs/applications/version-management/tailor/default.nix
index 78486ec4fa0d..67567679b903 100644
--- a/pkgs/applications/version-management/tailor/0.9.35.nix
+++ b/pkgs/applications/version-management/tailor/default.nix
@@ -1,7 +1,8 @@
 args : with args; 
+let version = if args ? version then args.version else "0.9.35"; in
 rec {
   src = fetchurl {
-    url = http://darcs.arstecnica.it/tailor-0.9.35.tar.gz;
+    url = "http://darcs.arstecnica.it/tailor-${version}.tar.gz";
     sha256 = "061acapxxn5ab3ipb5nd3nm8pk2xj67bi83jrfd6lqq3273fmdjh";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7f40092d4f6e..8fc08770b091 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6778,7 +6778,7 @@ let
     inherit (xlibs) xextproto libXtst inputproto;
   };
 
-  tailor = builderDefsPackage (selectVersion ../applications/version-management/tailor "0.9.35") {
+  tailor = builderDefsPackage (import ../applications/version-management/tailor) {
     inherit makeWrapper python;
   };