diff options
Diffstat (limited to 'pkgs/development/python-modules')
35 files changed, 84 insertions, 158 deletions
diff --git a/pkgs/development/python-modules/azure-cosmos/default.nix b/pkgs/development/python-modules/azure-cosmos/default.nix index 5716b1254af6..4fa05ada8504 100644 --- a/pkgs/development/python-modules/azure-cosmos/default.nix +++ b/pkgs/development/python-modules/azure-cosmos/default.nix @@ -17,9 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six requests ]; - postInstall = '' - rm $out/${python.sitePackages}/azure/__init__.py - ''; + pythonNamespaces = [ "azure" ]; # requires an active Azure Cosmos service doCheck = false; diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix index de2b87ecb5c8..7e03e7faa8e4 100644 --- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { cryptography ]; + pythonNamespaces = [ "azure.keyvault" ]; + # requires relative paths to utilities in the mono-repo doCheck = false; checkInputs = [ aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix index b4749711b9f2..25d58513d311 100644 --- a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { msrest ]; + pythonNamespaces = [ "azure.keyvault" ]; + # requires checkout from mono-repo doCheck = false; diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix index b6f7f1d70d49..035871ab9377 100644 --- a/pkgs/development/python-modules/azure-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-keyvault/default.nix @@ -22,6 +22,8 @@ buildPythonPackage rec { # this is just a meta package, which contains keys and secrets doCheck = false; + pythonNamespaces = [ "azure" ]; + pythonImportsCheck = [ "azure.keyvault.keys" "azure.keyvault.secrets" diff --git a/pkgs/development/python-modules/azure-loganalytics/default.nix b/pkgs/development/python-modules/azure-loganalytics/default.nix index 4bfda9a9342d..beca4018baba 100644 --- a/pkgs/development/python-modules/azure-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-loganalytics/default.nix @@ -22,9 +22,7 @@ buildPythonPackage rec { azure-common ]; - postInstall = lib.optionalString isPy3k '' - rm -rf $out/${python.sitePackages}/azure/__init__.py - ''; + pythonNamespaces = [ "azure" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 274cb181d2d2..76a0d71b1517 100644 --- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -27,9 +27,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix index 6da0cf2210c3..8186f87fd727 100644 --- a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix @@ -24,10 +24,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/pkgs/development/python-modules/azure-mgmt-billing/default.nix index 8c658145d7eb..6e9656950d5b 100644 --- a/pkgs/development/python-modules/azure-mgmt-billing/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-billing/default.nix @@ -30,10 +30,7 @@ buildPythonPackage rec { --replace "azure-namespace-package = azure-mgmt-nspkg" "" ''; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 99545d2a9818..109c3b777480 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -16,15 +16,12 @@ buildPythonPackage rec { sha256 = "00ygppmlx21dxvb0swfdyhqf5xhi0zxy26abcgql02w0lklw91nj"; }; - postInstall = if isPy3k then "" else '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py - ''; - propagatedBuildInputs = [ azure-mgmt-common ]; + pythonNamespaces = [ "azure.mgmt" ]; + # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix index de4a1338611d..7e5771645115 100644 --- a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix @@ -24,11 +24,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # still needed when overriding to previous versions - # E.g. azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix index ad77a75fe838..1e4cdd88c957 100644 --- a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix @@ -24,11 +24,7 @@ buildPythonPackage rec { azure-mgmt-datalake-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/datalake/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt.datalake" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix index 5d2db3c21125..4f985e37e6fa 100644 --- a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix @@ -3,6 +3,7 @@ , fetchPypi , python , isPy3k +, pythonNamespacesHook , msrestazure , azure-common , azure-mgmt-datalake-nspkg @@ -24,11 +25,7 @@ buildPythonPackage rec { azure-mgmt-datalake-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/datalake/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt.datalake" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix index 93c294e4be95..c82bfeab2ed4 100644 --- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix @@ -27,11 +27,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # still needed when overriding to previous versions - # E.g. azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix index 756af164a719..78f149e2f7da 100644 --- a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix @@ -27,11 +27,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # still needed when overriding to previous versions - # E.g. azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix index 0f1527f688b8..ce467dba31da 100644 --- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix @@ -27,10 +27,7 @@ buildPythonPackage rec { ]; # this is still needed for when the version is overrided - # to previous versions. E.g azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix index c72ca47cff9b..c668e5ed4d66 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -26,10 +26,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index 336bba6a1709..fd6cd26c7c6c 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -26,11 +26,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # this is still need when overriding to prevoius versions - # E.g. azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index a5e2829a930a..c149d5ef6fa1 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -26,10 +26,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-maps/default.nix b/pkgs/development/python-modules/azure-mgmt-maps/default.nix index b18c02672361..db87b81c8380 100644 --- a/pkgs/development/python-modules/azure-mgmt-maps/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-maps/default.nix @@ -26,10 +26,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index ccefd96ce73b..fb3bd445b78e 100644 --- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -27,10 +27,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm -rf $out/${python.sitePackages}/azure/__init__.py - rm -rf $out/${python.sitePackages}/azure/mgmt/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/pkgs/development/python-modules/azure-mgmt-msi/default.nix index 328e81c8fe79..2b1b65d60aec 100644 --- a/pkgs/development/python-modules/azure-mgmt-msi/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-msi/default.nix @@ -26,11 +26,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # still needed when overriding to previous versions - # E.g. azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix index b60a82a7b1ad..d3bf3f31fc20 100644 --- a/pkgs/development/python-modules/azure-mgmt-relay/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix @@ -24,11 +24,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # still needed when overriding to previous versions - # E.g. azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix index 03084e11cf3f..47df7f05cebc 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix @@ -26,11 +26,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # this is still needed for overriding to previous versions - # E.g azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 48af270a9d70..581242dfb4be 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -13,16 +13,13 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "636778912823cebed1c212e4feacc4885d9e49e19a047da20fca9393bc6fac33"; + sha256 = "0cxcdyy974ya1yi7s14sw54rwpc8qjngxr0jqb8vxki3528phrv3"; }; - postInstall = if isPy3k then "" else '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py - ''; - propagatedBuildInputs = [ azure-mgmt-common ]; + pythonNamespaces = [ "azure.mgmt" ]; + # has no tests doCheck = false; @@ -30,6 +27,6 @@ buildPythonPackage rec { description = "This is the Microsoft Azure Storage Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ olcai mwilsoninsight ]; + maintainers = with maintainers; [ jonringer olcai mwilsoninsight ]; }; } diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index dc4a011e0789..677b8bbeb124 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -16,11 +16,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ azure-common msrest msrestazure ]; - # fix namespace issues - postInstall = '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/multiapi/__init__.py - ''; + # fix namespace + pythonNamespaces = [ "azure.multiapi" ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/cddb/default.nix b/pkgs/development/python-modules/cddb/default.nix index f40ff08fcf42..86c6e8b0d80a 100644 --- a/pkgs/development/python-modules/cddb/default.nix +++ b/pkgs/development/python-modules/cddb/default.nix @@ -5,13 +5,14 @@ }: buildPythonPackage rec { - name = "CDDB-1.4"; + pname = "CDDB"; + version = "1.4"; disabled = isPy3k; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ]; src = pkgs.fetchurl { - url = "http://cddb-py.sourceforge.net/${name}.tar.gz"; + url = "http://cddb-py.sourceforge.net/${pname}-${version}.tar.gz"; sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w"; }; diff --git a/pkgs/development/python-modules/deskcon/default.nix b/pkgs/development/python-modules/deskcon/default.nix index 2e205ce69557..218f843e11a8 100644 --- a/pkgs/development/python-modules/deskcon/default.nix +++ b/pkgs/development/python-modules/deskcon/default.nix @@ -7,7 +7,8 @@ }: buildPythonPackage { - name = "deskcon-0.3"; + pname = "deskcon"; + version = "0.3"; disabled = isPy3k; src = pkgs.fetchFromGitHub { diff --git a/pkgs/development/python-modules/gateone/default.nix b/pkgs/development/python-modules/gateone/default.nix index 7a6aa659acec..372cdae8c233 100644 --- a/pkgs/development/python-modules/gateone/default.nix +++ b/pkgs/development/python-modules/gateone/default.nix @@ -8,7 +8,8 @@ }: buildPythonPackage { - name = "gateone-1.2-0d57c3"; + pname = "gateone"; + version = "1.2-0d57c3"; disabled = isPy3k; src = pkgs.fetchFromGitHub { diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index a26b02ee0300..405dd7374fcc 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -1,52 +1,42 @@ -{ buildPythonPackage, fetchurl, meson, ninja, stdenv, pkgconfig, python, pygobject3 -, gobject-introspection, gst-plugins-base, isPy3k +{ buildPythonPackage +, fetchurl +, meson +, ninja +, stdenv +, pkgconfig +, python +, pygobject3 +, gobject-introspection +, gst-plugins-base +, isPy3k }: -let +buildPythonPackage rec { pname = "gst-python"; - version = "1.14.4"; - name = "${pname}-${version}"; -in buildPythonPackage rec { - inherit pname version; + version = "1.16.2"; + format = "other"; outputs = [ "out" "dev" ]; src = fetchurl { - urls = [ - "${meta.homepage}/src/gst-python/${name}.tar.xz" - "mirror://gentoo/distfiles/${name}.tar.xz" - ]; - sha256 = "06ssx19fs6pg4d32p9ph9w4f0xwmxaw2dxfj17rqkn5njd7v5zfh"; + url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz"; + sha256 = "II3zFI1z2fQW0BZWRzdYXY6nY9kSAXMtRLX+aIxiiKg="; }; - patches = [ - # Meson build does not support Python 2 at the moment - # https://bugzilla.gnome.org/show_bug.cgi?id=796092 - (fetchurl { - name = "0002-meson-use-new-python-module.patch"; - url = https://bugzilla.gnome.org/attachment.cgi?id=371989; - sha256 = "1k46nvw175c1wvkqnx783i9d4w9vn431spcl48jb3y224jj3va08"; - }) - # Fixes `from gi.repository import Gst` when gst-python's site-package is in - # PYTHONPATH - (fetchurl { - url = https://gitlab.freedesktop.org/gstreamer/gst-python/commit/d64bbc1e0c3c948c148f505cc5f856ce56732880.diff; - sha256 = "1n9pxmcl1x491mp47avpcw2a6n71lm0haz6mfas168prkgsk8q3r"; - }) - # Fixes python2 build from the above changes - (fetchurl { - url = https://gitlab.freedesktop.org/gstreamer/gst-python/commit/f79ac2d1434d7ba9717f3e943cfdc76e121eb5dd.diff; - sha256 = "17a164b0v36g0kwiqdlkjx6g0pjhcs6ilizck7iky8bgjnmiypm1"; - }) + nativeBuildInputs = [ + meson + ninja + pkgconfig + python + gobject-introspection + gst-plugins-base ]; - # TODO: First python_dep in meson.build needs to be removed - postPatch = '' - substituteInPlace meson.build --replace python3 python${if isPy3k then "3" else "2"} - ''; - - nativeBuildInputs = [ meson ninja pkgconfig python gobject-introspection gst-plugins-base ]; + propagatedBuildInputs = [ + gst-plugins-base + pygobject3 + ]; mesonFlags = [ "-Dpython=python${if isPy3k then "3" else "2"}" @@ -59,10 +49,8 @@ in buildPythonPackage rec { # https://github.com/NixOS/nixpkgs/issues/47390 installCheckPhase = "meson test --print-errorlogs"; - propagatedBuildInputs = [ gst-plugins-base pygobject3 ]; - meta = { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "Python bindings for GStreamer"; diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index c40f3453d6b9..719a6a966c64 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.15.0"; + version = "0.17.0"; src = fetchPypi { inherit pname version; - sha256 = "a5f914f18f99cb9541660454a159e3b3c63241fc3ab60005bb88d97cc7a4fb58"; + sha256 = "0qc2vn98a4icp3h04pdhiykddz5q6wfi905f19zfxl26kyjd15ny"; }; # Needs setting up diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix index 0d5d8d75a368..5dd34fef112f 100644 --- a/pkgs/development/python-modules/mutag/default.nix +++ b/pkgs/development/python-modules/mutag/default.nix @@ -6,7 +6,8 @@ }: buildPythonPackage { - name = "mutag-0.0.2-2ffa0258ca"; + pname = "mutag"; + version = "0.0.2-2ffa0258ca"; disabled = ! isPy3k; src = fetchgit { diff --git a/pkgs/development/python-modules/notmuch/default.nix b/pkgs/development/python-modules/notmuch/default.nix index 567977a84f54..5d5a85b6fdd8 100644 --- a/pkgs/development/python-modules/notmuch/default.nix +++ b/pkgs/development/python-modules/notmuch/default.nix @@ -1,20 +1,18 @@ { stdenv , buildPythonPackage -, pkgs +, notmuch , python }: buildPythonPackage { - name = "python-${pkgs.notmuch.name}"; + inherit (notmuch) pname version src; - src = pkgs.notmuch.src; + sourceRoot = notmuch.pythonSourceRoot; - sourceRoot = pkgs.notmuch.pythonSourceRoot; - - buildInputs = [ python pkgs.notmuch ]; + buildInputs = [ python notmuch ]; postPatch = '' - sed -i -e '/CDLL/s@"libnotmuch\.@"${pkgs.notmuch}/lib/libnotmuch.@' \ + sed -i -e '/CDLL/s@"libnotmuch\.@"${notmuch}/lib/libnotmuch.@' \ notmuch/globals.py ''; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index e9cbeb422f15..b1890c73e80b 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -3,13 +3,13 @@ pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: buildPythonPackage rec { pname = "pygobject"; - version = "3.34.0"; + version = "3.36.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06i7ynnbvgpz0gw09zsjbvhgcp5qz4yzdifw27qjwdazg2mckql7"; + sha256 = "hoPS37W6qeUBqaZO66XCwRF+rbeBqxzXqdJVg0r22u8="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix index 8a6971ceb8f8..48400f910c4f 100644 --- a/pkgs/development/python-modules/slob/default.nix +++ b/pkgs/development/python-modules/slob/default.nix @@ -7,8 +7,8 @@ }: buildPythonPackage { - name = "slob"; - verison = "unstable-2016-11-03"; + pname = "slob"; + version = "unstable-2016-11-03"; disabled = !isPy3k; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix index ba910f75e199..1efebed98721 100644 --- a/pkgs/development/python-modules/tkinter/default.nix +++ b/pkgs/development/python-modules/tkinter/default.nix @@ -6,7 +6,8 @@ }: buildPythonPackage { - name = "tkinter-${python.version}"; + pname = "tkinter"; + version = python.version; src = py; format = "other"; |