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

  buildInputs = [ transaction ];
  propagatedBuildInputs = [ persistent zope_interface ];