From 7140c4bbf9797f8be27dab9cfe5bad640ca108db Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Thu, 11 Jan 2018 00:26:19 +0200
Subject: [PATCH 1/2] pythonPackages.salmon: bec795cd -> 3.0.0

---
 pkgs/development/python-modules/salmon/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/salmon/default.nix b/pkgs/development/python-modules/salmon/default.nix
index f9d7f79164ac..916fc29d2074 100644
--- a/pkgs/development/python-modules/salmon/default.nix
+++ b/pkgs/development/python-modules/salmon/default.nix
@@ -3,18 +3,14 @@
 
 buildPythonPackage rec {
   pname = "salmon";
-  # NOTE: The latest release version 2 is over 3 years old. So let's use some
-  # recent commit from master. There will be a new release at some point, then
-  # one can change this to use PyPI. See:
-  # https://github.com/moggers87/salmon/issues/52
-  version = "bec795cdab744be4f103d8e35584dfee622ddab2";
+  version = "3.0.0";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "moggers87";
     repo = "salmon";
     rev = version;
-    sha256 = "0nx8pyxy7n42nsqqvhd85ycm1i5wlacsi7lwb4rrs9d416bpd300";
+    sha256 = "0ffnvvms9w5b2hkwq0ss018vadg5n7xwhc51dlrfynddhrf9p3m3";
   };
 
   checkInputs = [ nose jinja2 mock ];

From 1f2e24741664da7d129dfd2e1ecdb0efd901abdc Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Thu, 11 Jan 2018 02:52:45 +0200
Subject: [PATCH 2/2] pythonPackages.salmon-mail: rename from salmon

---
 .../{salmon => salmon-mail}/default.nix            | 14 ++++++--------
 pkgs/top-level/python-packages.nix                 |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)
 rename pkgs/development/python-modules/{salmon => salmon-mail}/default.nix (64%)

diff --git a/pkgs/development/python-modules/salmon/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix
similarity index 64%
rename from pkgs/development/python-modules/salmon/default.nix
rename to pkgs/development/python-modules/salmon-mail/default.nix
index 916fc29d2074..37c7b157ea58 100644
--- a/pkgs/development/python-modules/salmon/default.nix
+++ b/pkgs/development/python-modules/salmon-mail/default.nix
@@ -1,16 +1,14 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, nose, dnspython
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, nose, dnspython
 ,  chardet, lmtpd, pythondaemon, six, jinja2, mock }:
 
 buildPythonPackage rec {
-  pname = "salmon";
-  version = "3.0.0";
   name = "${pname}-${version}";
+  pname = "salmon-mail";
+  version = "3.0.0";
 
-  src = fetchFromGitHub {
-    owner = "moggers87";
-    repo = "salmon";
-    rev = version;
-    sha256 = "0ffnvvms9w5b2hkwq0ss018vadg5n7xwhc51dlrfynddhrf9p3m3";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1smggsnkwiqy8zjq604dkm5g0np27pdnj3szsbn8v4ja84nncq18";
   };
 
   checkInputs = [ nose jinja2 mock ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9c1cc710c13a..a601058b7c11 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -354,7 +354,7 @@ in {
 
   rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl {});
 
-  salmon = callPackage ../development/python-modules/salmon { };
+  salmon-mail = callPackage ../development/python-modules/salmon-mail { };
 
   simpleeval = callPackage ../development/python-modules/simpleeval { };