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/salmon-mail/default.nix
+++ b/pkgs/development/python-modules/salmon-mail/default.nix
@@ -2,7 +2,6 @@
 ,  chardet, lmtpd, pythondaemon, six, jinja2, mock }:

 buildPythonPackage rec {
-  name = "${pname}-${version}";
  pname = "salmon-mail";
  version = "3.0.1";