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/webassets/default.nix
+++ b/pkgs/development/python-modules/webassets/default.nix
@@ -1,11 +1,11 @@
-{ lib, buildPythonPackage, fetchurl, pyyaml, nose, jinja2, mock, pytest }:
+{ lib, buildPythonPackage, fetchPypi, pyyaml, nose, jinja2, mock, pytest }:

 buildPythonPackage rec {
-  name = "webassets-${version}";
+  pname = "webassets";
  version = "0.12.1";

-  src = fetchurl {
-    url = "mirror://pypi/w/webassets/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
    sha256 = "1nrqkpb7z46h2b77xafxihqv3322cwqv6293ngaky4j3ff4cing7";
  };