diff options
| -rw-r--r-- | pkgs/development/python-modules/xmpppy/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 9 insertions, 17 deletions
diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix index 46e81c588452c..b1500b01972f5 100644 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ b/pkgs/development/python-modules/xmpppy/default.nix @@ -1,29 +1,21 @@ -a @ {python, setuptools, ... } : -let - fetchurl = a.fetchurl; +{ buildPythonPackage, fetchurl, setuptools }: + +buildPythonPackage rec { + name = "xmpp.py-${version}"; + version = "0.5.0rc1"; - version = a.lib.attrByPath ["version"] "0.5.0rc1" a; - buildInputs = with a; [ - python setuptools - ]; -in -rec { src = fetchurl { url = "mirror://sourceforge/xmpppy/xmpppy-${version}.tar.gz"; sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si"; }; - inherit buildInputs; - configureFlags = []; + buildInputs = [ setuptools ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["mkDirs" "installPythonPackage"]; - mkDirs = a.fullDepEntry('' + preInstall = '' mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out) export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out) - '') ["defEnsureDir" "addInputs"]; + ''; - name = "xmpp.py-" + version; meta = { description = "XMPP python library"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14342fb762ead..565b91f93defd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3611,7 +3611,7 @@ let xmltv = callPackage ../tools/misc/xmltv { }; - xmpppy = builderDefsPackage (callPackage ../development/python-modules/xmpppy) {}; + xmpppy = callPackage ../development/python-modules/xmpppy { }; xorriso = callPackage ../tools/cd-dvd/xorriso { }; |