Merge older staging with added firefox-related updates

2018-06-29 21:06:39 +02:00
parent 18d78e2e48 2f4001f41a
commit 2059bf9e39
531 changed files with 900 additions and 1394 deletions
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , buildPythonPackage
-, fetchurl
+, fetchPypi
 , python
 , zope_interface
 , incremental
@@ -13,11 +13,10 @@
 }:
 buildPythonPackage rec {
  pname = "Twisted";
-  name = "${pname}-${version}";
  version = "18.4.0";

-  src = fetchurl {
-    url = "mirror://pypi/T/Twisted/${name}.tar.bz2";
+  src = fetchPypi {
+    inherit pname version;
    sha256 = "a4cc164a781859c74de47f17f0e85f4bce8a3321a9d0892c015c8f80c4158ad9";
  };