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/pytest-timeout/default.nix
+++ b/pkgs/development/python-modules/pytest-timeout/default.nix
@@ -8,7 +8,6 @@
 buildPythonPackage rec {
  pname = "pytest-timeout";
  version = "1.3.0";
-  name = "${pname}-${version}";

  src = fetchPypi {
    inherit pname version;