diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-20 09:40:09 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-20 09:40:09 +0200 |
| commit | ca6ee8f519733e1f45b7598d995245dd687f535c (patch) | |
| tree | 3c84d14a7da3b890b5f3be62ab13e6eae2805695 /pkgs/top-level/python-packages.nix | |
| parent | 4c774f24acf2b674b99f70690f73a67c095f1968 (diff) | |
| parent | ceb0ce849fe01fcbc221e3b978a0744bf3735752 (diff) | |
| download | nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.gz nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.bz2 nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.lz nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.xz nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.zst nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 56fa061f8a5b..6c495cdabdee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2390,7 +2390,7 @@ in { google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { }; - gpgme = toPythonModule (pkgs.gpgme.override { withPython=true; }); + gpgme = toPythonModule (pkgs.gpgme.override { pythonSupport=true; }); gphoto2 = callPackage ../development/python-modules/gphoto2 { inherit (pkgs) pkgconfig; @@ -3173,24 +3173,7 @@ in { bottleneck = callPackage ../development/python-modules/bottleneck { }; - paho-mqtt = buildPythonPackage rec { - name = "paho-mqtt-${version}"; - version = "1.1"; - - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/paho-mqtt/${name}.tar.gz"; - sha256 = "07i6k9mw66kgbvjgsrcsd2sjji9ckym50dcxnmhjqfkfzsg64yhg"; - }; - - meta = { - homepage = "https://eclipse.org/paho/"; - description = "mqtt library for machine to machine and internet of things"; - license = licenses.epl10; - maintainers = with maintainers; [ mog ]; - }; - }; + paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; pamqp = buildPythonPackage rec { version = "1.6.1"; |