summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-01-25 21:14:17 +0000
committerRobin Gloster <mail@glob.in>2016-01-30 20:31:04 +0000
commitf295fef41151c2320f81b635f8f277e4254055a6 (patch)
treef6b49f7f9112c2bffe89ef4682ef531838eddcff
parentmonotoneViz: delete (diff)
downloadnixpkgs-f295fef41151c2320f81b635f8f277e4254055a6.tar.gz
tailor: refactor from builderDefsPackage
-rw-r--r--pkgs/applications/version-management/tailor/default.nix16
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix
index 5164ed6a9b44..ebc0906fc6bb 100644
--- a/pkgs/applications/version-management/tailor/default.nix
+++ b/pkgs/applications/version-management/tailor/default.nix
@@ -1,6 +1,9 @@
-args @ { makeWrapper, python, ... }: with args;
-let version = if args ? version then args.version else "0.9.35"; in
-rec {
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+ name = "tailor-${version}";
+ version = "0.9.35";
+
src = fetchurl {
urls = [
"http://darcs.arstecnica.it/tailor/tailor-${version}.tar.gz"
@@ -9,13 +12,6 @@ rec {
sha256 = "061acapxxn5ab3ipb5nd3nm8pk2xj67bi83jrfd6lqq3273fmdjh";
};
- 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc0bce7825a1..83c138fd7c0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13401,7 +13401,7 @@ let
numpy pyasn1 mock zope_interface;
};
- tailor = builderDefsPackage (callPackage ../applications/version-management/tailor) {};
+ tailor = callPackage ../applications/version-management/tailor {};
tangogps = callPackage ../applications/misc/tangogps {
gconf = gnome.GConf;