python.pkgs.spambayes: 1.1b1 -> 1.1b2

NixOS · Oct 7, 2017 · 58b6d3f · 58b6d3f
1 parent a088376
commit 58b6d3f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/pkgs/development/python-modules/spambayes/default.nix b/pkgs/development/python-modules/spambayes/default.nix
@@ -0,0 +1,21 @@
+{ buildPythonPackage, isPy3k, fetchPypi, bsddb3, pydns, lockfile }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "spambayes";
+  version = "1.1b2";
+
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1542dwdsmkav38cfjlbgf3bzz3z8nk7wzq173ya8ipk7g8g6s64d";
+  };
+
+  propagatedBuildInputs = [ bsddb3 pydns lockfile ];
+
+  meta = {
+    description = "Statistical anti-spam filter, initially based on the work of Paul Graham";
+    homepage = http://spambayes.sourceforge.net/;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -19829,21 +19829,7 @@ in {
     };
   };
 
-  spambayes = buildPythonPackage rec {
-    name = "spambayes-1.1b1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://sourceforge/spambayes/${name}.tar.gz";
-      sha256 = "0kqvjb89b02wp41p650ydfspi1s8d7akx1igcrw62diidqbxp04n";
-    };
-
-    propagatedBuildInputs = with self; [ bsddb3 pydns lockfile ];
-
-    meta = {
-      description = "Statistical anti-spam filter, initially based on the work of Paul Graham";
-      homepage = http://spambayes.sourceforge.net/;
-    };
-  };
+  spambayes = callPackage ../development/python-modules/spambayes { };
 
   shapely = callPackage ../development/python-modules/shapely { };