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

 buildPythonPackage rec {
  version = "1.9";
  pname = "python-stdnum";
-  name = "${pname}-${version}";
  # Failing tests and dependency issue on Py3k
  disabled = isPy3k;
-  src = fetchurl {
-    url = "mirror://pypi/p/python-stdnum/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
    sha256 = "d587a520182f9d8aef7659cca429f4382881589c8883a0a55322b2f94970bdb3";
  };
  meta = {