1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix
index 8f0fbbd6dfbf..097e691f7c18 100644
--- a/pkgs/development/python-modules/twill/default.nix
+++ b/pkgs/development/python-modules/twill/default.nix
@@ -1,25 +1,23 @@
-{ stdenv, buildPythonPackage, fetchurl, isPy3k, pythonPackages }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, nose }:
 buildPythonPackage rec {
   pname = "twill";
   version = "1.8.0";
-  name = "${pname}-${version}";
 
   disabled = isPy3k;
 
-  src = fetchurl {
-    url    = "mirror://pypi/t/twill/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "d63e8b09aa4f6645571c70cd3ba47a911abbae4d7baa4b38fc7eb72f6cfda188";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ nose ];
+  checkInputs = [ nose ];
 
   doCheck = false; # pypi package comes without tests, other homepage does not provide all verisons
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = http://twill.idyll.org/;
-    description = "a simple scripting language for Web browsing";
+    description = "A simple scripting language for Web browsing";
     license     = licenses.mit;
-    platforms = platforms.all;
     maintainers = with maintainers; [ mic92 ];
   };
 }