From 78a877bef1e7914b8a5506a5cb33cd70b9c5f3f5 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 1 May 2015 20:10:20 +0200 Subject: [PATCH] Delete redundant docutils expression `development/tools/documentation/docutils` is also provided by `pythonPackages`; use that instead. --- .../tools/documentation/docutils/default.nix | 27 ------------------- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 pkgs/development/tools/documentation/docutils/default.nix diff --git a/pkgs/development/tools/documentation/docutils/default.nix b/pkgs/development/tools/documentation/docutils/default.nix deleted file mode 100644 index cd01cf059d6..00000000000 --- a/pkgs/development/tools/documentation/docutils/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -a : -let - fetchurl = a.fetchurl; - - version = a.lib.attrByPath ["version"] "0.11" a; - buildInputs = with a; [ - python pil makeWrapper - ]; -in -rec { - src = fetchurl { - url = "http://prdownloads.sourceforge.net/docutils/docutils-${version}.tar.gz"; - sha256 = "1jbybs5a396nrjy9m13pgvsxdwaj7jw7nsawkhl4fi1nvxm1dx4s"; - }; - - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be removed if not needed */ - phaseNames = ["installPythonPackage" "wrapBinContentsPython"]; - - name = "python-docutils-" + version; - meta = { - description = "Processor of ReStructured Text"; - }; -} - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9936330936c..ce16006fa83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5150,9 +5150,7 @@ let binutils = binutils; }; - docutils = builderDefsPackage (import ../development/tools/documentation/docutils) { - inherit python pil makeWrapper; - }; + docutils = pythonPackages.docutils; doxygen = callPackage ../development/tools/documentation/doxygen { qt4 = null;