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/sockjs-tornado/default.nix
+++ b/pkgs/development/python-modules/sockjs-tornado/default.nix
@@ -1,11 +1,11 @@
-{ lib, buildPythonPackage, fetchurl, tornado }:
+{ lib, buildPythonPackage, fetchPypi, tornado }:

 buildPythonPackage rec {
-  name = "sockjs-tornado-${version}";
+  pname = "sockjs-tornado";
  version = "1.0.3";

-  src = fetchurl {
-    url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
    sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd";
  };