diff --git a/pkgs/development/python-modules/slowaes/default.nix b/pkgs/development/python-modules/slowaes/default.nix deleted file mode 100644 index e45ffdfb2e1..00000000000 --- a/pkgs/development/python-modules/slowaes/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, buildPythonPackage }: - -buildPythonPackage rec { - name = "slowaes-0.1a1"; - - src = fetchurl { - url = "https://pypi.python.org/packages/source/s/slowaes/${name}.tar.gz"; - sha256 = "83658ae54cc116b96f7fdb12fdd0efac3a4e8c7c7064e3fac3f4a881aa54bf09"; - }; - - meta = { - homepage = "http://code.google.com/p/slowaes/"; - description = "AES implemented in pure python"; - license = stdenv.lib.licenses.asl20; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20f1faae1bb..d183f588a8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9063,7 +9063,7 @@ let setuptools = pythonPackages.setuptools; - slowaes = callPackage ../development/python-modules/slowaes { }; + slowaes = pythonPackages.slowaes; wxPython = pythonPackages.wxPython; wxPython28 = pythonPackages.wxPython28; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9db41d6ed9..d2d1abb7238 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16917,6 +16917,24 @@ in modules // { }; }; + slowaes = buildPythonPackage rec { + name = "slowaes-${version}"; + version = "0.1a1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/slowaes/${name}.tar.gz"; + sha256 = "83658ae54cc116b96f7fdb12fdd0efac3a4e8c7c7064e3fac3f4a881aa54bf09"; + }; + + disabled = isPy3k; + + meta = { + homepage = "http://code.google.com/p/slowaes/"; + description = "AES implemented in pure python"; + license = with licenses; [ asl20 ]; + }; + }; + snowballstemmer = buildPythonPackage rec { name = "snowballstemmer-1.2.0";